Changeset 2577 for trunk/libtransmission/platform.c

Timestamp:

Jul 31, 2007, 7:56:40 PM (14 years ago)

Author:

charles

Message:

add Win32 implementations of tr_thread_t, tr_mutex_t, and tr_cond_t

File:

• trunk/libtransmission/platform.c (modified) (17 diffs)

trunk/libtransmission/platform.c

@@ -59 +59 @@
 #ifdef SYS_BEOS
     thread_id        thread;
+#elif defined(WIN32)
+    HANDLE           thread;
 #else
     pthread_t        thread;
@@ -65 +67 @@
 };
 
-static void
+#ifdef WIN32
+#define ThreadFuncReturnType unsigned WINAPI
+#else
+#define ThreadFuncReturnType void
+#endif
+
+static ThreadFuncReturnType
 ThreadFunc( void * _t )
 {
@@ -80 +88 @@
     t->func( t->arg );
     tr_dbg( "Thread '%s' exited", name );
+
     tr_free( name );
+
+#ifdef WIN32
+    _endthreadex( 0 );
+    return 0;
+#endif
 }
 
@@ -96 +110 @@
     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, NULL, 0, NULL );
 #else
     pthread_create( &t->thread, NULL, (void * (*) (void *)) ThreadFunc, t );
@@ -111 +127 @@
         long exit;
         wait_for_thread( t->thread, &exit );
+#elif defined(WIN32)
+        WaitForSingleObject(thread->handle, INFINITE);
+        CloseHandle( t->thread );
 #else
         pthread_join( t->thread, NULL );
@@ -131 +150 @@
 #ifdef SYS_BEOS
     sem_id lock;
+#elif defined(WIN32)
+    CRITICAL_SECTION lock;
 #else
     pthread_mutex_t lock;
@@ -143 +164 @@
 #ifdef SYS_BEOS
     l->lock = create_sem( 1, "" );
+#elif defined(WIN32)
+    InitializeCriticalSection( &l->lock );
 #else
     pthread_mutex_init( &l->lock, NULL );
@@ -155 +178 @@
 #ifdef SYS_BEOS
     delete_sem( l->lock );
+#elif defined(WIN32)
+    DeleteCriticalSection( &l->lock );
 #else
     pthread_mutex_destroy( &l->lock );
@@ -162 +187 @@
 
 int
-tr_lockTryLock( tr_lock_t * l )
+tr_lockTryLock( tr_lock_t * l ) /* success on zero! */
 {
 #ifdef SYS_BEOS
     return acquire_sem_etc( l->lock, 1, B_RELATIVE_TIMEOUT, 0 );
-#else
-    /* success on zero! */
+#elif defined(WIN32)
+    return !TryEnterCriticalSection( &l->lock );
+#else
     return pthread_mutex_trylock( &l->lock );
 #endif
@@ -177 +203 @@
 #ifdef SYS_BEOS
     acquire_sem( l->lock );
+#elif defined(WIN32)
+    EnterCriticalSection( &l->lock );
 #else
     pthread_mutex_lock( &l->lock );
@@ -187 +215 @@
 #ifdef SYS_BEOS
     release_sem( l->lock );
+#elif defined(WIN32)
+    DeleteCriticalSection( &l->lock );
 #else
     pthread_mutex_unlock( &l->lock );
@@ -312 +342 @@
     thread_id theads[BEOS_MAX_THREADS];
     int start, end;
+#elif defined(WIN32)
+    CONDITION_VARIABLE cond;
 #else
     pthread_cond_t cond;
@@ -325 +357 @@
     c->start = 0;
     c->end = 0;
+#elif defined(WIN32)
+    InitializeConditionVariable( &c->cond );
 #else
     pthread_cond_init( &c->cond, NULL );
@@ -344 +378 @@
     suspend_thread( find_thread( NULL ) ); /* Wait for signal */
     acquire_sem( *l );
+#elif defined(WIN32)
+    SleepConditionVariableCS( &c->cond, &l->lock, INFINITE );
 #else
     pthread_cond_wait( &c->cond, &l->lock );
@@ -379 +415 @@
     condTrySignal( c );
     release_sem( c->sem );
+#elif defined(WIN32)
+    WakeConditionVariable( &c->cond );
 #else
     pthread_cond_signal( &c->cond );
@@ -389 +427 @@
     while( !condTrySignal( c ) );
     release_sem( c->sem );
+#elif defined(WIN32)
+    WakeAllConditionVariable( &c->cond );
 #else
     pthread_cond_broadcast( &c->cond );
@@ -399 +439 @@
 #ifdef SYS_BEOS
     delete_sem( c->sem );
+#elif defined(WIN32)
+    /* a no-op, apparently */
 #else
     pthread_cond_destroy( &c->cond );