commit 91befe1d64e849a79d59343345b925678a264123
author Alexandre Julliard <julliard@winehq.org> Sat Feb 01 01:38:40 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Feb 01 01:38:40 2003 +0000
tree 149a9a0f92489896d9f1d252368ea67763d3f89f
parent bb2210bc45281f7858d4904e777b8bb2b26e6e6d

Made process and thread ids small integers instead of pointers.

server/thread.c

diff --git a/server/thread.c b/server/thread.c
index dceeef4..a649da3 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -167,6 +167,12 @@
     if ((thread->next = first_thread) != NULL) thread->next->prev = thread;
     first_thread = thread;
 
+    if (!(thread->id = alloc_ptid( thread )))
+    {
+        release_object( thread );
+        return NULL;
+    }
+
     set_select_events( &thread->obj, POLLIN );  /* start listening to events */
     add_process_thread( thread->process, thread );
     return thread;
@@ -236,6 +242,7 @@
     if (thread->info) release_object( thread->info );
     cleanup_thread( thread );
     release_object( thread->process );
+    if (thread->id) free_ptid( thread->id );
 }
 
 /* dump a thread on stdout for debugging purposes */
@@ -244,8 +251,8 @@
     struct thread *thread = (struct thread *)obj;
     assert( obj->ops == &thread_ops );
 
-    fprintf( stderr, "Thread pid=%d teb=%p state=%d\n",
-             thread->unix_pid, thread->teb, thread->state );
+    fprintf( stderr, "Thread id=%04x unix pid=%d teb=%p state=%d\n",
+             thread->id, thread->unix_pid, thread->teb, thread->state );
 }
 
 static int thread_signaled( struct object *obj, struct thread *thread )
@@ -257,11 +264,11 @@
 /* get a thread pointer from a thread id (and increment the refcount) */
 struct thread *get_thread_from_id( thread_id_t id )
 {
-    struct thread *t = first_thread;
-    while (t && (get_thread_id(t) != id)) t = t->next;
-    if (t) grab_object( t );
-    else set_error( STATUS_INVALID_PARAMETER );
-    return t;
+    struct object *obj = get_ptid_entry( id );
+
+    if (obj && obj->ops == &thread_ops) return (struct thread *)grab_object( obj );
+    set_error( STATUS_INVALID_PARAMETER );
+    return NULL;
 }
 
 /* get a thread from a handle (and increment the refcount) */
@@ -465,8 +472,8 @@
         if ((signaled = check_wait( thread )) == -1) break;
 
         cookie = thread->wait->cookie;
-        if (debug_level) fprintf( stderr, "%08x: *wakeup* signaled=%d cookie=%p\n",
-                                  (unsigned int)thread, signaled, cookie );
+        if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=%d cookie=%p\n",
+                                  thread->id, signaled, cookie );
         end_wait( thread );
         if (send_thread_wakeup( thread, cookie, signaled ) == -1) /* error */
 	    break;
@@ -484,8 +491,8 @@
     wait->user = NULL;
     if (thread->wait != wait) return; /* not the top-level wait, ignore it */
 
-    if (debug_level) fprintf( stderr, "%08x: *wakeup* signaled=%d cookie=%p\n",
-                              (unsigned int)thread, STATUS_TIMEOUT, cookie );
+    if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=%d cookie=%p\n",
+                              thread->id, STATUS_TIMEOUT, cookie );
     end_wait( thread );
     if (send_thread_wakeup( thread, cookie, STATUS_TIMEOUT ) == -1) return;
     /* check if other objects have become signaled in the meantime */
@@ -717,8 +724,8 @@
     thread->exit_time = time(NULL);
     if (current == thread) current = NULL;
     if (debug_level)
-        fprintf( stderr,"%08x: *killed* exit_code=%d\n",
-                 (unsigned int)thread, thread->exit_code );
+        fprintf( stderr,"%04x: *killed* exit_code=%d\n",
+                 thread->id, thread->exit_code );
     if (thread->wait)
     {
         while (thread->wait) end_wait( thread );