X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Fperf_gnunet_service_fs_p2p_respect.c;h=8098afbe9660004cd90005e552b2ac32e3446e15;hb=82242cae3bb6313ee10df20570e4c14627828033;hp=0437f68a60153a57b41b15a6ded1e6cb498bc87a;hpb=7b26d20f94a7806d17178aab2f20b312dd08fc5c;p=oweals%2Fgnunet.git diff --git a/src/fs/perf_gnunet_service_fs_p2p_respect.c b/src/fs/perf_gnunet_service_fs_p2p_respect.c index 0437f68a6..8098afbe9 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, 2012 Christian Grothoff (and other contributing authors) + Copyright (C) 2010, 2011, 2012 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /** @@ -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,7 +237,7 @@ 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) @@ -234,7 +254,7 @@ stat_run (void *cls, #else stats[sm->value].subsystem, stats[sm->value].name, #endif - GNUNET_TIME_UNIT_FOREVER_REL, &get_done, &print_stat, + &get_done, &print_stat, sm); return; } @@ -244,7 +264,7 @@ stat_run (void *cls, if (NUM_DAEMONS == sm->daemon) { GNUNET_free (sm); - GNUNET_SCHEDULER_shutdown (); + cleanup (); return; } sm->op = @@ -259,7 +279,7 @@ stat_run (void *cls, static void -do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +do_report (void *cls) { static int download_counter; const char *type = cls; @@ -267,28 +287,30 @@ do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) char *fancy; struct StatMaster *sm; - if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)) + if (0 == + GNUNET_TIME_absolute_get_remaining (GNUNET_TIME_absolute_add (start_time, + TIMEOUT)).rel_value_us) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "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, getting statistics\n"); - sm = GNUNET_malloc (sizeof (struct StatMaster)); + sm = GNUNET_new (struct StatMaster); sm->op = GNUNET_TESTBED_service_connect (NULL, daemons[sm->daemon], @@ -301,19 +323,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); @@ -339,20 +364,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); @@ -372,7 +400,7 @@ do_publish2 (void *cls, static void -do_publish1 (void *cls, +do_publish1 (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg) { @@ -383,7 +411,7 @@ do_publish1 (void *cls, 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; @@ -407,14 +435,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