Changeset 8d74fdd in mainline

Timestamp:

2019-08-17T13:57:05Z (5 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

Location:

uspace

Files:

• app/sysctl/main.c (modified) (2 diffs)
• cfg/sysman/shutdown.tgt (added)
• lib/c/include/ipc/sysman.h (modified) (1 diff)
• lib/sysman/include/sysman/ctl.h (modified) (1 diff)
• lib/sysman/src/ctl.c (modified) (1 diff)
• srv/sysman/Makefile (modified) (1 diff)
• srv/sysman/connection_ctl.c (modified) (7 diffs)
• srv/sysman/job_closure.c (modified) (1 diff)
• srv/sysman/main.c (modified) (3 diffs)
• srv/sysman/shutdown.c (added)
• srv/sysman/shutdown.h (added)
• srv/sysman/sm_task.c (modified) (1 diff)
• srv/sysman/sysman.c (modified) (5 diffs)
• srv/sysman/sysman.h (modified) (2 diffs)
• srv/sysman/test/job_queue.c (modified) (5 diffs)
• srv/sysman/units/unit_svc.c (modified) (1 diff)
• srv/sysman/units/unit_svc.h (modified) (1 diff)

uspace/app/sysctl/main.c

@@ -39 +39 @@
 #include <str_error.h>
 #include <sysman/ctl.h>
+#include <unistd.h>
 
 #define NAME "sysctl"
@@ -141 +142 @@
 }
 
+static int shutdown(int argc, char *argv[])
+{
+        const int delay = 3;
+        printf("Will shutdown in %i seconds...\n", delay);
+        sleep(delay);
+        printf("Shutdown now.\n");
+
+        int rc = sysman_shutdown();
+        if (rc != EOK) {
+                printf("Shutdown request failed: %s.\n", str_error(rc));
+        }
+        return rc;
+}
+
 command_t commands[] = {
         { "list-units", 0, &list_units },
         { "start",      1, &start },
         { "stop",       1, &stop },
+        { "shutdown",   0, &shutdown },
         { 0 }
 };

uspace/lib/c/include/ipc/sysman.h

@@ -50 +50 @@
         SYSMAN_CTL_GET_UNITS,
         SYSMAN_CTL_UNIT_GET_NAME,
-        SYSMAN_CTL_UNIT_GET_STATE
+        SYSMAN_CTL_UNIT_GET_STATE,
+        SYSMAN_CTL_SHUTDOWN
 } sysman_ipc_method_t;
 

uspace/lib/sysman/include/sysman/ctl.h

@@ -43 +43 @@
 int sysman_unit_get_name(unit_handle_t, char *, size_t);
 int sysman_unit_get_state(unit_handle_t, unit_state_t *);
+
+int sysman_shutdown(void);
 #endif

uspace/lib/sysman/src/ctl.c

@@ -192 +192 @@
         return rc;
 }
+
+int sysman_shutdown(void)
+{
+        async_exch_t *exch = sysman_exchange_begin(SYSMAN_PORT_CTL);
+        int rc = async_req_0_0(exch, SYSMAN_CTL_SHUTDOWN);
+        sysman_exchange_end(exch);
+
+        return rc;
+}

uspace/srv/sysman/Makefile

@@ -46 +46 @@
         log.c \
         repo.c \
+        shutdown.c \
         sm_task.c \
         sysman.c \

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);

uspace/srv/sysman/job_closure.c

@@ -295 +295 @@
 /** Creates job closure for given basic job
  *
- * @note It is caller's responsibility to clean job_closure (event on error).
+ * @note It is caller's responsibility to clean job_closure (even on error).
  *
  * @return EOK on success otherwise propagated error

uspace/srv/sysman/main.c

@@ -38 +38 @@
 #include <taskman.h>
 
-#include "repo.h"
 #include "connection_broker.h"
 #include "connection_ctl.h"
@@ -44 +43 @@
 #include "job_queue.h"
 #include "log.h"
+#include "repo.h"
+#include "sm_task.h"
 #include "sysman.h"
-#include "sm_task.h"
 #include "unit.h"
 
 #define NAME "sysman"
-
-#define INITRD_DEVICE       "bd/initrd"
-#define INITRD_MOUNT_POINT  "/"
-#define INITRD_CFG_PATH     "/cfg/sysman"
-
-#define TARGET_INIT     "initrd.tgt"
-#define TARGET_ROOTFS   "rootfs.tgt"
-#define TARGET_DEFAULT  "default.tgt"
-
-#define UNIT_MNT_INITRD "initrd.mnt"
-#define UNIT_CFG_INITRD "init.cfg"
-
 
 static const char *target_sequence[] = {
@@ -195 +183 @@
         }
 
-        int rc = sysman_run_job(tgt, STATE_STARTED, &sequence_job_handler,
+        int rc = sysman_run_job(tgt, STATE_STARTED, 0, &sequence_job_handler,
             target_name_ptr);
 

uspace/srv/sysman/sm_task.c

@@ -106 +106 @@
          * name */
 
+        /*
+         * Temporary workaround to avoid killing ourselves during shutdown,
+         * eventually should be captured by dependencies.
+         */
+        if (tid == task_get_id() || tid == 2 /*taskman*/) {
+                CAST_SVC(u_svc)->critical = true;
+        }
+
         repo_begin_update();
         in_repo_update = true;

