Changeset d314571 in mainline

Timestamp:

2018-11-11T15:46:26Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9e889f6

Parents:

5c03bd30

git-author:

Jakub Jermar <jakub@…> (2018-11-10 14:36:06)

git-committer:

Jakub Jermar <jakub@…> (2018-11-11 15:46:26)

Message:

Turn wait queue into a kobject usable by uspace

In order to provide an elegant synchronization mechanism for userspace,
this commit adds syscalls to create, sleep on and wakeup from a wait
queue.

Files:

• abi/include/abi/cap.h (modified) (1 diff)
• abi/include/abi/syscall.h (modified) (1 diff)
• kernel/Makefile (modified) (1 diff)
• kernel/generic/include/cap/cap.h (modified) (3 diffs)
• kernel/generic/include/synch/syswaitq.h (added)
• kernel/generic/include/synch/waitq.h (modified) (1 diff)
• kernel/generic/src/main/main.c (modified) (2 diffs)
• kernel/generic/src/proc/thread.c (modified) (2 diffs)
• kernel/generic/src/synch/syswaitq.c (added)
• kernel/generic/src/syscall/syscall.c (modified) (2 diffs)

abi/include/abi/cap.h

@@ -52 +52 @@
 } *cap_irq_handle_t;
 
+typedef struct {
+} *cap_waitq_handle_t;
+
 #endif
 

abi/include/abi/syscall.h

@@ -51 +51 @@
         SYS_PROGRAM_SPAWN_LOADER,
 
+        SYS_WAITQ_CREATE,
+        SYS_WAITQ_SLEEP,
+        SYS_WAITQ_WAKEUP,
         SYS_FUTEX_SLEEP,
         SYS_FUTEX_WAKEUP,

kernel/Makefile

@@ -228 +228 @@
         generic/src/synch/waitq.c \
         generic/src/synch/futex.c \
+        generic/src/synch/syswaitq.c \
         generic/src/smp/ipi.c \
         generic/src/smp/smp.c \

kernel/generic/include/cap/cap.h

@@ -55 +55 @@
         KOBJECT_TYPE_IRQ,
         KOBJECT_TYPE_PHONE,
+        KOBJECT_TYPE_WAITQ,
         KOBJECT_TYPE_MAX
 } kobject_type_t;
@@ -63 +64 @@
 struct irq;
 struct phone;
+struct waitq;
 
 typedef struct kobject_ops {
@@ -88 +90 @@
                 struct irq *irq;
                 struct phone *phone;
+                struct waitq *waitq;
         };
 } kobject_t;

kernel/generic/include/synch/waitq.h

@@ -49 +49 @@
  *
  */
-typedef struct {
+typedef struct waitq {
         /** Lock protecting wait queue structure.
          *

kernel/generic/src/main/main.c

@@ -78 +78 @@
 #include <synch/waitq.h>
 #include <synch/futex.h>
+#include <synch/syswaitq.h>
 #include <arch/arch.h>
 #include <arch.h>
@@ -279 +280 @@
         thread_init();
         futex_init();
+        sys_waitq_init();
 
         sysinfo_set_item_data("boot_args", NULL, bargs, str_size(bargs) + 1);

kernel/generic/src/proc/thread.c

@@ -48 +48 @@
 #include <synch/spinlock.h>
 #include <synch/waitq.h>
+#include <synch/syswaitq.h>
 #include <cpu.h>
 #include <str.h>
@@ -520 +521 @@
                         ipc_cleanup();
                         futex_task_cleanup();
+                        sys_waitq_task_cleanup();
                         LOG("Cleanup of task %" PRIu64 " completed.", TASK->taskid);
                 }

kernel/generic/src/syscall/syscall.c

@@ -48 +48 @@
 #include <synch/futex.h>
 #include <synch/smc.h>
+#include <synch/syswaitq.h>
 #include <ddi/ddi.h>
 #include <ipc/event.h>
@@ -136 +137 @@
 
         /* Synchronization related syscalls. */
+        [SYS_WAITQ_CREATE] = (syshandler_t) sys_waitq_create,
+        [SYS_WAITQ_SLEEP] = (syshandler_t) sys_waitq_sleep,
+        [SYS_WAITQ_WAKEUP] = (syshandler_t) sys_waitq_wakeup,
         [SYS_FUTEX_SLEEP] = (syshandler_t) sys_futex_sleep,
         [SYS_FUTEX_WAKEUP] = (syshandler_t) sys_futex_wakeup,