Changeset 7f1c620 in mainline for generic/src/synch

Timestamp:

2006-07-04T17:17:56Z (20 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.).

Location:

generic/src/synch

Files:

• condvar.c (modified) (1 diff)
• futex.c (modified) (10 diffs)
• mutex.c (modified) (1 diff)
• rwlock.c (modified) (2 diffs)
• semaphore.c (modified) (1 diff)
• spinlock.c (modified) (1 diff)
• waitq.c (modified) (3 diffs)

generic/src/synch/condvar.c

@@ -88 +88 @@
  * @return See comment for waitq_sleep_timeout().
  */
-int _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, __u32 usec, int flags)
+int _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec, int flags)
 {
         int rc;

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];

generic/src/synch/mutex.c

@@ -65 +65 @@
  * @return See comment for waitq_sleep_timeout().
  */
-int _mutex_lock_timeout(mutex_t *mtx, __u32 usec, int flags)
+int _mutex_lock_timeout(mutex_t *mtx, uint32_t usec, int flags)
 {
         return _semaphore_down_timeout(&mtx->sem, usec, flags);

generic/src/synch/rwlock.c

@@ -102 +102 @@
  * @return See comment for waitq_sleep_timeout().
  */
-int _rwlock_write_lock_timeout(rwlock_t *rwl, __u32 usec, int flags)
+int _rwlock_write_lock_timeout(rwlock_t *rwl, uint32_t usec, int flags)
 {
         ipl_t ipl;
@@ -156 +156 @@
  * @return See comment for waitq_sleep_timeout().
  */
-int _rwlock_read_lock_timeout(rwlock_t *rwl, __u32 usec, int flags)
+int _rwlock_read_lock_timeout(rwlock_t *rwl, uint32_t usec, int flags)
 {
         int rc;

generic/src/synch/semaphore.c

@@ -79 +79 @@
  * @return See comment for waitq_sleep_timeout().
  */
-int _semaphore_down_timeout(semaphore_t *s, __u32 usec, int flags)
+int _semaphore_down_timeout(semaphore_t *s, uint32_t usec, int flags)
 {
         return waitq_sleep_timeout(&s->wq, usec, flags); 

generic/src/synch/spinlock.c

@@ -109 +109 @@
                 if (i++ > DEADLOCK_THRESHOLD) {
                         printf("cpu%d: looping on spinlock %.*p:%s, caller=%.*p",
-                               CPU->id, sizeof(__address) * 2, sl, sl->name, sizeof(__address) * 2, CALLER);
+                               CPU->id, sizeof(uintptr_t) * 2, sl, sl->name, sizeof(uintptr_t) * 2, CALLER);
                         symbol = get_symtab_entry(CALLER);
                         if (symbol)

generic/src/synch/waitq.c

@@ -215 +215 @@
  * attempted.
  */
-int waitq_sleep_timeout(waitq_t *wq, __u32 usec, int flags)
+int waitq_sleep_timeout(waitq_t *wq, uint32_t usec, int flags)
 {
         ipl_t ipl;
@@ -298 +298 @@
  * @return See waitq_sleep_timeout().
  */
-int waitq_sleep_timeout_unsafe(waitq_t *wq, __u32 usec, int flags)
+int waitq_sleep_timeout_unsafe(waitq_t *wq, uint32_t usec, int flags)
 {
         /* checks whether to go to sleep at all */
@@ -352 +352 @@
                 }
                 THREAD->timeout_pending = true;
-                timeout_register(&THREAD->sleep_timeout, (__u64) usec, waitq_timeouted_sleep, THREAD);
+                timeout_register(&THREAD->sleep_timeout, (uint64_t) usec, waitq_timeouted_sleep, THREAD);
         }