Changeset ed5367b in mainline for uspace/srv/sysman/sm_task.c

Timestamp:

2019-08-07T10:01:13Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

a097c50

Parents:

68ae40a

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-11-05 01:52:07)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-07 10:01:13)

Message:

sysman: Implement stopping units

Currently fails service monitoring because of taskman flawed event flags.
However, job closure works well.

File:

• uspace/srv/sysman/sm_task.c (modified) (1 diff)

uspace/srv/sysman/sm_task.c

@@ -101 +101 @@
         sysman_log(LVL_DEBUG2, "%s, %s(%i)@%" PRIu64 " %i",
             __func__, unit_name(u), u->state, tev->task_id, tev->flags);
-        assert(u->state == STATE_STARTING);
 
         if (tev->flags & TASK_WAIT_EXIT) {
                 // TODO maybe call unit_fail (would be nice to contain reason)
-                u->state = STATE_FAILED;
-        } else {
+                //      or move this whole logic to unit_svc.c
+                if (u->state == STATE_STOPPING) {
+                        u->state = STATE_STOPPED;
+                } else {
+                        // if it has also retval == 0 then it's not fail
+                        u->state = STATE_FAILED;
+                }
+        }
+        if (tev->flags & TASK_WAIT_RETVAL) {
+                assert(u->state == STATE_STARTING);
                 u->state = STATE_STARTED;
         }