Changeset d5cca04 in mainline

Timestamp:

2019-08-17T13:10:27Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

ff20afc

Parents:

87a31ef2

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-12-04 13:30:06)

git-committer:

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

Message:

sysman: Remove unsynchronized access to observer hash table

File:

• uspace/srv/sysman/sysman.c (modified) (3 diffs)

uspace/srv/sysman/sysman.c

@@ -63 +63 @@
 } observed_object_t;
 
+typedef struct {
+        job_t *job;
+        callback_handler_t callback;
+        void *callback_arg;
+} job_args_t;
+
 static LIST_INITIALIZE(event_queue);
 static fibril_mutex_t event_queue_mtx;
@@ -214 +220 @@
         }
 
-        if (callback != NULL) {
-                job_add_ref(job);
-                //TODO sysman_object_observer is not fibril-safe CANNOT BE CALLED HERE!
-                sysman_object_observer(job, callback, callback_arg);
-        }
-
-        /* Pass reference to event */
-        sysman_raise_event(&sysman_event_job_process, job);
+        job_args_t *job_args = malloc(sizeof(job_args_t));
+        if (job_args == NULL) {
+                job_del_ref(&job);
+                return ENOMEM;
+        }
+
+        /* Pass reference to job_args */
+        job_args->job = job;
+        job_args->callback = callback;
+        job_args->callback_arg = callback_arg;
+
+        sysman_raise_event(&sysman_event_job_process, job_args);
 
         return EOK;
@@ -354 +364 @@
 void sysman_event_job_process(void *data)
 {
-        job_t *job = data;
+        job_args_t *job_args = data;
+        job_t *job = job_args->job;
         dyn_array_t job_closure;
         dyn_array_initialize(&job_closure, job_t *);
+
+        if (job_args->callback != NULL) {
+                job_add_ref(job);
+                sysman_object_observer(job, job_args->callback, job_args->callback_arg);
+        }
+        free(job_args);
 
         int rc = job_create_closure(job, &job_closure);