host compatibility check in GNUNET_TESTBED_run() and fixes

diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index 55e503232dba806ec6a914e97d99b1d392e53fab..ca39d26a7692f0f17308b61540b5d7b3fe161280 100644 (file)
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -144,9 +144,14 @@ struct GNUNET_TESTBED_HostHabitableCheckHandle;
  * GNUNET_TESTBED_is_host_habitable() is invalid after this callback is called
  *
  * @param cls the closure given to GNUNET_TESTBED_is_host_habitable()
+ * @param host the host whose status is being reported; will be NULL if the host
+ *          given to GNUNET_TESTBED_is_host_habitable() is NULL
  * @param status GNUNET_YES if it is habitable; GNUNET_NO if not
  */
 typedef void (*GNUNET_TESTBED_HostHabitableCallback) (void *cls,
+                                                      const struct
+                                                      GNUNET_TESTBED_Host
+                                                      *host,
                                                       int status);
 
 

diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
index f0394bc09d6e6254dc55ea81871b7c67eb537044..086a9ef56262d08b7433e2978f9d16fed7431c53 100644 (file)
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -706,10 +706,12 @@ status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *config, int stat
  * GNUNET_TESTBED_is_host_habitable() is invalid after this callback is called
  *
  * @param cls NULL
+ * @param host the host whose status is being reported; will be NULL if the host
+ *          given to GNUNET_TESTBED_is_host_habitable() is NULL
  * @param status GNUNET_YES if it is habitable; GNUNET_NO if not
  */
 static void 
