diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-08-30 14:23:35 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-08-30 14:23:35 +0000 |
commit | 2f1d1fdc938034736d3e706068cd3dff75e5e1cf (patch) | |
tree | fc5c3804f14875f2408675b8b083feb895596e59 | |
parent | c526fb6819ff203838e5fa2b5905b5d9f6309380 (diff) | |
download | gnunet-2f1d1fdc938034736d3e706068cd3dff75e5e1cf.tar.gz gnunet-2f1d1fdc938034736d3e706068cd3dff75e5e1cf.zip |
reenabling gauger support with automatic testname detection
-rw-r--r-- | src/transport/test_transport_api_reliability.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c index 617092676..debda3c9c 100644 --- a/src/transport/test_transport_api_reliability.c +++ b/src/transport/test_transport_api_reliability.c | |||
@@ -82,6 +82,8 @@ struct TestMessage | |||
82 | uint32_t num; | 82 | uint32_t num; |
83 | }; | 83 | }; |
84 | 84 | ||
85 | static char *test_name; | ||
86 | |||
85 | static int msg_scheduled; | 87 | static int msg_scheduled; |
86 | static int msg_sent; | 88 | static int msg_sent; |
87 | static int msg_recv_expected; | 89 | static int msg_recv_expected; |
@@ -109,16 +111,16 @@ end () | |||
109 | { | 111 | { |
110 | unsigned long long delta; | 112 | unsigned long long delta; |
111 | 113 | ||
112 | //char *value_name; | 114 | char *value_name; |
113 | 115 | ||
114 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n"); | 116 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n"); |
115 | 117 | ||
116 | delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value; | 118 | delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value; |
117 | fprintf (stderr, "\nThroughput was %llu kb/s\n", | 119 | fprintf (stderr, "\nThroughput was %llu kb/s\n", |
118 | total_bytes * 1000 / 1024 / delta); | 120 | total_bytes * 1000 / 1024 / delta); |
119 | //GNUNET_asprintf(&value_name, "reliable_%s", test_name); | 121 | GNUNET_asprintf(&value_name, "reliable_%s", test_name); |
120 | //GAUGER ("TRANSPORT", value_name, (int)(total_bytes * 1000 / 1024 /delta), "kb/s"); | 122 | GAUGER ("TRANSPORT", value_name, (int)(total_bytes * 1000 / 1024 /delta), "kb/s"); |
121 | //GNUNET_free(value_name); | 123 | GNUNET_free(value_name); |
122 | 124 | ||
123 | if (die_task != GNUNET_SCHEDULER_NO_TASK) | 125 | if (die_task != GNUNET_SCHEDULER_NO_TASK) |
124 | GNUNET_SCHEDULER_cancel (die_task); | 126 | GNUNET_SCHEDULER_cancel (die_task); |
@@ -416,6 +418,8 @@ main (int argc, char *argv[]) | |||
416 | char *backup = pch; | 418 | char *backup = pch; |
417 | char *filename = NULL; | 419 | char *filename = NULL; |
418 | char *dotexe; | 420 | char *dotexe; |
421 | char *src_name = strdup (__FILE__); | ||
422 | char *split = NULL; | ||
419 | 423 | ||
420 | /* get executable filename */ | 424 | /* get executable filename */ |
421 | pch = strtok (pch, "/"); | 425 | pch = strtok (pch, "/"); |
@@ -433,6 +437,17 @@ main (int argc, char *argv[]) | |||
433 | /* create cfg filename */ | 437 | /* create cfg filename */ |
434 | GNUNET_asprintf (&cfg_file_p1, "%s_peer1.conf", filename); | 438 | GNUNET_asprintf (&cfg_file_p1, "%s_peer1.conf", filename); |
435 | GNUNET_asprintf (&cfg_file_p2, "%s_peer2.conf", filename); | 439 | GNUNET_asprintf (&cfg_file_p2, "%s_peer2.conf", filename); |
440 | |||
441 | split = strstr (src_name, "."); | ||
442 | if (split != NULL) | ||
443 | { | ||
444 | split[0] = '\0'; | ||
445 | test_name = strdup(&filename[strlen(src_name)+1]); | ||
446 | } | ||
447 | else | ||
448 | test_name = NULL; | ||
449 | |||
450 | GNUNET_free (src_name); | ||
436 | GNUNET_free (backup); | 451 | GNUNET_free (backup); |
437 | 452 | ||
438 | if ((strstr (argv[0], "tcp_nat") != NULL) || (strstr (argv[0], "udp_nat") != NULL)) | 453 | if ((strstr (argv[0], "tcp_nat") != NULL) || (strstr (argv[0], "udp_nat") != NULL)) |
@@ -459,6 +474,7 @@ main (int argc, char *argv[]) | |||
459 | 474 | ||
460 | GNUNET_free (cfg_file_p1); | 475 | GNUNET_free (cfg_file_p1); |
461 | GNUNET_free (cfg_file_p2); | 476 | GNUNET_free (cfg_file_p2); |
477 | GNUNET_free_non_null (test_name); | ||
462 | 478 | ||
463 | return ret; | 479 | return ret; |
464 | } | 480 | } |