[GNUnet-SVN] r11400 - gnunet/src/hostlist

[gnunet]

Author: wachs
Date: 2010-05-17 13:40:04 +0200 (Mon, 17 May 2010)
New Revision: 11400

Modified:
   gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c
Log:


Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c  2010-05-17 
11:12:18 UTC (rev 11399)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c  2010-05-17 
11:40:04 UTC (rev 11400)
@@ -107,16 +107,9 @@
     timeout_task = GNUNET_SCHEDULER_NO_TASK;
   }
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping Statistics Task.\n");
-  if ((NULL != learn_peer.stats) && (NULL != download_stats))
-    GNUNET_STATISTICS_get_cancel (download_stats);
-  if ((NULL != learn_peer.stats) && (NULL != urisrecv_stat))
-    GNUNET_STATISTICS_get_cancel (urisrecv_stat);
-  if ((NULL != adv_peer.stats) && (NULL != advsent_stat))
-    GNUNET_STATISTICS_get_cancel (advsent_stat);
-  if ( NULL != current_adv_uri ) GNUNET_free (current_adv_uri);
 
 
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping Statistics Check Task.\n");
   if (check_task != GNUNET_SCHEDULER_NO_TASK)
   {
@@ -124,6 +117,15 @@
     check_task = GNUNET_SCHEDULER_NO_TASK;
   }
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping Statistics Task.\n");
+/*
+  if ((NULL != learn_peer.stats) && (NULL != download_stats))
+    GNUNET_STATISTICS_get_cancel (download_stats);
+  if ((NULL != learn_peer.stats) && (NULL != urisrecv_stat))
+    GNUNET_STATISTICS_get_cancel (urisrecv_stat);
+  if ((NULL != adv_peer.stats) && (NULL != advsent_stat))
+    GNUNET_STATISTICS_get_cancel (advsent_stat);*/
+  // if ( NULL != current_adv_uri ) GNUNET_free (current_adv_uri);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from Transport.\n");
   if (adv_peer.th != NULL)
   {
@@ -150,10 +152,36 @@
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Asking ARM to stop core services\n");
 
-  GNUNET_SCHEDULER_add_now (sched,                         
+
+#if START_ARM
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Adv Killing ARM process.\n");
+  if (0 != PLIBC_KILL (adv_peer.arm_pid, SIGTERM))
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+  if (GNUNET_OS_process_wait(adv_peer.arm_pid) != GNUNET_OK)
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Adv ARM process %u stopped\n", adv_peer.arm_pid);
+#endif
+  GNUNET_CONFIGURATION_destroy (adv_peer.cfg);
+  
+
+#if START_ARM
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Learn Killing ARM process.\n");
+  if (0 != PLIBC_KILL (learn_peer.arm_pid, SIGTERM))
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+  if (GNUNET_OS_process_wait(learn_peer.arm_pid) != GNUNET_OK)
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Learn ARM process %u stopped\n", learn_peer.arm_pid);
+#endif
+  GNUNET_CONFIGURATION_destroy (adv_peer.cfg);  
+
+/*  GNUNET_SCHEDULER_add_now (sched,                       
                            &waitpid_task, &learn_peer);
   GNUNET_SCHEDULER_add_now (sched,
-                           &waitpid_task, &adv_peer);
+                           &waitpid_task, &adv_peer);*/
   GNUNET_SCHEDULER_shutdown (sched);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown complete....\n");
 }