uspace/srv/sysman/sysman.c

@@ -65 +65 @@
 typedef struct {
         job_t *job;
+        int flags;
         callback_handler_t callback;
         void *callback_arg;
@@ -205 +206 @@
  * If unit already has the same job assigned callback is moved to it.
  *
- * @param[in]  callback  (optional) callback must explicitly delete reference
- *                       to job, void callback(void *job, void *callback_arg)
- *
- * return EBUSY  unit already has a job assigned of different type
- */
-int sysman_run_job(unit_t *unit, unit_state_t target_state,
+ * @param[in]  flags        additional flags for job
+ * @param[in]  callback     (optional) callback must explicitly delete reference
+ *                          to job, void callback(void *job, void *callback_arg)
+ * @param[in]  callback_arg
+ *
+ * @return EOK on successfully queued job
+ */
+int sysman_run_job(unit_t *unit, unit_state_t target_state, int flags,
     callback_handler_t callback, void *callback_arg)
 {
@@ -226 +229 @@
         /* Pass reference to job_args */
         job_args->job = job;
+        job_args->flags = flags;
         job_args->callback = callback;
         job_args->callback_arg = callback_arg;
@@ -364 +368 @@
         job_args_t *job_args = data;
         job_t *job = job_args->job;
+        int flags = job_args->flags;
         dyn_array_t job_closure;
         dyn_array_initialize(&job_closure, job_t *);
@@ -373 +378 @@
         free(job_args);
 
-        int rc = job_create_closure(job, &job_closure, 0);
+        int rc = job_create_closure(job, &job_closure, flags);
         if (rc != EOK) {
                 sysman_log(LVL_ERROR, "Cannot create closure for job %p (%i)",

uspace/srv/sysman/sysman.h

@@ -30 +30 @@
 #define SYSMAN_SYSMAN_H
 
+#define INITRD_DEVICE       "bd/initrd"
+#define INITRD_MOUNT_POINT  "/"
+#define INITRD_CFG_PATH     "/cfg/sysman"
+
+// TODO configurable
+#define TARGET_INIT     "initrd.tgt"
+#define TARGET_ROOTFS   "rootfs.tgt"
+#define TARGET_DEFAULT  "default.tgt"
+#define TARGET_SHUTDOWN "shutdown.tgt"
+
+#define UNIT_MNT_INITRD "initrd.mnt"
+#define UNIT_CFG_INITRD "init.cfg"
+
 #include "job.h"
 #include "unit.h"
@@ -38 +51 @@
 extern void sysman_events_init(void);
 extern int sysman_events_loop(void *);
-extern int sysman_run_job(unit_t *, unit_state_t, callback_handler_t, void *);
+extern int sysman_run_job(unit_t *, unit_state_t, int, callback_handler_t, void *);
 
 

uspace/srv/sysman/test/job_queue.c

@@ -83 +83 @@
         job_t *job = NULL;
 
-        int rc = sysman_run_job(u, STATE_STARTED, &job_finished_cb,
+        int rc = sysman_run_job(u, STATE_STARTED, 0, &job_finished_cb,
             &job);
         PCUT_ASSERT_INT_EQUALS(EOK, rc);
@@ -102 +102 @@
         job_t *job = NULL;
 
-        int rc = sysman_run_job(u, STATE_STARTED, &job_finished_cb, &job);
+        int rc = sysman_run_job(u, STATE_STARTED, 0, &job_finished_cb, &job);
         PCUT_ASSERT_INT_EQUALS(EOK, rc);
 
@@ -142 +142 @@
         /* Run test */
         job_t *job = NULL;
-        int rc = sysman_run_job(s1, STATE_STARTED, &job_finished_cb, &job);
+        int rc = sysman_run_job(s1, STATE_STARTED, 0, &job_finished_cb, &job);
         PCUT_ASSERT_INT_EQUALS(EOK, rc);
 
@@ -163 +163 @@
         /* Create and start first job */
         job_t *j0 = NULL;
-        int rc = sysman_run_job(s0, STATE_STARTED, &job_finished_cb, &j0);
+        int rc = sysman_run_job(s0, STATE_STARTED, 0, &job_finished_cb, &j0);
         PCUT_ASSERT_INT_EQUALS(EOK, rc);
 
@@ -176 +176 @@
          */
         job_t *j1 = NULL;
-        rc = sysman_run_job(s0, STATE_STARTED, &job_finished_cb, &j1);
+        rc = sysman_run_job(s0, STATE_STARTED, 0, &job_finished_cb, &j1);
         PCUT_ASSERT_INT_EQUALS(EOK, rc);
 

uspace/srv/sysman/units/unit_svc.c

@@ -120 +120 @@
         assert(unit->state == STATE_STARTED);
 
+        /*
+         * Ugly trick -- critical service is running despite being stopped
+         * circumvent killing ourselves during shutdown (TODO dependencies).
+         */
+        if (u_svc->critical) {
+                unit->state = STATE_STOPPED;
+                return EOK;
+        }
+
         int rc = task_kill(u_svc->main_task_id);
 

uspace/srv/sysman/units/unit_svc.h

@@ -43 +43 @@
 
         bool anonymous;
+
+        /** Service can't be stopped, temporary workaround for shutdown */
+        bool critical;
 } unit_svc_t;