From: Nathan S. Evans Date: Wed, 23 Feb 2011 10:52:16 +0000 (+0000) Subject: gauger changes, thanks bart (: X-Git-Tag: initial-import-from-subversion-38251~19073 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=04518c0f2565baa715018b9546afa1858369d20e;p=oweals%2Fgnunet.git gauger changes, thanks bart (: --- diff --git a/src/include/gauger.h b/src/include/gauger.h index b636614b7..ae3c58ac8 100644 --- a/src/include/gauger.h +++ b/src/include/gauger.h @@ -1,18 +1,12 @@ #ifndef __GAUGER_H__ #define __GAUGER_H__ -#ifndef WINDOWS - #include #include #include -#define GAUGER(counter, value) {char __gauger_s[64];pid_t __gauger_p;if(!(__gauger_p=fork())){if(!fork()){sprintf(__gauger_s,"%llu", (unsigned long long) value);execlp("gauger-cli.py","gauger-cli.py",counter, __gauger_s,(char*)NULL);_exit(1);}else{_exit(0);}}else{waitpid(__gauger_p,NULL,0);}} - -#else +#define GAUGER(counter, value, unit) {char* __gauger_v[8];char __gauger_s[32];pid_t __gauger_p; if(!(__gauger_p=fork())){if(!fork()){sprintf(__gauger_s,"%llu", (unsigned long long) (value));__gauger_v[0] = "gauger-cli.py";__gauger_v[1] = "-n";__gauger_v[2] = counter;__gauger_v[3] = "-d";__gauger_v[4] = __gauger_s;__gauger_v[5] = "-u";__gauger_v[6] = unit;__gauger_v[7] = (char *)NULL;execvp("gauger-cli.py",__gauger_v);perror("gauger");_exit(1);}else{_exit(0);}}else{waitpid(__gauger_p,NULL,0);}} -#define GAUGER(counter, value) {} - -#endif +#define GAUGER_ID(counter, value, unit, id) {char* __gauger_v[10];char __gauger_s[32];pid_t __gauger_p; if(!(__gauger_p=fork())){if(!fork()){sprintf(__gauger_s,"%llu", (unsigned long long) (value));__gauger_v[0] = "gauger-cli.py";__gauger_v[1] = "-n";__gauger_v[2] = counter;__gauger_v[3] = "-d";__gauger_v[4] = __gauger_s;__gauger_v[5] = "-u";__gauger_v[6] = unit;__gauger_v[7] = "-i";__gauger_v[8] = id;__gauger_v[9] = (char *)NULL;execvp("gauger-cli.py",__gauger_v);perror("gauger");_exit(1);}else{_exit(0);}}else{waitpid(__gauger_p,NULL,0);}} #endif diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c index 20a9b1f15..219971725 100644 --- a/src/transport/test_quota_compliance.c +++ b/src/transport/test_quota_compliance.c @@ -669,7 +669,7 @@ exchange_hello (void *cls, GNUNET_assert (GNUNET_OK == GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) message, &me->id)); - GNUNET_TRANSPORT_offer_hello (p2.th, message); + GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL); GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2); } diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c index 60cb7866f..d78e3264b 100644 --- a/src/transport/test_transport_api.c +++ b/src/transport/test_transport_api.c @@ -351,7 +351,7 @@ exchange_hello (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received HELLO size %d\n", GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message)); - GNUNET_TRANSPORT_offer_hello (p2.th, message); + GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL); GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2); } diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c index 472c30d0d..a5929ff48 100644 --- a/src/transport/test_transport_api_reliability.c +++ b/src/transport/test_transport_api_reliability.c @@ -133,8 +133,8 @@ end () fprintf (stderr, "\nThroughput was %llu kb/s\n", total_bytes * 1000 / 1024 / delta); - GNUNET_asprintf(&value_name, "reliable-%s_kb/s", test_name); - GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta)); + GNUNET_asprintf(&value_name, "reliable_%s", test_name); + GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta), "kbs"); GNUNET_free(value_name); ok = 0; @@ -527,7 +527,7 @@ exchange_hello (void *cls, "Received HELLO size %d\n", GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message)); #endif - GNUNET_TRANSPORT_offer_hello (p2.th, message); + GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL); GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2); } diff --git a/src/transport/test_transport_api_unreliability.c b/src/transport/test_transport_api_unreliability.c index 26d4cb035..62c9a5683 100644 --- a/src/transport/test_transport_api_unreliability.c +++ b/src/transport/test_transport_api_unreliability.c @@ -186,8 +186,8 @@ end () "Transports disconnected, returning success!\n"); #endif delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value; - GNUNET_asprintf(&value_name, "unreliable-%s_kb/s", test_name); - GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta)); + GNUNET_asprintf(&value_name, "unreliable_%s", test_name); + GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta), "kbs"); GNUNET_free(value_name); fprintf (stderr, "\nThroughput was %llu kb/s\n", @@ -227,11 +227,11 @@ end_unreliably () fprintf (stderr, "\nThroughput was %llu kb/s\n", total_bytes * 1000 / 1024 / delta); - GNUNET_asprintf(&value_name, "unreliable-%s_kb/s", test_name); - GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta)); + GNUNET_asprintf(&value_name, "unreliable_%s", test_name); + GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta), "kbs"); GNUNET_free(value_name); - GNUNET_asprintf(&value_name, "unreliable-%s_failed messages", test_name); - GAUGER (value_name, (int)num_failed); + GNUNET_asprintf(&value_name, "unreliable_failed_%s", test_name); + GAUGER (value_name, (int)num_failed, "count"); GNUNET_free(value_name); GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Had %d failed messages!\n", num_failed); ok = 0; @@ -624,7 +624,7 @@ exchange_hello (void *cls, "Received HELLO size %d\n", GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message)); #endif - GNUNET_TRANSPORT_offer_hello (p2.th, message); + GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL); GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2); }