Changeset 269bc459 in mainline

Timestamp:

2018-11-11T15:47:39Z (5 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

45c8eea

Parents:

8a18d5b

git-author:

Jakub Jermar <jakub@…> (2018-11-10 17:01:38)

git-committer:

Jakub Jermar <jakub@…> (2018-11-11 15:47:39)

Message:

Add SYS_WAITQ_DESTROY

Files:

• abi/include/abi/syscall.h (modified) (1 diff)
• kernel/generic/include/synch/syswaitq.h (modified) (1 diff)
• kernel/generic/src/synch/syswaitq.c (modified) (1 diff)
• kernel/generic/src/syscall/syscall.c (modified) (1 diff)
• uspace/lib/c/generic/private/fibril.h (modified) (1 diff)
• uspace/lib/c/generic/private/futex.h (modified) (1 diff)
• uspace/lib/c/generic/thread/fibril_synch.c (modified) (1 diff)
• uspace/lib/c/generic/thread/mpsc.c (modified) (1 diff)

abi/include/abi/syscall.h

@@ -54 +54 @@
         SYS_WAITQ_SLEEP,
         SYS_WAITQ_WAKEUP,
+        SYS_WAITQ_DESTROY,
         SYS_SMC_COHERENCE,
 

kernel/generic/include/synch/syswaitq.h

@@ -46 +46 @@
 extern sys_errno_t sys_waitq_sleep(cap_waitq_handle_t, uintptr_t);
 extern sys_errno_t sys_waitq_wakeup(cap_waitq_handle_t);
+extern sys_errno_t sys_waitq_destroy(cap_waitq_handle_t);
 
 #endif

kernel/generic/src/synch/syswaitq.c

@@ -123 +123 @@
 }
 
+/** Destroy a waitq
+ *
+ * @param whandle  Waitq capability handle of the waitq to be destroyed.
+ *
+ * @return         Error code.
+ */
+sys_errno_t sys_waitq_destroy(cap_waitq_handle_t whandle)
+{
+        kobject_t *kobj = cap_unpublish(TASK, whandle, KOBJECT_TYPE_WAITQ);
+        if (!kobj)
+                return (sys_errno_t) ENOENT;
+        kobject_put(kobj);
+        cap_free(TASK, whandle);
+        return EOK;
+}
+
 /** Sleep in the waitq
  *

kernel/generic/src/syscall/syscall.c

@@ -139 +139 @@
         [SYS_WAITQ_SLEEP] = (syshandler_t) sys_waitq_sleep,
         [SYS_WAITQ_WAKEUP] = (syshandler_t) sys_waitq_wakeup,
+        [SYS_WAITQ_DESTROY] = (syshandler_t) sys_waitq_destroy,
         [SYS_SMC_COHERENCE] = (syshandler_t) sys_smc_coherence,
 

uspace/lib/c/generic/private/fibril.h

@@ -127 +127 @@
 
 extern void fibril_rmutex_initialize(fibril_rmutex_t *);
+extern void fibril_rmutex_destroy(fibril_rmutex_t *);
 extern void fibril_rmutex_lock(fibril_rmutex_t *);
 extern bool fibril_rmutex_trylock(fibril_rmutex_t *);

uspace/lib/c/generic/private/futex.h

@@ -55 +55 @@
 
 extern void futex_initialize(futex_t *futex, int value);
+
+static inline errno_t futex_destroy(futex_t *futex)
+{
+        if (futex->whandle)
+                return __SYSCALL1(SYS_WAITQ_DESTROY, (sysarg_t) futex->whandle);
+        return EOK;
+}
 
 #ifdef CONFIG_DEBUG_FUTEX

uspace/lib/c/generic/thread/fibril_synch.c

@@ -54 +54 @@
 {
         futex_initialize(&m->futex, 1);
+}
+
+void fibril_rmutex_destroy(fibril_rmutex_t *m)
+{
+        futex_destroy(&m->futex);
 }
 

uspace/lib/c/generic/thread/mpsc.c

@@ -97 +97 @@
         }
 
-        // TODO: fibril_rmutex_destroy()
+        fibril_rmutex_destroy(&q->t_lock);
 
         free(q);