diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-11-05 12:56:18 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-11-05 12:56:18 +0000 |
commit | b15cbf07c97038fdaf066cca732c01a142833b2b (patch) | |
tree | ac9cd8e3aaba23e43329b8bf213720a272b8f636 /src/stream | |
parent | badd541a3da5b515a659860b2515a7ea3654e791 (diff) | |
download | gnunet-b15cbf07c97038fdaf066cca732c01a142833b2b.tar.gz gnunet-b15cbf07c97038fdaf066cca732c01a142833b2b.zip |
fix to keep testing running
Diffstat (limited to 'src/stream')
-rw-r--r-- | src/stream/perf_stream_api.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/stream/perf_stream_api.c b/src/stream/perf_stream_api.c index 9539415f4..fdce1c5c1 100644 --- a/src/stream/perf_stream_api.c +++ b/src/stream/perf_stream_api.c | |||
@@ -397,7 +397,7 @@ static void | |||
397 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 397 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
398 | { | 398 | { |
399 | abort_task = GNUNET_SCHEDULER_NO_TASK; | 399 | abort_task = GNUNET_SCHEDULER_NO_TASK; |
400 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: ABORT\n"); | 400 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "test: ABORT\n"); |
401 | if (GNUNET_SCHEDULER_NO_TASK != read_task) | 401 | if (GNUNET_SCHEDULER_NO_TASK != read_task) |
402 | GNUNET_SCHEDULER_cancel (read_task); | 402 | GNUNET_SCHEDULER_cancel (read_task); |
403 | result = GNUNET_SYSERR; | 403 | result = GNUNET_SYSERR; |
@@ -449,7 +449,15 @@ write_completion (void *cls, enum GNUNET_STREAM_Status status, size_t size) | |||
449 | for (;size > 0; size--) | 449 | for (;size > 0; size--) |
450 | update_meter (meter); | 450 | update_meter (meter); |
451 | if (pdata->bytes_wrote < DATA_SIZE) /* Have more data to send */ | 451 | if (pdata->bytes_wrote < DATA_SIZE) /* Have more data to send */ |
452 | { | 452 | { |
453 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) | ||
454 | { | ||
455 | GNUNET_SCHEDULER_cancel (abort_task); | ||
456 | abort_task = | ||
457 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | ||
458 | (GNUNET_TIME_UNIT_SECONDS, 300), &do_abort, | ||
459 | NULL); | ||
460 | } | ||
453 | pdata->io_write_handle = | 461 | pdata->io_write_handle = |
454 | GNUNET_STREAM_write (pdata->socket, | 462 | GNUNET_STREAM_write (pdata->socket, |
455 | ((void *) data) + pdata->bytes_wrote, | 463 | ((void *) data) + pdata->bytes_wrote, |
@@ -936,7 +944,7 @@ int main (int argc, char **argv) | |||
936 | PRINTF ("\nTesting over 1 hop with payload size %hu\n", | 944 | PRINTF ("\nTesting over 1 hop with payload size %hu\n", |
937 | payload_size[payload_size_index]); | 945 | payload_size[payload_size_index]); |
938 | (void) memset (peer_data, 0, sizeof (peer_data)); | 946 | (void) memset (peer_data, 0, sizeof (peer_data)); |
939 | result = GNUNET_SYSERR; | 947 | result = INIT; |
940 | GNUNET_TESTBED_test_run (test_name, cfg_file, num_peers, event_mask, | 948 | GNUNET_TESTBED_test_run (test_name, cfg_file, num_peers, event_mask, |
941 | &controller_event_cb, NULL, &test_master, NULL); | 949 | &controller_event_cb, NULL, &test_master, NULL); |
942 | if (DOWNLINK_OK != result) | 950 | if (DOWNLINK_OK != result) |