Changeset 5164

Timestamp:

Feb 28, 2008, 4:40:31 PM (14 years ago)

Author:

charles

Message:

better win32 thread support

Location:

trunk/libtransmission

Files:

• platform.c (modified) (3 diffs)
• transmission.c (modified) (1 diff)

trunk/libtransmission/platform.c

@@ -96 +96 @@
     void           * arg;
     const char     * name;
-
-#ifdef __BEOS__
-    thread_id        thread;
-#elif defined(WIN32)
-    HANDLE           thread;
-    unsigned int     thread_id;
-#else
-    pthread_t        thread;
-#endif
-
+    tr_thread_id     thread;
+#ifdef WIN32
+    HANDLE           thread_handle;
+#endif
 };
 
@@ -148 +142 @@
 {
     tr_thread * t = tr_new0( tr_thread, 1 );
+
+#ifdef __BEOS__
+    t->thread = spawn_thread( (void*)ThreadFunc, name, B_NORMAL_PRIORITY, t );
+    resume_thread( t->thread );
+#elif defined(WIN32)
+    unsigned id;
+    t->thread_handle = (HANDLE) _beginthreadex( NULL, 0, &ThreadFunc, t, 0, &id );
+    t->thread = (DWORD) id;
+#else
+    pthread_create( &t->thread, NULL, (void * (*) (void *)) ThreadFunc, t );
+#endif
     t->func = func;
     t->arg  = arg;
     t->name = name;
 
-#ifdef __BEOS__
-    t->thread = spawn_thread( (void*)ThreadFunc, name, B_NORMAL_PRIORITY, t );
-    resume_thread( t->thread );
-#elif defined(WIN32)
-    t->thread = (HANDLE) _beginthreadex( NULL, 0, &ThreadFunc, t, 0, &t->thread_id );
-#else
-    pthread_create( &t->thread, NULL, (void * (*) (void *)) ThreadFunc, t );
-#endif
-
     return t;
 }
@@ -173 +169 @@
         wait_for_thread( t->thread, &exit );
 #elif defined(WIN32)
-        WaitForSingleObject( t->thread, INFINITE );
-        CloseHandle( t->thread );
+        WaitForSingleObject( t->thread_handle, INFINITE );
+        CloseHandle( t->thread_handle );
 #else
         pthread_join( t->thread, NULL );

trunk/libtransmission/transmission.c

@@ -213 +213 @@
 tr_globalIsLocked( const struct tr_handle * handle )
 {
-    return tr_lockHave( handle->lock );
+    return handle && tr_lockHave( handle->lock );
 }