make fs tests build against new testbed library -- they do not pass yet

1 files changed, 121 insertions, 89 deletions

diff --git a/src/fs/perf_gnunet_service_fs_p2p_respect.c b/src/fs/perf_gnunet_service_fs_p2p_respect.c
index 58fe34eef..3030749e2 100644
--- a/src/fs/perf_gnunet_service_fs_p2p_respect.c
+++ b/src/fs/perf_gnunet_service_fs_p2p_respect.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2010, 2011 Christian Grothoff (and other contributing authors)
+     (C) 2010, 2011, 2012 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -45,7 +45,7 @@
  */
 #include "platform.h"
 #include "fs_test_lib.h"
-#include "gnunet_testing_lib.h"
+#include "gnunet_testbed_service.h"
 
 #define VERBOSE GNUNET_NO
 
@@ -74,7 +74,7 @@
  */
 #define SEED2 43
 
-static struct GNUNET_FS_TestDaemon *daemons[NUM_DAEMONS];
+static struct GNUNET_TESTBED_Peer *daemons[NUM_DAEMONS];
 
 static int ok;
 
@@ -86,12 +86,6 @@ static struct GNUNET_FS_Uri *uri1;
 
 static struct GNUNET_FS_Uri *uri2;
 
-static void
-do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_FS_TEST_daemons_stop (NUM_DAEMONS, daemons);
-}
-
 
 /**
  * Master context for 'stat_run'.
@@ -99,6 +93,7 @@ do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 struct StatMaster
 {
   struct GNUNET_STATISTICS_Handle *stat;
+  struct GNUNET_TESTBED_Operation *op;
   unsigned int daemon;
   unsigned int value;
 };
@@ -163,7 +158,10 @@ print_stat (void *cls, const char *subsystem, const char *name, uint64_t value,
  * Function that gathers stats from all daemons.
  */
 static void
-stat_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+stat_run (void *cls, 
+          struct GNUNET_TESTBED_Operation *op,
+          void *ca_result,
+          const char *emsg);
 
 
 /**
@@ -176,7 +174,42 @@ get_done (void *cls, int success)
 
   GNUNET_break (GNUNET_OK == success);
   sm->value++;
-  GNUNET_SCHEDULER_add_now (&stat_run, sm);
+  stat_run (sm, sm->op, sm->stat, NULL);
+}
+
+
+
+/**
+ * Adapter function called to establish a connection to
+ * statistics service.
+ * 
+ * @param cls closure
+ * @param cfg configuration of the peer to connect to; will be available until
+ *          GNUNET_TESTBED_operation_done() is called on the operation returned
+ *          from GNUNET_TESTBED_service_connect()
+ * @return service handle to return in 'op_result', NULL on error
+ */
+static void *
+statistics_connect_adapter (void *cls,
+                            const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  return GNUNET_STATISTICS_create ("<driver>",
+                                   cfg);
+}
+
+
+/**
+ * Adapter function called to destroy a connection to
+ * statistics service.
+ * 
+ * @param cls closure
+ * @param op_result service handle returned from the connect adapter
+ */
+static void 
+statistics_disconnect_adapter (void *cls,
+                               void *op_result)
+{
+  GNUNET_STATISTICS_destroy (op_result, GNUNET_NO);
 }
 
 
@@ -184,7 +217,10 @@ get_done (void *cls, int success)
  * Function that gathers stats from all daemons.
  */
 static void
-stat_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+stat_run (void *cls, 
+          struct GNUNET_TESTBED_Operation *op,
+          void *ca_result,
+          const char *emsg)
 {
   struct StatMaster *sm = cls;
 
@@ -200,20 +236,23 @@ stat_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                            sm);
     return;
   }
-  GNUNET_STATISTICS_destroy (sm->stat, GNUNET_NO);
+  GNUNET_TESTBED_operation_done (sm->op);
   sm->value = 0;
   sm->daemon++;
