From e3c6e0bb694eac5c40941bc959cd8beecfe8cde9 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Tue, 30 Aug 2011 15:44:59 +0000 Subject: general intendation some progress entertainment in transport/test_transport_api_disconnect.c --- src/transport/test_transport_api_unreliability.c | 41 +++++++++++------------- 1 file changed, 19 insertions(+), 22 deletions(-) (limited to 'src/transport/test_transport_api_unreliability.c') diff --git a/src/transport/test_transport_api_unreliability.c b/src/transport/test_transport_api_unreliability.c index 74afc9c90..6a86617a9 100644 --- a/src/transport/test_transport_api_unreliability.c +++ b/src/transport/test_transport_api_unreliability.c @@ -123,9 +123,10 @@ end () delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value; fprintf (stderr, "\nThroughput was %llu kb/s\n", total_bytes * 1000 / 1024 / delta); - GNUNET_asprintf(&value_name, "unreliable_%s", test_name); - GAUGER ("TRANSPORT", value_name, (int)(total_bytes * 1000 / 1024 /delta), "kb/s"); - GNUNET_free(value_name); + GNUNET_asprintf (&value_name, "unreliable_%s", test_name); + GAUGER ("TRANSPORT", value_name, (int) (total_bytes * 1000 / 1024 / delta), + "kb/s"); + GNUNET_free (value_name); if (die_task != GNUNET_SCHEDULER_NO_TASK) GNUNET_SCHEDULER_cancel (die_task); @@ -140,6 +141,7 @@ end () ok = 0; int i; + for (i = 0; i < TOTAL_MSGS; i++) { if (get_bit (bitmap, i) == 0) @@ -342,9 +344,8 @@ notify_ready (void *cls, size_t size, void *buf) while (size - ret >= s); if (n < TOTAL_MSGS) { - th = - GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, s, 0, TIMEOUT, - ¬ify_ready, NULL); + th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, s, 0, TIMEOUT, + ¬ify_ready, NULL); msg_scheduled = n; } else @@ -353,9 +354,7 @@ notify_ready (void *cls, size_t size, void *buf) "All messages scheduled to be sent!!\n"); if (GNUNET_SCHEDULER_NO_TASK != die_task) GNUNET_SCHEDULER_cancel (die_task); - die_task = - GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, - NULL); + die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); } if (n % 5000 == 0) { @@ -460,7 +459,8 @@ check () ok = GNUNET_SYSERR; GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, - "test-transport-api-unreliability", "nohelp", options, &run, &ok); + "test-transport-api-unreliability", "nohelp", options, + &run, &ok); return ok; } @@ -483,7 +483,7 @@ main (int argc, char *argv[]) char *backup = pch; char *filename = NULL; char *dotexe; - char *src_name = strdup (__FILE__); + char *src_name = strdup (__FILE__); char *split = NULL; /* get executable filename */ @@ -507,7 +507,7 @@ main (int argc, char *argv[]) if (split != NULL) { split[0] = '\0'; - test_name = strdup(&filename[strlen(src_name)+1]); + test_name = strdup (&filename[strlen (src_name) + 1]); } else test_name = NULL; @@ -515,23 +515,20 @@ main (int argc, char *argv[]) GNUNET_free (src_name); GNUNET_free (backup); - if ((strstr (argv[0], "tcp_nat") != NULL) || (strstr (argv[0], "udp_nat") != NULL)) + if ((strstr (argv[0], "tcp_nat") != NULL) || + (strstr (argv[0], "udp_nat") != NULL)) { nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server"); if (GNUNET_NO == nat_res) { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "Cannot run NAT test: `%s' %s \n", - "gnunet-nat-server", - "SUID not set"); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", + "gnunet-nat-server", "SUID not set"); return 0; } - if (GNUNET_SYSERR == nat_res) + if (GNUNET_SYSERR == nat_res) { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "Cannot run NAT test: `%s' %s \n", - "gnunet-nat-server", - "file not found"); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", + "gnunet-nat-server", "file not found"); return 0; } } -- cgit v1.2.3