Changeset 13905

Timestamp:

Jan 31, 2013, 5:05:44 AM (8 years ago)

Author:

jordan

Message:

fix race condition triggered in the unit tests by requiring a libtransmission thread lock in torrentRemove()

Location:

trunk/libtransmission

Files:

• fdlimit.c (modified) (1 diff)
• torrent.c (modified) (2 diffs)

trunk/libtransmission/fdlimit.c

@@ -608 +608 @@
 tr_fdTorrentClose (tr_session * session, int torrent_id)
 {
-    fileset_close_torrent (get_fileset (session), torrent_id);
+  assert (tr_sessionIsLocked (session));
+
+  fileset_close_torrent (get_fileset (session), torrent_id);
 }
 

trunk/libtransmission/torrent.c

@@ -1735 +1735 @@
 {
   if (tr_isTorrent (tor))
-    {
-      tr_verifyRemove (tor);
-      tr_runInEventThread (tor->session, verifyTorrent, tor);
-    }
+    tr_runInEventThread (tor->session, verifyTorrent, tor);
 }
 
@@ -1849 +1846 @@
 removeTorrent (void * vdata)
 {
-    struct remove_data * data = vdata;
-
-    if (data->deleteFlag)
-        tr_torrentDeleteLocalData (data->tor, data->deleteFunc);
-
-    tr_torrentClearCompletenessCallback (data->tor);
-    closeTorrent (data->tor);
-    tr_free (data);
+  struct remove_data * data = vdata;
+  tr_session * session = data->tor->session;
+  tr_sessionLock (session); 
+
+  if (data->deleteFlag)
+    tr_torrentDeleteLocalData (data->tor, data->deleteFunc);
+
+  tr_torrentClearCompletenessCallback (data->tor);
+  closeTorrent (data->tor);
+  tr_free (data);
+
+  tr_sessionUnlock (session); 
 }