X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Fperf_gnunet_service_fs_p2p.c;h=316fdbd8a1be29769e36c39cc572e3213ace7131;hb=0e592870059883b779d02a14fa5ea13be5f50595;hp=89db80c0b9eaa7d2c2762cddf7ccf60bc3cbddec;hpb=309276a88d1e57dffbea0014dc0708726c2e9376;p=oweals%2Fgnunet.git diff --git a/src/fs/perf_gnunet_service_fs_p2p.c b/src/fs/perf_gnunet_service_fs_p2p.c index 89db80c0b..316fdbd8a 100644 --- a/src/fs/perf_gnunet_service_fs_p2p.c +++ b/src/fs/perf_gnunet_service_fs_p2p.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2010, 2012 Christian Grothoff (and other contributing authors) + Copyright (C) 2010, 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. */ /** @@ -51,6 +51,8 @@ static struct GNUNET_TIME_Absolute start_time; static const char *progname; +static struct GNUNET_TIME_Absolute start_time; + /** * Master context for 'stat_run'. @@ -105,8 +107,8 @@ static struct StatValues stats[] = { * @param subsystem name of subsystem that created the statistic * @param name the name of the datum * @param value the current value - * @param is_persistent GNUNET_YES if the value is persistent, GNUNET_NO if not - * @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration + * @param is_persistent #GNUNET_YES if the value is persistent, #GNUNET_NO if not + * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration */ static int print_stat (void *cls, const char *subsystem, const char *name, uint64_t value, @@ -114,8 +116,12 @@ print_stat (void *cls, const char *subsystem, const char *name, uint64_t value, { struct StatMaster *sm = cls; - FPRINTF (stderr, "Peer %2u: %12s/%50s = %12llu\n", sm->daemon, subsystem, - name, (unsigned long long) value); + FPRINTF (stderr, + "Peer %2u: %12s/%50s = %12llu\n", + sm->daemon, + subsystem, + name, + (unsigned long long) value); return GNUNET_OK; } @@ -124,7 +130,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); @@ -147,7 +153,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 @@ -166,11 +172,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) { @@ -182,7 +188,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) @@ -207,7 +213,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; } @@ -232,7 +238,7 @@ stat_run (void *cls, static void -do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +do_report (void *cls) { char *fn = cls; struct GNUNET_TIME_Relative del; @@ -244,26 +250,30 @@ do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_DISK_directory_remove (fn); GNUNET_free (fn); } - if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT)) + 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, shutting down with error\n"); ok = 1; - GNUNET_SCHEDULER_shutdown (); + GNUNET_SCHEDULER_shutdown (); 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); - FPRINTF (stdout, "Download speed was %s/s\n", fancy); + 1000000LL / del.rel_value_us); + FPRINTF (stdout, + "Download speed was %s/s\n", + fancy); GNUNET_free (fancy); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished download, shutting down\n", - (unsigned long long) FILESIZE); - sm = GNUNET_malloc (sizeof (struct StatMaster)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Finished download, shutting down\n"); + sm = GNUNET_new (struct StatMaster); sm->op = GNUNET_TESTBED_service_connect (NULL, daemons[sm->daemon], @@ -276,14 +286,14 @@ do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void -do_download (void *cls, +do_download (void *cls, const struct GNUNET_FS_Uri *uri, const char *fn) { int anonymity; if (NULL == uri) - { + { GNUNET_SCHEDULER_shutdown (); GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Timeout during upload attempt, shutting down with error\n"); @@ -297,21 +307,30 @@ do_download (void *cls, anonymity = 0; else anonymity = 1; - GNUNET_FS_TEST_download (daemons[0], TIMEOUT, anonymity, SEED, uri, VERBOSE, - &do_report, + start_time = GNUNET_TIME_absolute_get (); + GNUNET_FS_TEST_download (daemons[0], + TIMEOUT, + anonymity, + SEED, + uri, + VERBOSE, + &do_report, (NULL == fn) ? NULL : GNUNET_strdup (fn)); } static void -do_publish (void *cls, +do_publish (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) { unsigned int i; int do_index; int anonymity; - + GNUNET_assert (NUM_DAEMONS == num_peers); for (i=0;i