Changeset aaa3c457 in mainline for kernel/generic/src

Timestamp:

2018-11-12T10:36:10Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a43dfcb

Parents:

3ce781f4 (diff), 6874bd2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jakub Jermář <jakub@…> (2018-11-12 10:36:10)

git-committer:

GitHub <noreply@…> (2018-11-12 10:36:10)

Message:

Merge pull request #56 from jermar/futexremoval

Remove kernel support for futexes in favor of waitq kobjects.

Location:

kernel/generic/src

Files:

• main/main.c (modified) (2 diffs)
• proc/task.c (modified) (2 diffs)
• proc/thread.c (modified) (2 diffs)
• synch/futex.c (deleted)
• synch/syswaitq.c (added)
• syscall/syscall.c (modified) (2 diffs)

kernel/generic/src/main/main.c

@@ -77 +77 @@
 #include <mm/reserve.h>
 #include <synch/waitq.h>
-#include <synch/futex.h>
+#include <synch/syswaitq.h>
 #include <arch/arch.h>
 #include <arch.h>
@@ -278 +278 @@
         task_init();
         thread_init();
-        futex_init();
+        sys_waitq_init();
 
         sysinfo_set_item_data("boot_args", NULL, bargs, str_size(bargs) + 1);

kernel/generic/src/proc/task.c

@@ -43 +43 @@
 #include <mm/slab.h>
 #include <atomic.h>
-#include <synch/futex.h>
 #include <synch/spinlock.h>
 #include <synch/waitq.h>
@@ -251 +250 @@
         }
 
-        futex_task_init(task);
-
         irq_spinlock_lock(&tasks_lock, true);
 

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>
@@ -519 +520 @@
                          */
                         ipc_cleanup();
-                        futex_task_cleanup();
+                        sys_waitq_task_cleanup();
                         LOG("Cleanup of task %" PRIu64 " completed.", TASK->taskid);
                 }

kernel/generic/src/syscall/syscall.c

@@ -46 +46 @@
 #include <interrupt.h>
 #include <ipc/sysipc.h>
-#include <synch/futex.h>
 #include <synch/smc.h>
+#include <synch/syswaitq.h>
 #include <ddi/ddi.h>
 #include <ipc/event.h>
@@ -136 +136 @@
 
         /* Synchronization related syscalls. */
-        [SYS_FUTEX_SLEEP] = (syshandler_t) sys_futex_sleep,
-        [SYS_FUTEX_WAKEUP] = (syshandler_t) sys_futex_wakeup,
+        [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_WAITQ_DESTROY] = (syshandler_t) sys_waitq_destroy,
         [SYS_SMC_COHERENCE] = (syshandler_t) sys_smc_coherence,