Changeset 9850

Timestamp:

Jan 1, 2010, 10:35:49 PM (12 years ago)

Author:

charles

Message:

(trunk libT) resolve thread condition in libtransmission by moving the `waiting' state variable to the stack in tr_sessionSet() and tr_sessionInit()

Location:

trunk/libtransmission

Files:

• session.c (modified) (7 diffs)
• session.h (modified) (1 diff)

trunk/libtransmission/session.c

@@ -500 +500 @@
     tr_session  * session;
     const char  * configDir;
+    tr_bool       done;
     tr_bool       messageQueuingEnabled;
     tr_benc     * clientSettings;
@@ -536 +537 @@
 
     /* run the rest in the libtransmission thread */
-    ++session->waiting;
+    data.done = FALSE;
     data.session = session;
     data.configDir = configDir;
@@ -542 +543 @@
     data.clientSettings = clientSettings;
     tr_runInEventThread( session, tr_sessionInitImpl, &data );
-    while( session->waiting > 0 )
+    while( !data.done )
         tr_wait_msec( 100 );
 
@@ -640 +641 @@
 
     session->web = tr_webInit( session );
-    --session->waiting;
 
     tr_sessionSet( session, &settings );
@@ -651 +651 @@
     /* cleanup */
     tr_bencFree( &settings );
+    data->done = TRUE;
 }
 
@@ -806 +807 @@
         useAltSpeed( session, boolVal, FALSE );
 
-    --session->waiting;
+    data->done = TRUE;
 }
 
@@ -813 +814 @@
 {
     struct init_data data;
+    data.done = FALSE;
     data.session = session;
     data.clientSettings = settings;
 
     /* run the rest in the libtransmission thread */
-    ++session->waiting;
     tr_runInEventThread( session, sessionSetImpl, &data );
-    while( session->waiting > 0 )
+    while( !data.done )
         tr_wait_msec( 100 );
 }

trunk/libtransmission/session.h

@@ -58 +58 @@
     tr_benc                      removedTorrents;
 
-    int                          waiting;
     int                          umask;