-host_habitable_cb (void *cls, int status)
+host_habitable_cb (void *cls, const struct GNUNET_TESTBED_Host *host, int status)
 {
   struct GNUNET_TESTBED_HostHabitableCheckHandle **hc_handle = cls;
   static unsigned int hosts_checked;

diff --git a/src/testbed/test_testbed_api_3peers_3controllers.c b/src/testbed/test_testbed_api_3peers_3controllers.c
index 0bdcb614794b4bdb071670e9103aca8a7a62ef1a..b7d9ec5cd796b1dad538044797fe561c2ad12f76 100644 (file)
--- a/src/testbed/test_testbed_api_3peers_3controllers.c
+++ b/src/testbed/test_testbed_api_3peers_3controllers.c
@@ -866,10 +866,12 @@ status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *config, int stat
  * GNUNET_TESTBED_is_host_habitable() is invalid after this callback is called
  *
  * @param cls NULL
+ * @param host the host whose status is being reported; will be NULL if the host
+ *          given to GNUNET_TESTBED_is_host_habitable() is NULL
  * @param status GNUNET_YES if it is habitable; GNUNET_NO if not
  */
 static void 
-host_habitable_cb (void *cls, int status)
+host_habitable_cb (void *cls, const struct GNUNET_TESTBED_Host *_host, int status)
 {
   hc_handle = NULL;
   cp1 = GNUNET_TESTBED_controller_start ("127.0.0.1", host, cfg, status_cb,

diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c
index 3867df27b8d37776b3160a909a1884a8caca5740..cea04cb63318e09cd155f4f304adba3b6553172f 100644 (file)
--- a/src/testbed/test_testbed_api_controllerlink.c
+++ b/src/testbed/test_testbed_api_controllerlink.c
@@ -644,10 +644,12 @@ status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *config,
  * GNUNET_TESTBED_is_host_habitable() is invalid after this callback is called
  *
  * @param cls NULL
+ * @param host the host whose status is being reported; will be NULL if the host
+ *          given to GNUNET_TESTBED_is_host_habitable() is NULL
  * @param status GNUNET_YES if it is habitable; GNUNET_NO if not
  */
 static void 
-host_habitable_cb (void *cls, int status)
+host_habitable_cb (void *cls, const struct GNUNET_TESTBED_Host *_host, int status)
 {
   hc_handle = NULL;
   cp = GNUNET_TESTBED_controller_start ("127.0.0.1", host, cfg, status_cb,

diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index e0455d316611fa4d68d4f0867945665930bc04ac..6b797b895d42d73f7c848aabb86e5d11984879c0 100644 (file)
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -486,10 +486,10 @@ GNUNET_TESTBED_is_host_registered_ (const struct GNUNET_TESTBED_Host *host,
  */
 struct GNUNET_TESTBED_HostHabitableCheckHandle
 {
-  /* /\** */
-  /*  * The host to check */
-  /*  *\/ */
-  /* const struct GNUNET_TESTBED_Host *host; */
+  /**
+   * The host to check
+   */
+  const struct GNUNET_TESTBED_Host *host;
 
   /* /\** */
   /*  * the configuration handle to lookup the path of the testbed helper */
@@ -551,7 +551,8 @@ habitability_check (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_TESTBED_HostHabitableCheckHandle *h = cls;
   void *cb_cls;
-  GNUNET_TESTBED_HostHabitableCallback cb;  
+  GNUNET_TESTBED_HostHabitableCallback cb;
+  const struct GNUNET_TESTBED_Host *host;
   unsigned long code;
   enum GNUNET_OS_ProcessStatusType type;
   int ret;
@@ -584,9 +585,10 @@ habitability_check (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_OS_process_destroy (h->auxp);
   cb = h->cb;
   cb_cls = h->cb_cls;
+  host = h->host;
   GNUNET_free (h);
   if (NULL != cb)
-    cb (cb_cls, ret);
+    cb (cb_cls, host, ret);
 }
 
 
@@ -616,6 +618,7 @@ GNUNET_TESTBED_is_host_habitable (const struct GNUNET_TESTBED_Host *host,
   h = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_HostHabitableCheckHandle));
   h->cb = cb;
   h->cb_cls = cb_cls;
+  h->host = host;
   hostname = (NULL == host->hostname) ? "127.0.0.1" : host->hostname;
   if (NULL == host->username)
     h->ssh_addr = GNUNET_strdup (hostname);

diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index 05debd98cd0b097f5fcb6c32593b14ffdbf62cbe..845672bd6cf49e65358f8126d744acab940e2831 100644 (file)
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -187,6 +187,11 @@ struct RunContext
    */
   struct GNUNET_TESTBED_Host **hosts;
 
+  /**
+   * The handle for whether a host is habitable or not
+   */
+  struct GNUNET_TESTBED_HostHabitableCheckHandle **hc_handles;
+
   /**
    * Array of peers which we create
    */
@@ -239,7 +244,8 @@ struct RunContext
   unsigned int num_hosts;
 
   /**
-   * Number of registered hosts
+   * Number of registered hosts. Also used as a counter while checking
+   * habitabillity of hosts
    */
   unsigned int reg_hosts;
 
@@ -352,6 +358,7 @@ cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == rc->register_hosts_task);
   GNUNET_assert (NULL == rc->reg_handle);
   GNUNET_assert (NULL == rc->peers);
+  GNUNET_assert (NULL == rc->hc_handles);
   GNUNET_assert (RC_PEERS_DESTROYED == rc->state);
   if (NULL != rc->c)
     GNUNET_TESTBED_controller_disconnect (rc->c);
@@ -392,9 +399,18 @@ shutdown_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   struct RunContext *rc = cls;
   struct DLLOperation *dll_op;
   unsigned int peer;
+  unsigned int nhost;
 
   GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != rc->shutdown_run_task);
   rc->shutdown_run_task = GNUNET_SCHEDULER_NO_TASK;
+  if (NULL != rc->hc_handles)
+  {
+    for (nhost = 0; nhost < rc->num_hosts; nhost++)
+      if (NULL != rc->hc_handles[nhost])
+        GNUNET_TESTBED_is_host_habitable_cancel (rc->hc_handles[nhost]);
+    GNUNET_free (rc->hc_handles);
+    rc->hc_handles = NULL;
+  }
   /* Stop register hosts task if it is running */
   if (GNUNET_SCHEDULER_NO_TASK != rc->register_hosts_task)
   {
@@ -788,6 +804,7 @@ controller_status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Testbed startup failed\n");
     return;
   }
+  GNUNET_CONFIGURATION_destroy (rc->cfg);
   rc->cfg = GNUNET_CONFIGURATION_dup (cfg);
   event_mask = rc->event_mask;
   event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_STOP);
@@ -806,6 +823,57 @@ controller_status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
 }
 
 
+/**
+ * Callbacks of this type are called by GNUNET_TESTBED_is_host_habitable to
+ * inform whether the given host is habitable or not. The Handle returned by
+ * GNUNET_TESTBED_is_host_habitable() is invalid after this callback is called
+ *
+ * @param cls NULL
+ * @param host the host whose status is being reported; will be NULL if the host
+ *          given to GNUNET_TESTBED_is_host_habitable() is NULL
+ * @param status GNUNET_YES if it is habitable; GNUNET_NO if not
+ */
+static void 
+host_habitable_cb (void *cls, const struct GNUNET_TESTBED_Host *host, int status)
+{
+  struct RunContext *rc = cls;
+  unsigned int nhost;
+  
+  for (nhost = 0; nhost < rc->num_hosts; nhost++)
+  {
+    if (host == rc->hosts[nhost])
+      break;
+  }
+  GNUNET_assert (nhost != rc->num_hosts);
+  rc->hc_handles[nhost] = NULL;
+  rc->reg_hosts++;
+  if (rc->reg_hosts < rc->num_hosts)
+    return;
+  GNUNET_free (rc->hc_handles);
+  rc->hc_handles = NULL;
+  rc->h = rc->hosts[0];
+  rc->num_hosts--;
+  if (0 < rc->num_hosts)
+    rc->hosts = &rc->hosts[1];
+  else
+  {
+    GNUNET_free (rc->hosts);
+    rc->hosts = NULL;
+  }
+  /* FIXME: If we are starting controller on different host 127.0.0.1 may not ab
+  correct */
+  rc->cproc =
+      GNUNET_TESTBED_controller_start ("127.0.0.1", rc->h, rc->cfg,
+                                       &controller_status_cb, rc);
+  if (NULL == rc->cproc)
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR, _("Cannot start the master controller"));
+    GNUNET_SCHEDULER_cancel (rc->shutdown_run_task);
+    rc->shutdown_run_task = GNUNET_SCHEDULER_add_now (&shutdown_run, rc);
+  }
+}
+
+
 /**
  * Convenience method for running a testbed with
  * a single call.  Underlay and overlay topology
@@ -844,6 +912,7 @@ GNUNET_TESTBED_run (const char *host_filename,
   char *topology;
   unsigned long long random_links;
   unsigned int hid;
+  unsigned int nhost;
   
   GNUNET_assert (NULL != cc);
   GNUNET_assert (num_peers > 0);
@@ -857,22 +926,16 @@ GNUNET_TESTBED_run (const char *host_filename,
     {
       LOG (GNUNET_ERROR_TYPE_WARNING,
            _("No hosts loaded. Need at least one host\n"));
-      return;
+      goto error_cleanup;
     }
-    rc->h = rc->hosts[0];
-    rc->num_hosts--;
-    if (0 < rc->num_hosts)
-      rc->hosts = &rc->hosts[1];
   }
   else
-    rc->h = GNUNET_TESTBED_host_create (NULL, NULL, 0);
-  GNUNET_assert (NULL != rc->h);
-  /* FIXME: If we are starting controller on different host 127.0.0.1 may not ab
-  correct */
-  rc->cproc =
-      GNUNET_TESTBED_controller_start ("127.0.0.1", rc->h, cfg,
-                                       &controller_status_cb, rc);
-  GNUNET_assert (NULL != rc->cproc);
+  {
+    rc->hosts = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Host *));
+    rc->hosts[0] = GNUNET_TESTBED_host_create (NULL, NULL, 0);
+    rc->num_hosts = 1;
+  }
+  rc->cfg = GNUNET_CONFIGURATION_dup (cfg);
   rc->num_peers = num_peers;
   rc->event_mask = event_mask;
   rc->event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_START);
