Changeset ed5367b in mainline for uspace/srv/sysman/job_closure.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/job_closure.c (modified) (10 diffs)

uspace/srv/sysman/job_closure.c

@@ -39 +39 @@
 
 /** Struct describes how to traverse units graph */
-typedef struct {
+struct bfs_ops;
+typedef struct bfs_ops bfs_ops_t;
+
+struct bfs_ops {
         enum {
                 BFS_FORWARD,  /**< Follow oriented edges */
@@ -46 +49 @@
 
         /** Visit a unit via edge
-         * unit, incoming edge, user data
+         * unit, incoming edge, traversing ops, user data
          * return result of visit (error stops further traversal)
          */
-        int (* visit)(unit_t *, unit_edge_t *, void *);
+        int (* visit)(unit_t *, unit_edge_t *, bfs_ops_t *, void *);
 
         /** Clean units remaining in BFS queue after error */
-        void (* clean)(unit_t *, void *);
-} bfs_ops_t;
+        void (* clean)(unit_t *, bfs_ops_t *, void *);
+};
 
 /*
@@ -83 +86 @@
  * @return EOK on success
  */
-static int start_visit(unit_t *u, unit_edge_t *e, void *arg)
+static int visit_propagate_job(unit_t *u, unit_edge_t *e, bfs_ops_t *ops,
+    void *arg)
 {
         int rc = EOK;
@@ -99 +103 @@
         }
 
-        job_t *job = e->input->bfs_data;
+        job_t *job = (ops->direction == BFS_FORWARD) ?
+            e->input->bfs_data :
+            e->output->bfs_data;
+
         assert(job != NULL);
 
@@ -129 +136 @@
 }
 
-static void traverse_clean(unit_t *u, void *arg)
+static void traverse_clean(unit_t *u, bfs_ops_t *ops, void *arg)
 {
         job_t *job = u->bfs_data;
@@ -144 +151 @@
         unit_t *unit = origin;
 
-        rc = ops->visit(unit, NULL, arg);
+        rc = ops->visit(unit, NULL, ops, arg);
         if (rc != EOK) {
                 goto finish;
@@ -164 +171 @@
                                 list_append(&u->bfs_link, &units_fifo);
                         }
-                        rc = ops->visit(u, e, arg);
+                        rc = ops->visit(u, e, ops, arg);
                         if (rc != EOK) {
                                 goto finish;
@@ -175 +182 @@
                                 list_append(&u->bfs_link, &units_fifo);
                         }
-                        rc = ops->visit(u, e, arg);
+                        rc = ops->visit(u, e, ops, arg);
                         if (rc != EOK) {
                                 goto finish;
@@ -187 +194 @@
         list_foreach_safe(units_fifo, cur_link, next_link) {
                 unit_t *u = list_get_instance(cur_link, unit_t, bfs_link);
-                ops->clean(u, arg);
+                ops->clean(u, ops, arg);
                 list_remove(cur_link);
         }
@@ -227 +234 @@
 
         static bfs_ops_t ops = {
-                .direction = BFS_FORWARD,
-                .visit = start_visit,
                 .clean = traverse_clean,
+                .visit = visit_propagate_job
         };
+
+        switch (main_job->target_state) {
+        case STATE_STARTED:
+                ops.direction = BFS_FORWARD;
+                break;
+        case STATE_STOPPED:
+                ops.direction = BFS_BACKWARD;
+                break;
+        default:
+                assert(false);
+        }
+
         int rc = dyn_array_append(job_closure, job_t *, main_job);
         if (rc != EOK) {