-  if (sm->daemon == NUM_DAEMONS)
+  if (NUM_DAEMONS == sm->daemon)
   {
     GNUNET_free (sm);
-    GNUNET_SCHEDULER_add_now (&do_stop, NULL);
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  sm->stat =
-      GNUNET_STATISTICS_create ("<driver>",
-                                GNUNET_FS_TEST_get_configuration (daemons,
-                                                                  sm->daemon));
-  GNUNET_SCHEDULER_add_now (&stat_run, sm);
+  sm->op =
+    GNUNET_TESTBED_service_connect (NULL,
+                                    daemons[sm->daemon],
+                                    "statistics",
+                                    &stat_run, sm,
+                                    &statistics_connect_adapter,
+                                    &statistics_disconnect_adapter,
+                                    NULL);
 }
 
 
@@ -226,36 +265,37 @@ do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   char *fancy;
   struct StatMaster *sm;
 
-  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
-  {
-    del = GNUNET_TIME_absolute_get_duration (start_time);
-    if (del.rel_value == 0)
-      del.rel_value = 1;
-    fancy =
-        GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
-                                        1000LL / del.rel_value);
-    FPRINTF (stderr, "Download speed of type `%s' was %s/s\n", type, fancy);
-    GNUNET_free (fancy);
-    if (NUM_DAEMONS != ++download_counter)
-      return;                   /* more downloads to come */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Finished all downloads, shutting down\n",
-                (unsigned long long) FILESIZE);
-    sm = GNUNET_malloc (sizeof (struct StatMaster));
-    sm->stat =
-        GNUNET_STATISTICS_create ("<driver>",
-                                  GNUNET_FS_TEST_get_configuration (daemons,
-                                                                    sm->daemon));
-    GNUNET_SCHEDULER_add_now (&stat_run, sm);
-  }
-  else
+  if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Timeout during download for type `%s', shutting down with error\n",
                 type);
     ok = 1;
-    GNUNET_SCHEDULER_add_now (&do_stop, NULL);
+    GNUNET_SCHEDULER_shutdown ();
+    return;
   }
+  del = GNUNET_TIME_absolute_get_duration (start_time);
+  if (del.rel_value == 0)
+    del.rel_value = 1;
+  fancy =
+    GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
+                                    1000LL / del.rel_value);
+  FPRINTF (stderr, "Download speed of type `%s' was %s/s\n", type, fancy);
+  GNUNET_free (fancy);
+  if (NUM_DAEMONS != ++download_counter)
+    return;                   /* more downloads to come */
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Finished all downloads, shutting down\n",
+              (unsigned long long) FILESIZE);
+  sm = GNUNET_malloc (sizeof (struct StatMaster));
+  sm->op =
+    GNUNET_TESTBED_service_connect (NULL,
+                                    daemons[sm->daemon],
+                                    "statistics",
+                                    &stat_run, sm,
+                                    &statistics_connect_adapter,
+                                    &statistics_disconnect_adapter,
+                                    NULL);
 }
 
 
