Changeset 7f1c620 in mainline for generic/src/proc/thread.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/proc/thread.c (modified) (13 diffs)

generic/src/proc/thread.c

@@ -91 +91 @@
 
 SPINLOCK_INITIALIZE(tidlock);
-__u32 last_tid = 0;
+uint32_t last_tid = 0;
 
 static slab_cache_t *thread_slab;
@@ -255 +255 @@
 
         spinlock_lock(&threads_lock);
-        btree_remove(&threads_btree, (btree_key_t) ((__address ) t), NULL);
+        btree_remove(&threads_btree, (btree_key_t) ((uintptr_t ) t), NULL);
         spinlock_unlock(&threads_lock);
 
@@ -300 +300 @@
         
         /* Not needed, but good for debugging */
-        memsetb((__address)t->kstack, THREAD_STACK_SIZE * 1<<STACK_FRAMES, 0);
+        memsetb((uintptr_t)t->kstack, THREAD_STACK_SIZE * 1<<STACK_FRAMES, 0);
         
         ipl = interrupts_disable();
@@ -309 +309 @@
         
         context_save(&t->saved_context);
-        context_set(&t->saved_context, FADDR(cushion), (__address) t->kstack, THREAD_STACK_SIZE);
+        context_set(&t->saved_context, FADDR(cushion), (uintptr_t) t->kstack, THREAD_STACK_SIZE);
         
         the_initialize((the_t *) t->kstack);
@@ -369 +369 @@
          */
         spinlock_lock(&threads_lock);
-        btree_insert(&threads_btree, (btree_key_t) ((__address) t), (void *) t, NULL);
+        btree_insert(&threads_btree, (btree_key_t) ((uintptr_t) t), (void *) t, NULL);
         spinlock_unlock(&threads_lock);
         
@@ -412 +412 @@
  *
  */
-void thread_sleep(__u32 sec)
+void thread_sleep(uint32_t sec)
 {
         thread_usleep(sec*1000000);
@@ -425 +425 @@
  * @return An error code from errno.h or an error code from synch.h.
  */
-int thread_join_timeout(thread_t *t, __u32 usec, int flags)
+int thread_join_timeout(thread_t *t, uint32_t usec, int flags)
 {
         ipl_t ipl;
@@ -485 +485 @@
  *
  */     
-void thread_usleep(__u32 usec)
+void thread_usleep(uint32_t usec)
 {
         waitq_t wq;
@@ -565 +565 @@
         btree_node_t *leaf;
         
-        return btree_search(&threads_btree, (btree_key_t) ((__address) t), &leaf) != NULL;
+        return btree_search(&threads_btree, (btree_key_t) ((uintptr_t) t), &leaf) != NULL;
 }
 
@@ -571 +571 @@
  *
  */
-__native sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name)
+unative_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name)
 {
         thread_t *t;
         char namebuf[THREAD_NAME_BUFLEN];
         uspace_arg_t *kernel_uarg;
-        __u32 tid;
+        uint32_t tid;
         int rc;
 
         rc = copy_from_uspace(namebuf, uspace_name, THREAD_NAME_BUFLEN);
         if (rc != 0)
-                return (__native) rc;
+                return (unative_t) rc;
 
         kernel_uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t), 0); 
@@ -587 +587 @@
         if (rc != 0) {
                 free(kernel_uarg);
-                return (__native) rc;
+                return (unative_t) rc;
         }
 
@@ -593 +593 @@
                 tid = t->tid;
                 thread_ready(t);
-                return (__native) tid; 
+                return (unative_t) tid; 
         } else {
                 free(kernel_uarg);
         }
 
-        return (__native) ENOMEM;
+        return (unative_t) ENOMEM;
 }
 
@@ -604 +604 @@
  *
  */
-__native sys_thread_exit(int uspace_status)
+unative_t sys_thread_exit(int uspace_status)
 {
         thread_exit();