Changeset 73f7c4e in mainline

Timestamp:

2019-08-06T18:29:02Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

c2d50c8

Parents:

c1b2084

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-05-24 09:32:10)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-06 18:29:02)

Message:

sysman: Create tests for job control

• units are mocked by patching virtual methods table
• sysman_process_queue to enforce emptying event queue

Conflicts:

.bzrignore
boot/Makefile.common

Location:

uspace/srv/sysman

Files:

• Makefile (modified) (3 diffs)
• main.c (modified) (2 diffs)
• sysman.c (modified) (6 diffs)
• sysman.h (modified) (1 diff)
• test/job_closure.c (added)
• test/job_queue.c (added)
• test/main.c (added)
• test/mock_unit.c (added)
• test/mock_unit.h (added)

uspace/srv/sysman/Makefile

@@ -37 +37 @@
 STATIC_NEEDED = y
 
-SOURCES = \
+SYSMAN_SOURCES = \
         configuration.c \
         connection_broker.c \
@@ -43 +43 @@
         dep.c \
         job.c \
-        main.c \
         sysman.c \
         unit.c \
@@ -52 +51 @@
         util.c
 
+SOURCES = \
+        main.c \
+        $(SYSMAN_SOURCES)
+
+TEST_SOURCES = \
+        $(SYSMAN_SOURCES) \
+        test/job_closure.c \
+        test/job_queue.c \
+        test/mock_unit.c \
+        test/main.c
+
 include $(USPACE_PREFIX)/Makefile.common

uspace/srv/sysman/main.c

@@ -59 +59 @@
 #define UNIT_CFG_INITRD "init.cfg"
 
+
 static const char *target_sequence[] = {
         TARGET_INIT,
@@ -192 +193 @@
         }
 
-        int rc = sysman_queue_job(tgt, STATE_STARTED, &sequence_job_handler,
+        int rc = sysman_run_job(tgt, STATE_STARTED, &sequence_job_handler,
             target_name_ptr);
 

uspace/srv/sysman/sysman.c

@@ -62 +62 @@
 static LIST_INITIALIZE(event_queue);
 static fibril_mutex_t event_queue_mtx;
-static fibril_condvar_t event_queue_cv;
+static fibril_condvar_t event_queue_nonempty_cv;
+static fibril_condvar_t event_queue_empty_cv;
 
 static hash_table_t observed_objects;
@@ -123 +124 @@
 {
         fibril_mutex_initialize(&event_queue_mtx);
-        fibril_condvar_initialize(&event_queue_cv);
+        fibril_condvar_initialize(&event_queue_nonempty_cv);
+        fibril_condvar_initialize(&event_queue_empty_cv);
 
         bool table =
@@ -141 +143 @@
                 fibril_mutex_lock(&event_queue_mtx);
                 while (list_empty(&event_queue)) {
-                        fibril_condvar_wait(&event_queue_cv, &event_queue_mtx);
+                        fibril_condvar_signal(&event_queue_empty_cv);
+                        fibril_condvar_wait(&event_queue_nonempty_cv,
+                            &event_queue_mtx);
                 }
 
@@ -160 +164 @@
 /** Create and queue job for unit
  *
+ * If unit already has the same job assigned callback is set to it.
+ *
  * @param[in]  callback  (optional) callback must explicitly delete reference
- *                       to job
- */
-int sysman_queue_job(unit_t *unit, unit_state_t target_state,
+ *                       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,
     callback_handler_t callback, void *callback_arg)
 {
-        job_t *job = job_create(unit, target_state);
-        if (job == NULL) {
-                return ENOMEM;
+        job_t *job;
+
+        if (unit->job != NULL) {
+                assert(unit->job->state != JOB_UNQUEUED);
+
+                if (unit->job->target_state != target_state) {
+                        return EBUSY;
+                }
+                job = unit->job;
+        } else {
+                job = job_create(unit, target_state);
+                if (job == NULL) {
+                        return ENOMEM;
+                }
+                /* Reference in unit is enough */
+                job_del_ref(&job);
         }
 
@@ -176 +197 @@
         }
 
-        job_add_ref(job);
-        sysman_raise_event(&sysman_event_job_process, job);
-
-        job_del_ref(&job);
+        if (job->state == JOB_UNQUEUED) {
+                job_add_ref(job);
+                sysman_raise_event(&sysman_event_job_process, job);
+        }
+
         return EOK;
 }
@@ -199 +221 @@
         list_append(&event->event_queue, &event_queue);
         /* There's only single event loop, broadcast is unnecessary */
-        fibril_condvar_signal(&event_queue_cv);
+        fibril_condvar_signal(&event_queue_nonempty_cv);
+        fibril_mutex_unlock(&event_queue_mtx);
+}
+
+/** Empty current content of event queue
+ *
+ * This is potentially blocking call and as long as fibrils are cooperatively
+ * scheduled, queue will be empty upon return from this function.
+ */
+void sysman_process_queue(void)
+{
+        fibril_mutex_lock(&event_queue_mtx);
+        while (!list_empty(&event_queue)) {
+                fibril_condvar_wait(&event_queue_empty_cv, &event_queue_mtx);
+        }
         fibril_mutex_unlock(&event_queue_mtx);
 }

uspace/srv/sysman/sysman.h

@@ -38 +38 @@
 extern void sysman_events_init(void);
 extern int sysman_events_loop(void *);
-extern int sysman_queue_job(unit_t *, unit_state_t, callback_handler_t, void *);
+extern int sysman_run_job(unit_t *, unit_state_t, callback_handler_t, void *);
 
 
 extern void sysman_raise_event(event_handler_t, void *);
+extern void sysman_process_queue(void);
 extern int sysman_object_observer(void *, callback_handler_t, void *);