Changes in kernel/generic/src/synch/syswaitq.c [455241b:111b9b9] in mainline

File:

• kernel/generic/src/synch/syswaitq.c (modified) (7 diffs)

kernel/generic/src/synch/syswaitq.c

@@ -48 +48 @@
 static slab_cache_t *waitq_cache;
 
-typedef struct {
-        kobject_t kobject;
-        waitq_t waitq;
-} waitq_kobject_t;
-
-static void waitq_destroy(kobject_t *arg)
+static void waitq_destroy(void *arg)
 {
-        waitq_kobject_t *wq = (waitq_kobject_t *) arg;
+        waitq_t *wq = (waitq_t *) arg;
         slab_free(waitq_cache, wq);
 }
 
 kobject_ops_t waitq_kobject_ops = {
-        .destroy = waitq_destroy,
+        .destroy = waitq_destroy
 };
+
+static bool waitq_cap_cleanup_cb(cap_t *cap, void *arg)
+{
+        kobject_t *kobj = cap_unpublish(cap->task, cap->handle,
+            KOBJECT_TYPE_WAITQ);
+        kobject_put(kobj);
+        cap_free(cap->task, cap->handle);
+        return true;
+}
 
 /** Initialize the user waitq subsystem */
 void sys_waitq_init(void)
 {
-        waitq_cache = slab_cache_create("syswaitq_t", sizeof(waitq_kobject_t),
-            0, NULL, NULL, 0);
+        waitq_cache = slab_cache_create("waitq_t", sizeof(waitq_t), 0, NULL,
+            NULL, 0);
+}
+
+/** Clean-up all waitq capabilities held by the exiting task */
+void sys_waitq_task_cleanup(void)
+{
+        caps_apply_to_kobject_type(TASK, KOBJECT_TYPE_WAITQ,
+            waitq_cap_cleanup_cb, NULL);
 }
 
@@ -79 +90 @@
 sys_errno_t sys_waitq_create(uspace_ptr_cap_waitq_handle_t whandle)
 {
-        waitq_kobject_t *kobj = slab_alloc(waitq_cache, FRAME_ATOMIC);
-        if (!kobj)
+        waitq_t *wq = slab_alloc(waitq_cache, FRAME_ATOMIC);
+        if (!wq)
                 return (sys_errno_t) ENOMEM;
+        waitq_initialize(wq);
 
-        kobject_initialize(&kobj->kobject, KOBJECT_TYPE_WAITQ);
-        waitq_initialize(&kobj->waitq);
+        kobject_t *kobj = kobject_alloc(0);
+        if (!kobj) {
+                slab_free(waitq_cache, wq);
+                return (sys_errno_t) ENOMEM;
+        }
+        kobject_initialize(kobj, KOBJECT_TYPE_WAITQ, wq);
 
         cap_handle_t handle;
         errno_t rc = cap_alloc(TASK, &handle);
         if (rc != EOK) {
-                slab_free(waitq_cache, kobj);
+                slab_free(waitq_cache, wq);
+                kobject_free(kobj);
                 return (sys_errno_t) rc;
         }
@@ -96 +113 @@
         if (rc != EOK) {
                 cap_free(TASK, handle);
-                slab_free(waitq_cache, kobj);
+                kobject_free(kobj);
+                slab_free(waitq_cache, wq);
                 return (sys_errno_t) rc;
         }
 
-        cap_publish(TASK, handle, &kobj->kobject);
+        cap_publish(TASK, handle, kobj);
 
         return (sys_errno_t) EOK;
@@ -133 +151 @@
     unsigned int flags)
 {
-        waitq_kobject_t *kobj =
-            (waitq_kobject_t *) kobject_get(TASK, whandle, KOBJECT_TYPE_WAITQ);
+        kobject_t *kobj = kobject_get(TASK, whandle, KOBJECT_TYPE_WAITQ);
         if (!kobj)
                 return (sys_errno_t) ENOENT;
@@ -142 +159 @@
 #endif
 
-        errno_t rc = _waitq_sleep_timeout(&kobj->waitq, timeout,
+        errno_t rc = _waitq_sleep_timeout(kobj->waitq, timeout,
             SYNCH_FLAGS_INTERRUPTIBLE | flags);
 
@@ -149 +166 @@
 #endif
 
-        kobject_put(&kobj->kobject);
+        kobject_put(kobj);
 
         return (sys_errno_t) rc;
@@ -162 +179 @@
 sys_errno_t sys_waitq_wakeup(cap_waitq_handle_t whandle)
 {
-        waitq_kobject_t *kobj =
-            (waitq_kobject_t *) kobject_get(TASK, whandle, KOBJECT_TYPE_WAITQ);
+        kobject_t *kobj = kobject_get(TASK, whandle, KOBJECT_TYPE_WAITQ);
         if (!kobj)
                 return (sys_errno_t) ENOENT;
 
-        waitq_wake_one(&kobj->waitq);
+        waitq_wake_one(kobj->waitq);
 
-        kobject_put(&kobj->kobject);
+        kobject_put(kobj);
         return (sys_errno_t) EOK;
 }