@@ -881,8 +944,8 @@ GNUNET_TESTBED_run (const char *host_filename,
   rc->master = master;
   rc->master_cls = master_cls;
   rc->state = RC_INIT;
-  rc->topology = GNUNET_TESTBED_TOPOLOGY_NONE;
-  if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (cfg, "testbed",
+  rc->topology = GNUNET_TESTBED_TOPOLOGY_NONE;  
+  if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (rc->cfg, "testbed",
                                                           "OVERLAY_TOPOLOGY",
                                                           &topology))
   {
@@ -894,51 +957,77 @@ GNUNET_TESTBED_run (const char *host_filename,
     }
     GNUNET_free (topology);
   }
-  if ( (GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI == rc->topology)
-       || (GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD_RING == rc->topology)
-       || (GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD == rc->topology))
+  switch (rc->topology)
   {
-    if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg, "testbed",
+  case GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI:
+  case GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD_RING:
+  case GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD:
+    if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (rc->cfg, "testbed",
                                                             "OVERLAY_RANDOM_LINKS",
                                                             &random_links))
     {
       /* OVERLAY option RANDOM & SMALL_WORLD_RING requires OVERLAY_RANDOM_LINKS
          option to be set to the number of random links to be established  */
       GNUNET_break (0);
-      GNUNET_free (rc);
-      return;
+      goto error_cleanup;
     }
     if (random_links > UINT32_MAX)
     {
       GNUNET_break (0);       /* Too big number */
-      GNUNET_TESTBED_host_destroy (rc->h);
-      for (hid = 0; hid < rc->num_hosts; hid++)
-        GNUNET_TESTBED_host_destroy (rc->hosts[hid]);
-      GNUNET_free_non_null (rc->hosts);
-      GNUNET_free (rc);
-      return;
+      goto error_cleanup;
     }
     rc->random_links = (unsigned int) random_links;
-  }
-  else if (GNUNET_TESTBED_TOPOLOGY_FROM_FILE == rc->topology)
-  {
-    if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, "testbed",
+    break;
+  case GNUNET_TESTBED_TOPOLOGY_FROM_FILE:
+    if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (rc->cfg, "testbed",
                                                             "TOPOLOGY_FILE",
                                                             &rc->topo_file))
     {
       /* You need to set TOPOLOGY_FILE option to a topolog file */
       GNUNET_break (0);
-      GNUNET_TESTBED_host_destroy (rc->h);
-      for (hid = 0; hid < rc->num_hosts; hid++)
-        GNUNET_TESTBED_host_destroy (rc->hosts[hid]);
-      GNUNET_free_non_null (rc->hosts);
-      GNUNET_free (rc);
-      return;
+      goto error_cleanup;
+    }
+    break;
+  default:   
+    /* Do nothing */
+    break;
+  }
+  rc->hc_handles = GNUNET_malloc (sizeof (struct
+                                          GNUNET_TESTBED_HostHabitableCheckHandle *) 
+                                  * rc->num_hosts);
+  for (nhost = 0; nhost < rc->num_hosts; nhost++) 
+  {    
+    if (NULL == (rc->hc_handles[nhost] = 
+                 GNUNET_TESTBED_is_host_habitable (rc->hosts[nhost], rc->cfg,
+                                                   &host_habitable_cb,
+                                                   rc)))
+    {
+      LOG (GNUNET_ERROR_TYPE_WARNING, "Host %s cannot start testbed\n",
+              GNUNET_TESTBED_host_get_hostname_ (rc->hosts[nhost]));
+      for (nhost = 0; nhost < rc->num_hosts; nhost++)
+        if (NULL != rc->hc_handles[nhost])
+          GNUNET_TESTBED_is_host_habitable_cancel (rc->hc_handles[nhost]);
+      GNUNET_free (rc->hc_handles);
+      rc->hc_handles = NULL;
+      goto error_cleanup;
     }
   }
   rc->shutdown_run_task =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
                                     &shutdown_run, rc);
+  return;
+
+ error_cleanup:  
+  if (NULL != rc->h)
+    GNUNET_TESTBED_host_destroy (rc->h);
+  if (NULL != rc->hosts)
+  {
+    for (hid = 0; hid < rc->num_hosts; hid++)
+      if (NULL != rc->hosts[hid])
+        GNUNET_TESTBED_host_destroy (rc->hosts[hid]);
+    GNUNET_free (rc->hosts);
+  }
+  GNUNET_free (rc);
 }