Changeset 8d74fdd in mainline for uspace/srv/sysman/sysman.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/sysman.c (modified) (5 diffs)

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)",