Changeset 7f1c620 in mainline for generic/src/synch/futex.c

Timestamp:

2006-07-04T17:17:56Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0ffa3ef5

Parents:

991779c5

Message:

Replace old u?? types with respective C99 variants (e.g. uint32_t, int64_t, uintptr_t etc.).

File:

• generic/src/synch/futex.c (modified) (10 diffs)

generic/src/synch/futex.c

@@ -59 +59 @@
 static void futex_initialize(futex_t *futex);
 
-static futex_t *futex_find(__address paddr);
-static index_t futex_ht_hash(__native *key);
-static bool futex_ht_compare(__native *key, count_t keys, link_t *item);
+static futex_t *futex_find(uintptr_t paddr);
+static index_t futex_ht_hash(unative_t *key);
+static bool futex_ht_compare(unative_t *key, count_t keys, link_t *item);
 static void futex_ht_remove_callback(link_t *item);
 
@@ -109 +109 @@
  *         If there is no physical mapping for uaddr ENOENT is returned.
  */
-__native sys_futex_sleep_timeout(__address uaddr, __u32 usec, int flags)
-{
-        futex_t *futex;
-        __address paddr;
+unative_t sys_futex_sleep_timeout(uintptr_t uaddr, uint32_t usec, int flags)
+{
+        futex_t *futex;
+        uintptr_t paddr;
         pte_t *t;
         ipl_t ipl;
@@ -126 +126 @@
                 page_table_unlock(AS, true);
                 interrupts_restore(ipl);
-                return (__native) ENOENT;
+                return (unative_t) ENOENT;
         }
         paddr = PTE_GET_FRAME(t) + (uaddr - ALIGN_DOWN(uaddr, PAGE_SIZE));
@@ -135 +135 @@
         futex = futex_find(paddr);
         
-        return (__native) waitq_sleep_timeout(&futex->wq, usec, flags | SYNCH_FLAGS_INTERRUPTIBLE);
+        return (unative_t) waitq_sleep_timeout(&futex->wq, usec, flags | SYNCH_FLAGS_INTERRUPTIBLE);
 }
 
@@ -144 +144 @@
  * @return ENOENT if there is no physical mapping for uaddr.
  */
-__native sys_futex_wakeup(__address uaddr)
-{
-        futex_t *futex;
-        __address paddr;
+unative_t sys_futex_wakeup(uintptr_t uaddr)
+{
+        futex_t *futex;
+        uintptr_t paddr;
         pte_t *t;
         ipl_t ipl;
@@ -161 +161 @@
                 page_table_unlock(AS, true);
                 interrupts_restore(ipl);
-                return (__native) ENOENT;
+                return (unative_t) ENOENT;
         }
         paddr = PTE_GET_FRAME(t) + (uaddr - ALIGN_DOWN(uaddr, PAGE_SIZE));
@@ -183 +183 @@
  * @return Address of the kernel futex structure.
  */
-futex_t *futex_find(__address paddr)
+futex_t *futex_find(uintptr_t paddr)
 {
         link_t *item;
@@ -276 +276 @@
  * @return Index into futex hash table.
  */
-index_t futex_ht_hash(__native *key)
+index_t futex_ht_hash(unative_t *key)
 {
         return *key & (FUTEX_HT_SIZE-1);
@@ -287 +287 @@
  * @return True if the item matches the key. False otherwise.
  */
-bool futex_ht_compare(__native *key, count_t keys, link_t *item)
+bool futex_ht_compare(unative_t *key, count_t keys, link_t *item)
 {
         futex_t *futex;
@@ -324 +324 @@
                 for (i = 0; i < node->keys; i++) {
                         futex_t *ftx;
-                        __address paddr = node->key[i];
+                        uintptr_t paddr = node->key[i];
                         
                         ftx = (futex_t *) node->value[i];