Changeset 8d74fdd in mainline for uspace/srv/sysman/connection_ctl.c

Timestamp:

2019-08-17T13:57:05Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

f92b315

Parents:

be07995

git-author:

Michal Koutný <xm.koutny+hos@…> (2016-01-27 00:01:13)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-17 13:57:05)

Message:

sysman: Shutdown operation as shutdown.tgt isolation

Since not all dependencies are captured by graph, sysman and taskman are
ignored when stopping servers, so that they can complete the shutdown
transition.

Conflicts:

boot/Makefile.common

File:

• uspace/srv/sysman/connection_ctl.c (modified) (7 diffs)

uspace/srv/sysman/connection_ctl.c

@@ -36 +36 @@
 #include "connection_ctl.h"
 #include "job.h"
+#include "job_closure.h"
 #include "log.h"
+#include "shutdown.h"
 #include "sysman.h"
 
@@ -114 +116 @@
 
         if (!(flags & IPC_FLAG_BLOCKING)) {
-                retval = sysman_run_job(unit, STATE_STARTED, NULL, NULL);
+                retval = sysman_run_job(unit, STATE_STARTED, 0, NULL, NULL);
                 goto answer;
         }
@@ -123 +125 @@
                 goto answer;
         }
-        retval = sysman_run_job(unit, STATE_STARTED, &answer_callback,
+        retval = sysman_run_job(unit, STATE_STARTED, 0, &answer_callback,
             iid_ptr);
         if (retval != EOK) {
@@ -154 +156 @@
 
         if (!(flags & IPC_FLAG_BLOCKING)) {
-                retval = sysman_run_job(unit, state, NULL, NULL);
+                retval = sysman_run_job(unit, state, 0, NULL, NULL);
                 goto answer;
         }
@@ -163 +165 @@
                 goto answer;
         }
-        retval = sysman_run_job(unit, state, &answer_callback,
+        retval = sysman_run_job(unit, state, 0, &answer_callback,
             iid_ptr);
         if (retval != EOK) {
@@ -278 +280 @@
 }
 
+static void sysman_shutdown(ipc_callid_t iid, ipc_call_t *icall)
+{
+        int retval;
+        unit_t *u = repo_find_unit_by_name(TARGET_SHUTDOWN);
+        if (u == NULL) {
+                retval = ENOENT;
+                goto finish;
+        }
+
+        retval = sysman_run_job(u, STATE_STARTED, CLOSURE_ISOLATE,
+            shutdown_cb, NULL);
+
+finish:
+        async_answer_0(iid, retval);
+}
+
 void sysman_connection_ctl(ipc_callid_t iid, ipc_call_t *icall)
 {
@@ -315 +333 @@
                         sysman_unit_get_state(callid, &call);
                         break;
+                case SYSMAN_CTL_SHUTDOWN:
+                        sysman_shutdown(callid, &call);
+                        break;
                 default:
                         async_answer_0(callid, ENOENT);