Changeset 7558

Timestamp:

Dec 31, 2008, 2:29:28 PM (12 years ago)

Author:

charles

Message:

(trunk libT) make the evbuffer pool threadsafe

File:

• trunk/libtransmission/utils.c (modified) (2 diffs)

trunk/libtransmission/utils.c

@@ -1302 +1302 @@
 static tr_list * _bufferList = NULL;
 
+static tr_lock *
+getBufferLock( void )
+{
+    static tr_lock * lock = NULL;
+    if( lock == NULL )
+        lock = tr_lockNew( );
+    return lock;
+}
+
 struct evbuffer*
 tr_getBuffer( void )
 {
-    struct evbuffer * buf = tr_list_pop_front( &_bufferList );
+    struct evbuffer * buf;
+    tr_lock * l = getBufferLock( );
+    tr_lockLock( l );
+
+    buf = tr_list_pop_front( &_bufferList );
     if( buf == NULL )
         buf = evbuffer_new( );
-    assert( !EVBUFFER_LENGTH( buf ) );
+
+    tr_lockUnlock( l );
     return buf;
 }
@@ -1315 +1329 @@
 tr_releaseBuffer( struct evbuffer * buf )
 {
+    tr_lock * l = getBufferLock( );
+    tr_lockLock( l );
+
     evbuffer_drain( buf, EVBUFFER_LENGTH( buf ) );
+    assert( EVBUFFER_LENGTH( buf ) == 0 );
     tr_list_prepend( &_bufferList, buf );
-}
+
+    tr_lockUnlock( l );
+}