Changeset 2552 for trunk/libtransmission/net.c

Timestamp:

Jul 30, 2007, 3:27:52 PM (16 years ago)

Author:

charles

Message:

better encapsulation of platform-specific constructs: tr_thread_t, tr_cond_t, tr_lock_t

File:

• trunk/libtransmission/net.c (modified) (11 diffs)

trunk/libtransmission/net.c

@@ -57 +57 @@
 }
 
-static tr_thread_t  resolveThread;
-static tr_lock_t    resolveLock;
-static tr_cond_t    resolveCond;
-static volatile int resolveDie;
+static tr_thread_t  * resolveThread;
+static tr_lock_t    * resolveLock;
+static tr_cond_t    * resolveCond;
+static volatile int   resolveDie;
 static tr_resolve_t * resolveQueue;
 
@@ -86 +86 @@
     resolveDie   = 0;
     resolveQueue = NULL;
-    tr_lockInit( &resolveLock );
-    tr_condInit( &resolveCond );
-    tr_threadCreate( &resolveThread, resolveFunc, NULL, "resolve" );
+    resolveLock = tr_lockNew( );
+    resolveCond = tr_condNew( );
+    resolveThread = tr_threadNew( resolveFunc, NULL, "resolve" );
 }
 
@@ -100 +100 @@
 void tr_netResolveThreadClose()
 {
-    tr_lockLock( &resolveLock );
+    tr_lockLock( resolveLock );
     resolveDie = 1;
-    tr_lockUnlock( &resolveLock );
-    tr_condSignal( &resolveCond );
+    tr_lockUnlock( resolveLock );
+    tr_condSignal( resolveCond );
     tr_wait( 200 );
 }
@@ -114 +114 @@
 tr_resolve_t * tr_netResolveInit( const char * address )
 {
-    tr_resolve_t * r;
-
-    r           = malloc( sizeof( tr_resolve_t ) );
+    tr_resolve_t * r = tr_new0( tr_resolve_t, 1 );
     r->status   = TR_NET_WAIT;
     r->address  = strdup( address );
@@ -122 +120 @@
     r->next     = NULL;
 
-    tr_lockLock( &resolveLock );
+    tr_lockLock( resolveLock );
     if( !resolveQueue )
     {
@@ -133 +131 @@
         iter->next = r;
     }
-    tr_lockUnlock( &resolveLock );
-    tr_condSignal( &resolveCond );
+    tr_lockUnlock( resolveLock );
+    tr_condSignal( resolveCond );
 
     return r;
@@ -148 +146 @@
     tr_tristate_t ret;
 
-    tr_lockLock( &resolveLock );
+    tr_lockLock( resolveLock );
     ret = r->status;
     if( ret == TR_NET_OK )
@@ -154 +152 @@
         *addr = r->addr;
     }
-    tr_lockUnlock( &resolveLock );
+    tr_lockUnlock( resolveLock );
 
     return ret;
@@ -197 +195 @@
     struct hostent * host;
 
-    tr_lockLock( &resolveLock );
+    tr_lockLock( resolveLock );
 
     while( !resolveDie )
@@ -203 +201 @@
         if( !( r = resolveQueue ) )
         {
-            tr_condWait( &resolveCond, &resolveLock );
+            tr_condWait( resolveCond, resolveLock );
             continue;
         }
 
         /* Blocking resolution */
-        tr_lockUnlock( &resolveLock );
+        tr_lockUnlock( resolveLock );
         host = gethostbyname( r->address );
-        tr_lockLock( &resolveLock );
+        tr_lockLock( resolveLock );
 
         if( host )
@@ -227 +225 @@
 
     /* Clean up  */
-    tr_lockUnlock( &resolveLock );
-    tr_lockClose( &resolveLock );
+    tr_lockUnlock( resolveLock );
+    tr_lockFree( resolveLock );
+    resolveLock = NULL;
     while( ( r = resolveQueue ) )
     {