projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://gnunet.org/gnunet
[oweals/gnunet.git]
/
src
/
fs
/
perf_gnunet_service_fs_p2p.c
diff --git
a/src/fs/perf_gnunet_service_fs_p2p.c
b/src/fs/perf_gnunet_service_fs_p2p.c
index e70e4ec6e567bd6c40b84432937871506af1f5d2..316fdbd8a1be29769e36c39cc572e3213ace7131 100644
(file)
--- 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.
/*
This file is part of GNUnet.
- Copyright (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
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
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., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
*/
/**
@@
-51,6
+51,8
@@
static struct GNUNET_TIME_Absolute start_time;
static const char *progname;
static const char *progname;
+static struct GNUNET_TIME_Absolute start_time;
+
/**
* Master context for 'stat_run'.
/**
* 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 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,
*/
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;
{
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;
}
return GNUNET_OK;
}
@@
-207,7
+213,7
@@
stat_run (void *cls,
#else
stats[sm->value].subsystem, stats[sm->value].name,
#endif
#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;
}
sm);
return;
}
@@
-232,7
+238,7
@@
stat_run (void *cls,
static void
static void
-do_report (void *cls
, const struct GNUNET_SCHEDULER_TaskContext *tc
)
+do_report (void *cls)
{
char *fn = cls;
struct GNUNET_TIME_Relative del;
{
char *fn = cls;
struct GNUNET_TIME_Relative del;
@@
-244,7
+250,9
@@
do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
GNUNET_DISK_directory_remove (fn);
GNUNET_free (fn);
}
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");
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Timeout during download, shutting down with error\n");
@@
-259,10
+267,12
@@
do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
fancy =
GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
1000000LL / del.rel_value_us);
fancy =
GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
1000000LL / del.rel_value_us);
- FPRINTF (stdout, "Download speed was %s/s\n", fancy);
+ FPRINTF (stdout,
+ "Download speed was %s/s\n",
+ fancy);
GNUNET_free (fancy);
GNUNET_free (fancy);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Finished download, shutting down\n",
-
(unsigned long long) FILESIZE
);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+
"Finished download, shutting down\n"
);
sm = GNUNET_new (struct StatMaster);
sm->op =
GNUNET_TESTBED_service_connect (NULL,
sm = GNUNET_new (struct StatMaster);
sm->op =
GNUNET_TESTBED_service_connect (NULL,
@@
-283,7
+293,7
@@
do_download (void *cls,
int anonymity;
if (NULL == uri)
int anonymity;
if (NULL == uri)
-
{
+ {
GNUNET_SCHEDULER_shutdown ();
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Timeout during upload attempt, shutting down with error\n");
GNUNET_SCHEDULER_shutdown ();
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Timeout during upload attempt, shutting down with error\n");
@@
-297,7
+307,13
@@
do_download (void *cls,
anonymity = 0;
else
anonymity = 1;
anonymity = 0;
else
anonymity = 1;
- GNUNET_FS_TEST_download (daemons[0], TIMEOUT, anonymity, SEED, uri, VERBOSE,
+ 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));
}
&do_report,
(NULL == fn) ? NULL : GNUNET_strdup (fn));
}