@@ -267,7 +307,7 @@ do_downloads (void *cls, const struct GNUNET_FS_Uri *u2)
 
   if (NULL == u2)
   {
-    GNUNET_FS_TEST_daemons_stop (NUM_DAEMONS, daemons);
+    GNUNET_SCHEDULER_shutdown ();
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Timeout during upload attempt, shutting down with error\n");
     ok = 1;
@@ -298,14 +338,15 @@ do_downloads (void *cls, const struct GNUNET_FS_Uri *u2)
 
 
 static void
-do_publish2 (void *cls, const struct GNUNET_FS_Uri *u1)
+do_publish2 (void *cls,      
+             const struct GNUNET_FS_Uri *u1)
 {
   int do_index;
   int anonymity;
 
   if (NULL == u1)
-  {
-    GNUNET_FS_TEST_daemons_stop (NUM_DAEMONS, daemons);
+    {
+    GNUNET_SCHEDULER_shutdown ();
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Timeout during upload attempt, shutting down with error\n");
     ok = 1;
@@ -329,18 +370,23 @@ do_publish2 (void *cls, const struct GNUNET_FS_Uri *u1)
 }
 
 static void
-do_publish1 (void *cls, const char *emsg)
+do_publish1 (void *cls, 
+             struct GNUNET_TESTBED_Operation *op,
+             const char *emsg)
 {
+  unsigned int *coco = cls;
   int do_index;
   int anonymity;
 
   if (NULL != emsg)
   {
-    GNUNET_FS_TEST_daemons_stop (NUM_DAEMONS, daemons);
+    GNUNET_SCHEDULER_shutdown ();
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error trying to connect: %s\n", emsg);
     ok = 1;
     return;
   }
+  if (0 != (--(*coco)))
+    return; /* more connections to be created */
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publishing %llu bytes\n",
               (unsigned long long) FILESIZE);
   if (NULL != strstr (progname, "index"))
@@ -351,7 +397,6 @@ do_publish1 (void *cls, const char *emsg)
     anonymity = 0;
   else
     anonymity = 1;
-
   GNUNET_FS_TEST_publish (daemons[NUM_DAEMONS - 1], TIMEOUT, anonymity,
                           do_index, FILESIZE, SEED1, VERBOSE, &do_publish2,
                           NULL);
@@ -359,51 +404,38 @@ do_publish1 (void *cls, const char *emsg)
 
 
 static void
-do_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_connect (void *cls, 
+            unsigned int num_peers,
+            struct GNUNET_TESTBED_Peer **peers)
 {
-  struct GNUNET_TESTING_PeerGroup *pg;
-
-  GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Daemons started, will now try to connect them\n");
-  pg = GNUNET_FS_TEST_get_group (daemons);
-  GNUNET_TESTING_create_topology (pg, GNUNET_TESTING_TOPOLOGY_CLIQUE,
-                                  GNUNET_TESTING_TOPOLOGY_NONE, NULL);
-  GNUNET_TESTING_connect_topology (pg, GNUNET_TESTING_TOPOLOGY_CLIQUE,
-                                   GNUNET_TESTING_TOPOLOGY_OPTION_NONE, 0.0,
-                                   TIMEOUT, NUM_DAEMONS, &do_publish1, NULL);
-}
-
-
-static void
-run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  GNUNET_FS_TEST_daemons_start ("fs_test_lib_data.conf", TIMEOUT, NUM_DAEMONS,
-                                daemons, &do_connect, NULL);
+  static unsigned int coco;
+  unsigned int i;
+  unsigned int j;
+ 
+  GNUNET_assert (NUM_DAEMONS == num_peers);
+  for (i=0;i<num_peers;i++)
+    daemons[i] = peers[i];
+  for (i=0;i<NUM_DAEMONS;i++)
+    for (j=i+1;j<NUM_DAEMONS;j++)
+      {
+        coco++;
+        GNUNET_TESTBED_overlay_connect (NULL,
+                                        &do_publish1,
+                                        &coco,
+                                        peers[i],
+                                        peers[j]);
+      }
 }
 
 
 int
 main (int argc, char *argv[])
 {
-  char *const argvx[] = {
-    "perf-gnunet-service-fs-p2p",
-    "-c",
-    "fs_test_lib_data.conf",
-    NULL
-  };
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-  progname = argv[0];
-  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
-  GNUNET_log_setup ("perf_gnunet_service_fs_p2p_respect",
-                    "WARNING",
-                    NULL);
-  GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx,
-                      "perf-gnunet-service-fs-p2p-respect", "nohelp", options,
-                      &run, NULL);
+  GNUNET_TESTBED_test_run ("perf-gnunet-service-fs-p2p-respect",
+                           "perf_gnunet_service_fs_p2p.conf",
+                           NUM_DAEMONS,
+                           0, NULL, NULL,
+                           &do_connect, NULL);
   GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
   return ok;
 }