diff options
Diffstat (limited to 'src/fs/perf_gnunet_service_fs_p2p.c')
-rw-r--r-- | src/fs/perf_gnunet_service_fs_p2p.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/fs/perf_gnunet_service_fs_p2p.c b/src/fs/perf_gnunet_service_fs_p2p.c index 0b66150db..5d8b726dc 100644 --- a/src/fs/perf_gnunet_service_fs_p2p.c +++ b/src/fs/perf_gnunet_service_fs_p2p.c | |||
@@ -27,17 +27,17 @@ | |||
27 | #include "fs_test_lib.h" | 27 | #include "fs_test_lib.h" |
28 | #include "gnunet_testing_lib.h" | 28 | #include "gnunet_testing_lib.h" |
29 | 29 | ||
30 | #define VERBOSE GNUNET_NO | 30 | #define VERBOSE GNUNET_YES |
31 | 31 | ||
32 | /** | 32 | /** |
33 | * File-size we use for testing. | 33 | * File-size we use for testing. |
34 | */ | 34 | */ |
35 | #define FILESIZE (1024 * 1024 * 10) | 35 | #define FILESIZE (1024 * 1024 * 1) |
36 | 36 | ||
37 | /** | 37 | /** |
38 | * How long until we give up on transmitting the message? | 38 | * How long until we give up on transmitting the message? |
39 | */ | 39 | */ |
40 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 300) | 40 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 3) |
41 | 41 | ||
42 | #define NUM_DAEMONS 2 | 42 | #define NUM_DAEMONS 2 |
43 | 43 | ||
@@ -89,6 +89,10 @@ static struct StatValues stats[] = | |||
89 | { "fs", "# requests done for free (low load)"}, | 89 | { "fs", "# requests done for free (low load)"}, |
90 | { "fs", "# P2P searches received"}, | 90 | { "fs", "# P2P searches received"}, |
91 | { "fs", "# replies received for local clients"}, | 91 | { "fs", "# replies received for local clients"}, |
92 | { "fs", "# P2P searches discarded (queue length bound)"}, | ||
93 | { "fs", "# requests dropped due to high load"}, | ||
94 | { "fs", "# requests dropped by datastore (queue length limit)"}, | ||
95 | { "fs", "# queries retransmitted to same target"}, | ||
92 | { "fs", "cummulative artificial delay introduced (ms)"}, | 96 | { "fs", "cummulative artificial delay introduced (ms)"}, |
93 | { "core", "# bytes decrypted"}, | 97 | { "core", "# bytes decrypted"}, |
94 | { "core", "# bytes encrypted"}, | 98 | { "core", "# bytes encrypted"}, |
@@ -129,6 +133,7 @@ print_stat (void *cls, | |||
129 | return GNUNET_OK; | 133 | return GNUNET_OK; |
130 | } | 134 | } |
131 | 135 | ||
136 | |||
132 | /** | 137 | /** |
133 | * Function that gathers stats from all daemons. | 138 | * Function that gathers stats from all daemons. |
134 | */ | 139 | */ |
@@ -136,6 +141,7 @@ static void | |||
136 | stat_run (void *cls, | 141 | stat_run (void *cls, |
137 | const struct GNUNET_SCHEDULER_TaskContext *tc); | 142 | const struct GNUNET_SCHEDULER_TaskContext *tc); |
138 | 143 | ||
144 | |||
139 | /** | 145 | /** |
140 | * Function called when GET operation on stats is done. | 146 | * Function called when GET operation on stats is done. |
141 | */ | 147 | */ |
@@ -149,6 +155,7 @@ get_done (void *cls, | |||
149 | GNUNET_SCHEDULER_add_now (sched, &stat_run, sm); | 155 | GNUNET_SCHEDULER_add_now (sched, &stat_run, sm); |
150 | } | 156 | } |
151 | 157 | ||
158 | |||
152 | /** | 159 | /** |
153 | * Function that gathers stats from all daemons. | 160 | * Function that gathers stats from all daemons. |
154 | */ | 161 | */ |
@@ -217,7 +224,7 @@ do_report (void *cls, | |||
217 | } | 224 | } |
218 | else | 225 | else |
219 | { | 226 | { |
220 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 227 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
221 | "Timeout during download, shutting down with error\n"); | 228 | "Timeout during download, shutting down with error\n"); |
222 | ok = 1; | 229 | ok = 1; |
223 | GNUNET_SCHEDULER_add_now (sched, &do_stop, NULL); | 230 | GNUNET_SCHEDULER_add_now (sched, &do_stop, NULL); |
@@ -234,7 +241,7 @@ do_download (void *cls, | |||
234 | GNUNET_FS_TEST_daemons_stop (sched, | 241 | GNUNET_FS_TEST_daemons_stop (sched, |
235 | NUM_DAEMONS, | 242 | NUM_DAEMONS, |
236 | daemons); | 243 | daemons); |
237 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 244 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
238 | "Timeout during upload attempt, shutting down with error\n"); | 245 | "Timeout during upload attempt, shutting down with error\n"); |
239 | ok = 1; | 246 | ok = 1; |
240 | return; | 247 | return; |
@@ -261,7 +268,7 @@ do_publish (void *cls, | |||
261 | GNUNET_FS_TEST_daemons_stop (sched, | 268 | GNUNET_FS_TEST_daemons_stop (sched, |
262 | NUM_DAEMONS, | 269 | NUM_DAEMONS, |
263 | daemons); | 270 | daemons); |
264 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 271 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
265 | "Error trying to connect: %s\n", | 272 | "Error trying to connect: %s\n", |
266 | emsg); | 273 | emsg); |
267 | ok = 1; | 274 | ok = 1; |