Changeset 3f7e1f24 in mainline for uspace/srv/sysman/units

Timestamp:

2019-08-03T08:28:26Z (7 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

095d03c

Parents:

d7c5fc0

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-04-22 17:54:08)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-03 08:28:26)

Message:

sysman: Refactored job manipulation (event loop + one main fibril)

Location:

uspace/srv/sysman/units

Files:

• unit_cfg.c (modified) (3 diffs)
• unit_mnt.c (modified) (1 diff)
• unit_tgt.c (modified) (1 diff)

uspace/srv/sysman/units/unit_cfg.c

@@ -176 +176 @@
                 }
 
-                assert(unit->state = STATE_EMBRYO);
+                assert(unit->state == STATE_EMBRYO);
                 configuration_add_unit(unit);
         }
@@ -232 +232 @@
         assert(u_cfg);
 
-        /*
-         * Skip starting state and hold state lock during whole configuration
-         * load.
-         */
-        fibril_mutex_lock(&unit->state_mtx);
         int rc = cfg_load_configuration(u_cfg->path);
         
@@ -244 +239 @@
                 unit->state = STATE_FAILED;
         }
-        fibril_condvar_broadcast(&unit->state_cv);
-        fibril_mutex_unlock(&unit->state_mtx);
 
         return rc;

uspace/srv/sysman/units/unit_mnt.c

@@ -87 +87 @@
 static int unit_mnt_start(unit_t *unit)
 {
+        // TODO replace with non-blocking
+        const bool blocking = true;
         unit_mnt_t *u_mnt = CAST_MNT(unit);
         assert(u_mnt);
 
-        fibril_mutex_lock(&unit->state_mtx);
         
         // TODO think about unit's lifecycle (is STOPPED only acceptable?)
         assert(unit->state == STATE_STOPPED);
-        unit->state = STATE_STARTING;
-        
-        fibril_condvar_broadcast(&unit->state_cv);
-        fibril_mutex_unlock(&unit->state_mtx);
 
 
         // TODO use other mount parameters
         int rc = mount(u_mnt->type, u_mnt->mountpoint, u_mnt->device, "",
-            IPC_FLAG_BLOCKING, 0);
+            blocking ? IPC_FLAG_BLOCKING : 0, 0);
 
-        if (rc == EOK) {
-                sysman_log(LVL_NOTE, "Mount ('%s') mounted", unit_name(unit));
-                unit_set_state(unit, STATE_STARTED);
+        if (blocking) {
+                if (rc == EOK) {
+                        sysman_log(LVL_DEBUG, "Mount ('%s') mounted", unit_name(unit));
+                        unit->state = STATE_STARTED;
+                } else {
+                        sysman_log(LVL_ERROR, "Mount ('%s') failed (%i)",
+                            unit_name(unit), rc);
+                        unit->state = STATE_FAILED;
+                }
         } else {
-                sysman_log(LVL_ERROR, "Mount ('%s') failed (%i)",
-                    unit_name(unit), rc);
-                unit_set_state(unit, STATE_FAILED);
+                if (rc == EOK) {
+                        sysman_log(LVL_DEBUG, "Mount ('%s') requested", unit_name(unit));
+                        unit->state = STATE_STARTING;
+                } else {
+                        sysman_log(LVL_ERROR, "Mount ('%s') request failed (%i)",
+                            unit_name(unit), rc);
+                        unit->state = STATE_FAILED;
+                }
         }
 

uspace/srv/sysman/units/unit_tgt.c

@@ -59 +59 @@
         assert(u_tgt);
 
+        unit->state = STATE_STARTED;
         return EOK;
 }