Changeset 13913 for trunk/libtransmission/libtransmission-test.c

Timestamp:

Jan 31, 2013, 9:58:25 PM (8 years ago)

Author:

jordan

Message:

(libT) change the API signature for tr_torrentVerify() s.t. client code can be notified when the verify is finished

File:

• trunk/libtransmission/libtransmission-test.c (modified) (4 diffs)

trunk/libtransmission/libtransmission-test.c

@@ -5 +5 @@
 #include "platform.h" /* TR_PATH_DELIMETER */
 #include "torrent.h"
+#include "trevent.h"
 #include "libtransmission-test.h"
 
@@ -324 +325 @@
 }
 
-#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)
-
-
 void
 libtransmission_test_zero_torrent_populate (tr_torrent * tor, bool complete)
@@ -369 +362 @@
 
   sync ();
-  verify_and_block_until_done (tor);
+  libttest_blockingTorrentVerify (tor);
 
   if (complete)
@@ -376 +369 @@
     assert (tr_torrentStat(tor)->leftUntilDone == tor->info.pieceSize);
 }
+
+/***
+****
+***/
+
+static void
+onVerifyDone (tr_torrent * tor UNUSED, bool aborted UNUSED, void * done)
+{
+  *(bool*)done = true;
+}
+
+void
+libttest_blockingTorrentVerify (tr_torrent * tor)
+{
+  bool done = false;
+
+  assert (session != NULL);
+  assert (!tr_amInEventThread (session));
+
+  tr_torrentVerify (tor, onVerifyDone, &done);
+  while (!done)
+    tr_wait_msec (10);
+}