fixing #3799: only unindex if DB operations succeeded previously in the first place...

[oweals/gnunet.git] / src / fs / perf_gnunet_service_fs_p2p_respect.c

diff --git a/src/fs/perf_gnunet_service_fs_p2p_respect.c b/src/fs/perf_gnunet_service_fs_p2p_respect.c
index 3030749e299d8635f927d60ff8f30f088243484e..47fb0d8f3900a6be0201c2600b953dfa0df3e232 100644 (file)
--- 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, 2012 Christian Grothoff (and other contributing authors)
+     Copyright (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
@@ -86,6 +86,9 @@ static struct GNUNET_FS_Uri *uri1;
 
 static struct GNUNET_FS_Uri *uri2;
 
+static char *fn1;
+
+static char *fn2;
 
 /**
  * Master context for 'stat_run'.
@@ -132,6 +135,23 @@ static struct StatValues stats[] = {
 };
 
 
+static void
+cleanup ()
+{
+  GNUNET_SCHEDULER_shutdown ();
+  if (NULL != fn1)
+  {
+    GNUNET_DISK_directory_remove (fn1);
+    GNUNET_free (fn1);
+  }
+  if (NULL != fn2)
+  {
+    GNUNET_DISK_directory_remove (fn2);
+    GNUNET_free (fn2);
+  }
+}
+
+
 /**
  * Callback function to process statistic values.
  *
@@ -158,7 +178,7 @@ 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, 
+stat_run (void *cls,
          struct GNUNET_TESTBED_Operation *op,
          void *ca_result,
          const char *emsg);
@@ -182,7 +202,7 @@ get_done (void *cls, int success)
 /**
  * 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
@@ -201,11 +221,11 @@ statistics_connect_adapter (void *cls,
 /**
  * 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 
+static void
 statistics_disconnect_adapter (void *cls,
                               void *op_result)
 {
@@ -217,14 +237,16 @@ statistics_disconnect_adapter (void *cls,
  * Function that gathers stats from all daemons.
  */
 static void
-stat_run (void *cls, 
+stat_run (void *cls,
          struct GNUNET_TESTBED_Operation *op,
          void *ca_result,
          const char *emsg)
 {
   struct StatMaster *sm = cls;
 
-  if (stats[sm->value].name != NULL)
+  sm->stat = ca_result;
+  GNUNET_assert (NULL != sm->stat);
+  if (NULL != stats[sm->value].name)
   {
     GNUNET_STATISTICS_get (sm->stat,
 #if 0
@@ -242,7 +264,7 @@ stat_run (void *cls,
   if (NUM_DAEMONS == sm->daemon)
   {
     GNUNET_free (sm);
-    GNUNET_SCHEDULER_shutdown ();
+    cleanup ();
     return;
   }
   sm->op =
@@ -271,23 +293,22 @@ do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                 "Timeout during download for type `%s', shutting down with error\n",
                 type);
     ok = 1;
-    GNUNET_SCHEDULER_shutdown ();
+    cleanup ();
     return;
   }
   del = GNUNET_TIME_absolute_get_duration (start_time);
-  if (del.rel_value == 0)
-    del.rel_value = 1;
+  if (del.rel_value_us == 0)
+    del.rel_value_us = 1;
   fancy =
     GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
-                                   1000LL / del.rel_value);
+                                   1000000LL / del.rel_value_us);
   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));
+             "Finished all downloads, getting statistics\n");
+  sm = GNUNET_new (struct StatMaster);
   sm->op =
     GNUNET_TESTBED_service_connect (NULL,
                                    daemons[sm->daemon],
@@ -300,19 +321,22 @@ do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 static void
-do_downloads (void *cls, const struct GNUNET_FS_Uri *u2)
+do_downloads (void *cls, const struct GNUNET_FS_Uri *u2,
+             const char *fn)
 {
   int anonymity;
   unsigned int i;
 
   if (NULL == u2)
   {
-    GNUNET_SCHEDULER_shutdown ();
+    cleanup ();
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Timeout during upload attempt, shutting down with error\n");
     ok = 1;
     return;
   }
+  if (NULL != fn)
+    fn2 = GNUNET_strdup (fn);
   uri2 = GNUNET_FS_uri_dup (u2);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Downloading %llu bytes\n",
               (unsigned long long) FILESIZE);
@@ -338,20 +362,23 @@ 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,
+            const char *fn)
 {
   int do_index;
   int anonymity;
 
   if (NULL == u1)
-    {
-    GNUNET_SCHEDULER_shutdown ();
+  {
+    cleanup ();
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Timeout during upload attempt, shutting down with error\n");
     ok = 1;
     return;
   }
+  if (NULL != fn)
+    fn1 = GNUNET_strdup (fn);
   uri1 = GNUNET_FS_uri_dup (u1);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publishing %llu bytes\n",
               (unsigned long long) FILESIZE);
@@ -369,8 +396,9 @@ do_publish2 (void *cls,
                           NULL);
 }
 
+
 static void
-do_publish1 (void *cls, 
+do_publish1 (void *cls,
             struct GNUNET_TESTBED_Operation *op,
             const char *emsg)
 {
@@ -378,9 +406,10 @@ do_publish1 (void *cls,
   int do_index;
   int anonymity;
 
+  GNUNET_TESTBED_operation_done (op);
   if (NULL != emsg)
   {
-    GNUNET_SCHEDULER_shutdown ();
+    cleanup ();
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error trying to connect: %s\n", emsg);
     ok = 1;
     return;
@@ -404,14 +433,17 @@ do_publish1 (void *cls,
 
 
 static void
-do_connect (void *cls, 
+do_connect (void *cls,
+            struct GNUNET_TESTBED_RunHandle *h,
            unsigned int num_peers,
-           struct GNUNET_TESTBED_Peer **peers)
+           struct GNUNET_TESTBED_Peer **peers,
+            unsigned int links_succeeded,
+            unsigned int links_failed)
 {
   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];
@@ -431,11 +463,12 @@ do_connect (void *cls,
 int
 main (int argc, char *argv[])
 {
-  GNUNET_TESTBED_test_run ("perf-gnunet-service-fs-p2p-respect",
-                          "perf_gnunet_service_fs_p2p.conf",
-                          NUM_DAEMONS,
-                          0, NULL, NULL,
-                          &do_connect, NULL);
+  progname = argv[0];
+  (void) 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;
 }