Changeset 201abde in mainline for uspace

Timestamp:

2007-04-07T20:06:52Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7e58979

Parents:

6adbe3c2

Message:

make thread ID 64 bit (task ID is 64 bit already)
cleanup thread syscalls

Location:

uspace

Files:

• libc/generic/thread.c (modified) (5 diffs)
• libc/include/thread.h (modified) (1 diff)
• tester/thread/thread1.c (modified) (2 diffs)

uspace/libc/generic/thread.c

@@ -125 +125 @@
  * @param arg Argument to be passed to thread.
  * @param name Symbolic name of the thread.
- *
- * @return TID of the new thread on success or -1 on failure.
- */
-int thread_create(void (* function)(void *), void *arg, char *name)
+ * @param tid Thread ID of the newly created thread.
+ *
+ * @return Zero on success or a code from @ref errno.h on failure.
+ */
+int thread_create(void (* function)(void *), void *arg, char *name, thread_id_t *tid)
 {
         char *stack;
@@ -149 +150 @@
         uarg->uspace_uarg = uarg;
         
-        return __SYSCALL2(SYS_THREAD_CREATE, (sysarg_t) uarg, (sysarg_t) name);
+        return __SYSCALL3(SYS_THREAD_CREATE, (sysarg_t) uarg, (sysarg_t) name, (sysarg_t) tid);
 }
 
@@ -167 +168 @@
  * @param thread TID.
  */
-void thread_detach(int thread)
+void thread_detach(thread_id_t thread)
 {
 }
@@ -179 +180 @@
  * @return Thread exit status.
  */
-int thread_join(int thread)
+int thread_join(thread_id_t thread)
 {
 }
@@ -187 +188 @@
  * @return Current thread ID.
  */
-int thread_get_id(void)
-{
-        return __SYSCALL0(SYS_THREAD_GET_ID);
+thread_id_t thread_get_id(void)
+{
+        thread_id_t thread_id;
+
+        (void) __SYSCALL1(SYS_THREAD_GET_ID, (sysarg_t) &thread_id);
+
+        return thread_id;
 }
 

uspace/libc/include/thread.h

@@ -40 +40 @@
 #include <types.h>
 
+typedef uint64_t thread_id_t;
+
 extern void __thread_entry(void);
 extern void __thread_main(uspace_arg_t *uarg);
 
-extern int thread_create(void (* function)(void *arg), void *arg, char *name);
+extern int thread_create(void (* function)(void *), void *arg, char *name, thread_id_t *tid);
 extern void thread_exit(int status);
-extern void thread_detach(int thread);
-extern int thread_join(int thread);
-extern int thread_get_id(void);
+extern void thread_detach(thread_id_t thread);
+extern int thread_join(thread_id_t thread);
+extern thread_id_t thread_get_id(void);
 extern tcb_t * __make_tls(void);
 extern tcb_t * __alloc_tls(void **data, size_t size);

uspace/tester/thread/thread1.c

@@ -46 +46 @@
         while (atomic_get(&finish)) {
                 if (!sh_quiet)
-                        printf("%d ", thread_get_id());
+                        printf("%llu ", thread_get_id());
                 usleep(100000);
         }
@@ -61 +61 @@
 
         for (i = 0; i < THREADS; i++) {  
-                int t;
-                if ((t = thread_create(threadtest, NULL, "threadtest")) < 0) {
+                if (thread_create(threadtest, NULL, "threadtest", NULL) < 0) {
                         if (!quiet)
                                 printf("Could not create thread %d\n", i);