[GNUnet-SVN] r30899 - gnunet/src/dv

[gnunet]

Author: wachs
Date: 2013-11-27 09:41:49 +0100 (Wed, 27 Nov 2013)
New Revision: 30899

Modified:
   gnunet/src/dv/test_transport_dv.c
Log:
improved cleanup 


Modified: gnunet/src/dv/test_transport_dv.c
===================================================================
--- gnunet/src/dv/test_transport_dv.c   2013-11-27 08:29:31 UTC (rev 30898)
+++ gnunet/src/dv/test_transport_dv.c   2013-11-27 08:41:49 UTC (rev 30899)
@@ -32,6 +32,17 @@
 
 struct GNUNET_TESTBED_Operation *topology_op;
 
+static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+
+static void do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext 
*tc)
+{
+  if (NULL != topology_op)
+  {
+    GNUNET_TESTBED_operation_done (topology_op);
+    topology_op = NULL;
+  }
+}
+
 static void topology_completed (void *cls,
                                 unsigned int nsuccess,
                                 unsigned int nfailures)
@@ -60,6 +71,7 @@
                  unsigned int links_succeeded,
                  unsigned int links_failed)
 {
+  shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, 
&do_shutdown, NULL);
   if (4 != num_peers)
   {
     ok = 1;
@@ -82,7 +94,6 @@
   ok = 1;
   fprintf (stderr, "Testbed connected peers, should not happen...\n");
   GNUNET_SCHEDULER_shutdown ();
-
 }