diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-08-30 15:44:59 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-08-30 15:44:59 +0000 |
commit | e3c6e0bb694eac5c40941bc959cd8beecfe8cde9 (patch) | |
tree | 1931f9f09980046946a0cfd8fb9e8c9fd46bc2fe /src/transport/test_transport_api_reliability.c | |
parent | ba8a1ce1e673694a7bafb15d1fe70417bcf41a06 (diff) | |
download | gnunet-e3c6e0bb694eac5c40941bc959cd8beecfe8cde9.tar.gz gnunet-e3c6e0bb694eac5c40941bc959cd8beecfe8cde9.zip |
general intendation
some progress entertainment in transport/test_transport_api_disconnect.c
Diffstat (limited to 'src/transport/test_transport_api_reliability.c')
-rw-r--r-- | src/transport/test_transport_api_reliability.c | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c index 4cacf9c11..8f48008a6 100644 --- a/src/transport/test_transport_api_reliability.c +++ b/src/transport/test_transport_api_reliability.c | |||
@@ -118,9 +118,10 @@ end () | |||
118 | delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value; | 118 | delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value; |
119 | fprintf (stderr, "\nThroughput was %llu kb/s\n", | 119 | fprintf (stderr, "\nThroughput was %llu kb/s\n", |
120 | total_bytes * 1000 / 1024 / delta); | 120 | total_bytes * 1000 / 1024 / delta); |
121 | GNUNET_asprintf(&value_name, "reliable_%s", test_name); | 121 | GNUNET_asprintf (&value_name, "reliable_%s", test_name); |
122 | GAUGER ("TRANSPORT", value_name, (int)(total_bytes * 1000 / 1024 /delta), "kb/s"); | 122 | GAUGER ("TRANSPORT", value_name, (int) (total_bytes * 1000 / 1024 / delta), |
123 | GNUNET_free(value_name); | 123 | "kb/s"); |
124 | GNUNET_free (value_name); | ||
124 | 125 | ||
125 | if (die_task != GNUNET_SCHEDULER_NO_TASK) | 126 | if (die_task != GNUNET_SCHEDULER_NO_TASK) |
126 | GNUNET_SCHEDULER_cancel (die_task); | 127 | GNUNET_SCHEDULER_cancel (die_task); |
@@ -395,7 +396,8 @@ check () | |||
395 | #endif | 396 | #endif |
396 | ok = 1; | 397 | ok = 1; |
397 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, | 398 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, |
398 | "test-transport-api-reliability", "nohelp", options, &run, &ok); | 399 | "test-transport-api-reliability", "nohelp", options, &run, |
400 | &ok); | ||
399 | 401 | ||
400 | return ok; | 402 | return ok; |
401 | } | 403 | } |
@@ -418,7 +420,7 @@ main (int argc, char *argv[]) | |||
418 | char *backup = pch; | 420 | char *backup = pch; |
419 | char *filename = NULL; | 421 | char *filename = NULL; |
420 | char *dotexe; | 422 | char *dotexe; |
421 | char *src_name = strdup (__FILE__); | 423 | char *src_name = strdup (__FILE__); |
422 | char *split = NULL; | 424 | char *split = NULL; |
423 | 425 | ||
424 | /* get executable filename */ | 426 | /* get executable filename */ |
@@ -442,7 +444,7 @@ main (int argc, char *argv[]) | |||
442 | if (split != NULL) | 444 | if (split != NULL) |
443 | { | 445 | { |
444 | split[0] = '\0'; | 446 | split[0] = '\0'; |
445 | test_name = strdup(&filename[strlen(src_name)+1]); | 447 | test_name = strdup (&filename[strlen (src_name) + 1]); |
446 | } | 448 | } |
447 | else | 449 | else |
448 | test_name = NULL; | 450 | test_name = NULL; |
@@ -450,23 +452,20 @@ main (int argc, char *argv[]) | |||
450 | GNUNET_free (src_name); | 452 | GNUNET_free (src_name); |
451 | GNUNET_free (backup); | 453 | GNUNET_free (backup); |
452 | 454 | ||
453 | if ((strstr (argv[0], "tcp_nat") != NULL) || (strstr (argv[0], "udp_nat") != NULL)) | 455 | if ((strstr (argv[0], "tcp_nat") != NULL) || |
456 | (strstr (argv[0], "udp_nat") != NULL)) | ||
454 | { | 457 | { |
455 | nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server"); | 458 | nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server"); |
456 | if (GNUNET_NO == nat_res) | 459 | if (GNUNET_NO == nat_res) |
457 | { | 460 | { |
458 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 461 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", |
459 | "Cannot run NAT test: `%s' %s \n", | 462 | "gnunet-nat-server", "SUID not set"); |
460 | "gnunet-nat-server", | ||
461 | "SUID not set"); | ||
462 | return 0; | 463 | return 0; |
463 | } | 464 | } |
464 | if (GNUNET_SYSERR == nat_res) | 465 | if (GNUNET_SYSERR == nat_res) |
465 | { | 466 | { |
466 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 467 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", |
467 | "Cannot run NAT test: `%s' %s \n", | 468 | "gnunet-nat-server", "file not found"); |
468 | "gnunet-nat-server", | ||
469 | "file not found"); | ||
470 | return 0; | 469 | return 0; |
471 | } | 470 | } |
472 | } | 471 | } |