Changeset 8ae8262 in mainline for uspace/srv/sysman/sm_task.c

Timestamp:

2019-08-07T11:08:17Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

130ba46

Parents:

5353f50

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-11-12 02:56:35)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-07 11:08:17)

Message:

sysman: Support for anonymous services

• Daemons that only call task_retval and don't exit are recorded as anonymous services.
• Split unit run-state and repository state.
• Partial support for removal of units from repository (needs refcounting yet).

File:

• uspace/srv/sysman/sm_task.c (modified) (6 diffs)

uspace/srv/sysman/sm_task.c

@@ -28 +28 @@
 
 #include <adt/list.h>
+#include <errno.h>
 #include <stdlib.h>
 #include <task.h>
+#include <sysman/unit.h>
 
 #include "repo.h"
@@ -35 +37 @@
 #include "sysman.h"
 #include "sm_task.h"
+
 
 /** Structure for boxing task event */
@@ -85 +88 @@
 }
 
+static unit_svc_t *sm_task_create_service(task_id_t tid)
+{
+        unit_t *u_svc = unit_create(UNIT_SERVICE);
+        bool in_repo_update = false;
+        int rc = EOK;
+
+        if (u_svc == NULL) {
+                goto fail;
+        }
+
+        rc = asprintf(&u_svc->name, ANONYMOUS_SERVICE_MASK "%c%s", tid,
+            UNIT_NAME_SEPARATOR, UNIT_SVC_TYPE_NAME);
+        if (rc < 0) {
+                goto fail;
+        }
+
+        CAST_SVC(u_svc)->main_task_id = tid;
+        CAST_SVC(u_svc)->anonymous = true;
+        /* exec_start is left undefined, maybe could be hinted by kernel's task
+         * name */
+
+        repo_begin_update();
+        in_repo_update = true;
+
+        rc = repo_add_unit(u_svc);
+        if (rc != EOK) {
+                goto fail;
+        }
+
+        repo_commit();
+
+        return CAST_SVC(u_svc);
+        
+fail:
+        if (in_repo_update) {
+                repo_rollback();
+        }
+
+        unit_destroy(&u_svc);
+        return NULL;
+}
+
+static void sm_task_delete_service(unit_svc_t *u_svc)
+{
+        repo_begin_update();
+        int rc = repo_remove_unit(&u_svc->unit);
+        if (rc != EOK) {
+                sysman_log(LVL_WARN, "Can't remove unit %s (%i).",
+                    unit_name(&u_svc->unit), rc);
+                repo_rollback();
+                return;
+        }
+
+        repo_commit();
+}
+
 static void sysman_event_task_event(void *data)
 {
@@ -92 +151 @@
             __func__, tev->task_id, tev->flags);
         unit_svc_t *u_svc = sm_task_find_service(tev->task_id);
+
         if (u_svc == NULL) {
-                goto finish;
+                if (tev->flags & TASK_WAIT_EXIT) {
+                        /* Non-service task exited, ignore. */
+                        goto finish;
+                }
+
+                u_svc = sm_task_create_service(tev->task_id);
+                if (u_svc == NULL) {
+                        sysman_log(LVL_WARN,
+                            "Unable to create anonymous service for task %" PRIu64 ".",
+                            tev->task_id);
+                        goto finish;
+                }
+
+                sysman_log(LVL_DEBUG, "Created anonymous service %s.",
+                    unit_name(&u_svc->unit));
+
+                /* Inject state so that further processing makes sense */
+                u_svc->unit.state = STATE_STARTING;
         }
 
@@ -111 +188 @@
                         u->state = STATE_FAILED;
                 }
+
         }
         if (tev->flags & TASK_WAIT_RETVAL) {
@@ -119 +197 @@
         unit_notify_state(u);
 
+        if ((tev->flags & TASK_WAIT_EXIT) && u_svc->anonymous) {
+                sysman_log(LVL_DEBUG, "Deleted anonymous service %s.",
+                    unit_name(&u_svc->unit));
+                sm_task_delete_service(u_svc);
+        }
 finish:
         free(tev);