[GNUnet-SVN] r9190 - gnunet/src/arm

[gnunet]

Author: grothoff
Date: 2009-10-19 03:36:28 -0600 (Mon, 19 Oct 2009)
New Revision: 9190

Modified:
   gnunet/src/arm/arm_api.c
   gnunet/src/arm/gnunet-service-arm.c
   gnunet/src/arm/test_arm_api_data.conf
Log:
debug messages, disable default services for testing

Modified: gnunet/src/arm/arm_api.c
===================================================================
--- gnunet/src/arm/arm_api.c    2009-10-19 09:35:56 UTC (rev 9189)
+++ gnunet/src/arm/arm_api.c    2009-10-19 09:36:28 UTC (rev 9190)
@@ -278,7 +278,8 @@
     }
 #if DEBUG_ARM
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              _("Received response from ARM service\n"));
+              "Received response from ARM service: %u\n",
+             ntohs(msg->type));
 #endif
   switch (ntohs (msg->type))
     {

Modified: gnunet/src/arm/gnunet-service-arm.c
===================================================================
--- gnunet/src/arm/gnunet-service-arm.c 2009-10-19 09:35:56 UTC (rev 9189)
+++ gnunet/src/arm/gnunet-service-arm.c 2009-10-19 09:36:28 UTC (rev 9190)
@@ -473,11 +473,15 @@
   unsigned long long port;
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Preparing to stop `%s'\n", servicename);
+              _("Preparing to stop `%s'\n"), servicename);
   pos = find_name (servicename);
   if ((pos != NULL) && (pos->kill_continuation != NULL))
     {
       /* killing already in progress */
+#if DEBUG_ARM
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Service `%s' is already down\n", servicename);
+#endif
       signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_DOWN);
       return;
     }
@@ -487,12 +491,23 @@
       pos->rc--;
       pos->next = running;
       running = pos;
+#if DEBUG_ARM
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Service `%s' still used by %u clients, will keep it 
running!\n",
+                 servicename,
+                 pos->rc);
+#endif
       signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_UP);
       GNUNET_SERVER_receive_done (client, GNUNET_OK);
       return;
     }
   if (pos != NULL)
     {
+#if DEBUG_ARM
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Sending kill signal to service `%s', waiting for process to 
die.\n",
+                 servicename);
+#endif
       if (0 != PLIBC_KILL (pos->pid, SIGTERM))
         GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
       pos->next = running;
@@ -508,6 +523,11 @@
     }
   else
     {
+#if DEBUG_ARM
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Sending termination request to service `%s'.\n",
+                 servicename);
+#endif
       if ( (GNUNET_OK ==
            GNUNET_CONFIGURATION_get_value_number (cfg,
                                                   servicename,

Modified: gnunet/src/arm/test_arm_api_data.conf
===================================================================
--- gnunet/src/arm/test_arm_api_data.conf       2009-10-19 09:35:56 UTC (rev 
9189)
+++ gnunet/src/arm/test_arm_api_data.conf       2009-10-19 09:36:28 UTC (rev 
9190)
@@ -4,4 +4,8 @@
 
 [arm]
 PORT = 23354
+DEFAULTSERVICES =
+#DEBUG = YES
 
+[resolver]
+#DEBUG = YES