Changeset 84b14e2 in mainline for kernel/generic/src

Timestamp:

2009-12-02T23:33:48Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4924675

Parents:

089d746 (diff), 8d04f709 (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.

Message:

Merge simplified futexes (ticket #154) and fix for arm32 kernel atomic
operations (ticket #153).

Location:

kernel/generic/src

Files:

• mm/backend_phys.c (modified) (1 diff)
• proc/task.c (modified) (1 diff)
• proc/thread.c (modified) (1 diff)
• synch/futex.c (modified) (8 diffs)
• syscall/syscall.c (modified) (2 diffs)
• udebug/udebug_ops.c (modified) (1 diff)

kernel/generic/src/mm/backend_phys.c

@@ -40 +40 @@
 #include <arch/types.h>
 #include <mm/as.h>
+#include <mm/page.h>
 #include <mm/frame.h>
 #include <mm/slab.h>

kernel/generic/src/proc/task.c

@@ -54 +54 @@
 #include <func.h>
 #include <string.h>
+#include <memstr.h>
 #include <syscall/copy.h>
 #include <macros.h>

kernel/generic/src/proc/thread.c

@@ -812 +812 @@
 }
 
+/** Syscall wrapper for sleeping. */
+unative_t sys_thread_usleep(uint32_t usec)
+{
+        thread_usleep(usec);    
+        return 0;
+}
+
 /** @}
  */

kernel/generic/src/synch/futex.c

@@ -90 +90 @@
 /** Initialize kernel futex structure.
  *
- * @param futex Kernel futex structure.
+ * @param futex         Kernel futex structure.
  */
 void futex_initialize(futex_t *futex)
@@ -102 +102 @@
 /** Sleep in futex wait queue.
  *
- * @param uaddr Userspace address of the futex counter.
- * @param usec If non-zero, number of microseconds this thread is willing to
- *     sleep.
- * @param flags Select mode of operation.
- *
- * @return One of ESYNCH_TIMEOUT, ESYNCH_OK_ATOMIC and ESYNCH_OK_BLOCKED. See
- *     synch.h. If there is no physical mapping for uaddr ENOENT is returned.
- */
-unative_t sys_futex_sleep_timeout(uintptr_t uaddr, uint32_t usec, int flags)
+ * @param uaddr         Userspace address of the futex counter.
+ *
+ * @return              If there is no physical mapping for uaddr ENOENT is
+ *                      returned. Otherwise returns a wait result as defined in
+ *                      synch.h.
+ */
+unative_t sys_futex_sleep(uintptr_t uaddr)
 {
         futex_t *futex;
@@ -140 +138 @@
         udebug_stoppable_begin();
 #endif
-        rc = waitq_sleep_timeout(&futex->wq, usec, flags |
-            SYNCH_FLAGS_INTERRUPTIBLE);
-
+        rc = waitq_sleep_timeout(&futex->wq, 0, SYNCH_FLAGS_INTERRUPTIBLE); 
 #ifdef CONFIG_UDEBUG
         udebug_stoppable_end();
@@ -151 +147 @@
 /** Wakeup one thread waiting in futex wait queue.
  *
- * @param uaddr Userspace address of the futex counter.
- *
- * @return ENOENT if there is no physical mapping for uaddr.
+ * @param uaddr         Userspace address of the futex counter.
+ *
+ * @return              ENOENT if there is no physical mapping for uaddr.
  */
 unative_t sys_futex_wakeup(uintptr_t uaddr)
@@ -190 +186 @@
  * If the structure does not exist already, a new one is created.
  *
- * @param paddr Physical address of the userspace futex counter.
- *
- * @return Address of the kernel futex structure.
+ * @param paddr         Physical address of the userspace futex counter.
+ *
+ * @return              Address of the kernel futex structure.
  */
 futex_t *futex_find(uintptr_t paddr)
@@ -284 +280 @@
 /** Compute hash index into futex hash table.
  *
- * @param key Address where the key (i.e. physical address of futex counter) is
- *     stored.
- *
- * @return Index into futex hash table.
+ * @param key           Address where the key (i.e. physical address of futex
+ *                      counter) is stored.
+ *
+ * @return              Index into futex hash table.
  */
 size_t futex_ht_hash(unative_t *key)
@@ -296 +292 @@
 /** Compare futex hash table item with a key.
  *
- * @param key Address where the key (i.e. physical address of futex counter) is
- *     stored.
- *
- * @return True if the item matches the key. False otherwise.
+ * @param key           Address where the key (i.e. physical address of futex
+ *                      counter) is stored.
+ *
+ * @return              True if the item matches the key. False otherwise.
  */
 bool futex_ht_compare(unative_t *key, size_t keys, link_t *item)
@@ -313 +309 @@
 /** Callback for removal items from futex hash table.
  *
- * @param item Item removed from the hash table.
+ * @param item          Item removed from the hash table.
  */
 void futex_ht_remove_callback(link_t *item)

kernel/generic/src/syscall/syscall.c

@@ -111 +111 @@
         (syshandler_t) sys_thread_exit,
         (syshandler_t) sys_thread_get_id,
+        (syshandler_t) sys_thread_usleep,
         
         (syshandler_t) sys_task_get_id,
@@ -117 +118 @@
         
         /* Synchronization related syscalls. */
-        (syshandler_t) sys_futex_sleep_timeout,
+        (syshandler_t) sys_futex_sleep,
         (syshandler_t) sys_futex_wakeup,
         (syshandler_t) sys_smc_coherence,

kernel/generic/src/udebug/udebug_ops.c

@@ -50 +50 @@
 #include <udebug/udebug.h>
 #include <udebug/udebug_ops.h>
+#include <memstr.h>
 
 /**