Changeset 13909

Timestamp:

Jan 31, 2013, 5:39:06 PM (8 years ago)

Author:

jordan

Message:

(libT) add assertions to check that block-writing functions are only invoked in the libtransmission thread

Location:

trunk/libtransmission

Files:

• cache.c (modified) (2 diffs)
• fail.sh (added)
• move-test.c (modified) (4 diffs)
• torrent.c (modified) (2 diffs)

trunk/libtransmission/cache.c

@@ -22 +22 @@
 #include "ptrarray.h"
 #include "torrent.h"
+#include "trevent.h"
 #include "utils.h"
 
@@ -333 +334 @@
 {
   struct cache_block * cb = findBlock (cache, torrent, piece, offset);
+
+  assert (tr_amInEventThread (torrent->session));
 
   if (cb == NULL)

trunk/libtransmission/move-test.c

@@ -14 +14 @@
 #include "cache.h"
 #include "resume.h"
+#include "trevent.h"
 #include "torrent.h" /* tr_isTorrent() */
 #include "utils.h" /* tr_mkdirp() */
@@ -23 +24 @@
 ****
 ***/
+
+#define verify_and_block_until_done(tor) \
+  do { \
+    do { tr_wait_msec (10); } while (tor->verifyState != TR_VERIFY_NONE); \
+    tr_torrentVerify (tor); \
+    do { tr_wait_msec (10); } while (tor->verifyState != TR_VERIFY_NONE); \
+  } while (0)
 
 static void
@@ -42 +50 @@
   } while (0)
 
+struct test_incomplete_dir_is_subdir_of_download_dir_data
+{
+  tr_torrent * tor;
+  tr_block_index_t block;
+  tr_piece_index_t pieceIndex;
+  uint32_t offset;
+  struct evbuffer * buf;
+  bool done;
+};
+
+static void
+test_incomplete_dir_is_subdir_of_download_dir_threadfunc (void * vdata)
+{
+  struct test_incomplete_dir_is_subdir_of_download_dir_data * data = vdata;
+  tr_cacheWriteBlock (session->cache, data->tor, 0, data->offset, data->tor->blockSize, data->buf);
+  tr_torrentGotBlock (data->tor, data->block);
+  data->done = true;
+}
+  
+
 static int
 test_incomplete_dir_is_subdir_of_download_dir (void)
 {
+  size_t i;
   char * incomplete_dir;
   tr_torrent * tor;
@@ -66 +95 @@
   check_int_eq (tor->info.pieceSize, tr_torrentStat(tor)->leftUntilDone);
 
+  completeness = completeness_unset;
+  tr_torrentSetCompletenessCallback (tor, zeroes_completeness_func, &completeness);
+
   /* now finish writing it */
   {
-    uint32_t offset;
-    tr_block_index_t first, last, i;
-    struct evbuffer * buf = evbuffer_new ();
+    tr_block_index_t first, last;
     char * zero_block = tr_new0 (char, tor->blockSize);
+    struct test_incomplete_dir_is_subdir_of_download_dir_data data;
 
-    completeness = completeness_unset;
-    tr_torrentSetCompletenessCallback (tor, zeroes_completeness_func, &completeness);
+    data.tor = tor;
+    data.pieceIndex = 0;
+    data.buf = evbuffer_new ();
 
-    tr_torGetPieceBlockRange (tor, 0, &first, &last);
-    for (offset=0, i=first; i<=last; ++i, offset+=tor->blockSize)
+    tr_torGetPieceBlockRange (tor, data.pieceIndex, &first, &last);
+    for (i=first; i<=last; ++i)
       {
-        evbuffer_add (buf, zero_block, tor->blockSize);
-        tr_cacheWriteBlock (session->cache, tor, 0, offset, tor->blockSize, buf);
-        tr_torrentGotBlock (tor, i);
+        evbuffer_add (data.buf, zero_block, tor->blockSize);
+        data.block = i;
+        data.done = false;
+        data.offset = data.block * tor->blockSize;
+        tr_runInEventThread (session, test_incomplete_dir_is_subdir_of_download_dir_threadfunc, &data);
+        do { tr_wait_msec(50); } while (!data.done);
       }
-    sync ();
 
-    tr_torrentVerify (tor);
-    while ((completeness==completeness_unset) && (time(NULL)<=deadline))
-      tr_wait_msec (50);
-    check_int_eq (TR_SEED, completeness);
-    for (i=0; i<tor->info.fileCount; ++i)
-      check_file_location (tor, i, tr_buildPath (downloadDir, tor->info.files[i].name, NULL));
-
-    evbuffer_free (buf);
+    evbuffer_free (data.buf);
     tr_free (zero_block);
   }
 
+  verify_and_block_until_done (tor);
+  check_int_eq (0, tr_torrentStat(tor)->leftUntilDone);
+
+  while ((completeness==completeness_unset) && (time(NULL)<=deadline))
+    tr_wait_msec (50);
+
+  check_int_eq (TR_SEED, completeness);
+  for (i=0; i<tor->info.fileCount; ++i)
+    check_file_location (tor, i, tr_buildPath (downloadDir, tor->info.files[i].name, NULL));
 
   /* cleanup */

trunk/libtransmission/torrent.c

@@ -2951 +2951 @@
             /* blow away the leftover subdirectories in the old location */
             if (do_move)
-                tr_torrentDeleteLocalData (tor, remove);
+              tr_torrentDeleteLocalData (tor, remove);
 
             /* set the new location and reverify */
@@ -3066 +3066 @@
 {
   const bool block_is_new = !tr_cpBlockIsComplete (&tor->completion, block);
+
+  assert (tr_isTorrent (tor));
+  assert (tr_amInEventThread (tor->session));
 
   if (block_is_new)