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

Timestamp:

2019-08-07T11:08:17Z (6 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/repo.c (modified) (7 diffs)

uspace/srv/sysman/repo.c

@@ -74 +74 @@
         .equal           = &units_by_handle_ht_equal,
         .key_equal       = &units_by_handle_ht_key_equal,
-        .remove_callback = NULL // TODO realy unneeded?
+        .remove_callback = NULL
 };
 
@@ -108 +108 @@
         .equal           = &units_by_name_ht_equal,
         .key_equal       = &units_by_name_ht_key_equal,
-        .remove_callback = NULL // TODO realy unneeded?
+        .remove_callback = NULL
 };
 
 /* Repository functions */
+
+static void repo_remove_unit_internal(unit_t *u)
+{
+        hash_table_remove_item(&units_by_name, &u->units_by_name);
+        hash_table_remove_item(&units_by_handle, &u->units_by_handle);
+        list_remove(&u->units);
+
+        // TODO decrease refcount of unit
+        // unit may be referenced e.g. from running job, thus we cannot simply destroy it
+}
 
 void repo_init(void)
@@ -122 +132 @@
 {
         assert(unit);
-        assert(unit->state == STATE_EMBRYO);
+        assert(unit->repo_state == REPO_EMBRYO);
         assert(unit->handle == 0);
         assert(unit->name != NULL);
@@ -139 +149 @@
 }
 
+int repo_remove_unit(unit_t *unit)
+{
+        unit->repo_state = REPO_ZOMBIE;
+        return EOK; /* We could check that unit is present in repo etc... */
+}
+
 void repo_begin_update(void) {
         sysman_log(LVL_DEBUG2, "%s", __func__);
@@ -146 +162 @@
 {
         unit_t *unit = hash_table_get_inst(ht_link, unit_t, units_by_name);
-        if (unit->state == STATE_EMBRYO) {
-                unit->state = STATE_STOPPED;
+        if (unit->repo_state == REPO_ZOMBIE) {
+                repo_remove_unit_internal(unit);
+                return true;
+        }
+
+        if (unit->repo_state == REPO_EMBRYO) {
+                unit->repo_state = REPO_LIVING;
         }
 
@@ -162 +183 @@
 
         /*
-         * Apply commit to all units_by_name, each commited unit commits its outgoing
-         * deps, thus eventually commiting all embryo deps as well.
+         * Apply commit to all units_by_name, each commited unit commits its
+         * outgoing deps, thus eventually commiting all embryo deps as well.
+         *
+         * TODO why not iterate over units list?
          */
         hash_table_apply(&units_by_name, &repo_commit_unit, NULL);
@@ -180 +203 @@
         }
 
-        if (unit->state == STATE_EMBRYO) {
-                hash_table_remove_item(&units_by_name, ht_link);
-                list_remove(&unit->units);
-                unit_destroy(&unit);
+        if (unit->repo_state == REPO_EMBRYO) {
+                repo_remove_unit_internal(unit);
+        } else if (unit->repo_state == REPO_ZOMBIE) {
+                unit->repo_state = REPO_LIVING;
         }