projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add validation for inner consensus element
[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 c5846c8c30438599b531049d2e8323b853d23d3f..8098afbe9660004cd90005e552b2ac32e3446e15 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.
/*
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
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.
*/
/**
*/
/**
@@
-178,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
* 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 GNUNET_TESTBED_Operation *op,
void *ca_result,
const char *emsg);
@@
-202,7
+202,7
@@
get_done (void *cls, int success)
/**
* Adapter function called to establish a connection to
* statistics service.
/**
* 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
* @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
@@
-221,11
+221,11
@@
statistics_connect_adapter (void *cls,
/**
* Adapter function called to destroy a connection to
* statistics service.
/**
* Adapter function called to destroy a connection to
* statistics service.
- *
+ *
* @param cls closure
* @param op_result service handle returned from the connect adapter
*/
* @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)
{
statistics_disconnect_adapter (void *cls,
void *op_result)
{
@@
-237,7
+237,7
@@
statistics_disconnect_adapter (void *cls,
* Function that gathers stats from all daemons.
*/
static void
* 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 GNUNET_TESTBED_Operation *op,
void *ca_result,
const char *emsg)
@@
-254,7
+254,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;
}
@@
-279,7
+279,7
@@
stat_run (void *cls,
static void
static void
-do_report (void *cls
, const struct GNUNET_SCHEDULER_TaskContext *tc
)
+do_report (void *cls)
{
static int download_counter;
const char *type = cls;
{
static int download_counter;
const char *type = cls;
@@
-287,7
+287,9
@@
do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
char *fancy;
struct StatMaster *sm;
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",
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Timeout during download for type `%s', shutting down with error\n",
@@
-308,7
+310,7
@@
do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
return; /* more downloads to come */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Finished all downloads, getting statistics\n");
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],
sm->op =
GNUNET_TESTBED_service_connect (NULL,
daemons[sm->daemon],
@@
-362,7
+364,7
@@
do_downloads (void *cls, const struct GNUNET_FS_Uri *u2,
static void
static void
-do_publish2 (void *cls,
+do_publish2 (void *cls,
const struct GNUNET_FS_Uri *u1,
const char *fn)
{
const struct GNUNET_FS_Uri *u1,
const char *fn)
{
@@
-398,7
+400,7
@@
do_publish2 (void *cls,
static void
static void
-do_publish1 (void *cls,
+do_publish1 (void *cls,
struct GNUNET_TESTBED_Operation *op,
const char *emsg)
{
struct GNUNET_TESTBED_Operation *op,
const char *emsg)
{
@@
-433,7
+435,8
@@
do_publish1 (void *cls,
static void
static void
-do_connect (void *cls,
+do_connect (void *cls,
+ struct GNUNET_TESTBED_RunHandle *h,
unsigned int num_peers,
struct GNUNET_TESTBED_Peer **peers,
unsigned int links_succeeded,
unsigned int num_peers,
struct GNUNET_TESTBED_Peer **peers,
unsigned int links_succeeded,
@@
-442,7
+445,7
@@
do_connect (void *cls,
static unsigned int coco;
unsigned int i;
unsigned int j;
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];
GNUNET_assert (NUM_DAEMONS == num_peers);
for (i=0;i<num_peers;i++)
daemons[i] = peers[i];