diff options
| author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-08-04 17:10:05 +0200 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-08-04 17:24:40 +0200 |
| commit | 25c356b9ba9d91b4a291e3adad050d8ea85eb3e2 (patch) | |
| tree | e2fca06805ca406607402c7206ea14ae17611d82 /src/tools | |
| parent | 88fb2d900e12f65265207cc39b2d19b8a095d1b4 (diff) | |
| download | ouroboros-25c356b9ba9d91b4a291e3adad050d8ea85eb3e2.tar.gz ouroboros-25c356b9ba9d91b4a291e3adad050d8ea85eb3e2.zip | |
tools: cbr: Fix options
The server apn is a client-only option. Also fixes some indentation.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/cbr/cbr.c | 2 | ||||
| -rw-r--r-- | src/tools/cbr/cbr_server.c | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/tools/cbr/cbr.c b/src/tools/cbr/cbr.c index ab178ca3..0cce50db 100644 --- a/src/tools/cbr/cbr.c +++ b/src/tools/cbr/cbr.c @@ -46,13 +46,13 @@ static void usage(void) printf("Usage: cbr [OPTION]...\n" "Sends SDU's from client to server at a constant bit rate.\n\n" " -l, --listen Run in server mode\n" - " -n, --server_apn Specify the name of the server.\n" "\n" "Server options:\n" " -i, --interval Server report interval (s)\n" " -t, --timeout Server timeout interval (s)\n" "\n" "Client options:\n" + " -n, --server_apn Specify the name of the server.\n" " -d, --duration Duration for sending (s)\n" " -f, --flood Send SDU's as fast as possible\n" " -s, --size SDU size (B)\n" diff --git a/src/tools/cbr/cbr_server.c b/src/tools/cbr/cbr_server.c index 9c6ac7f1..1890c842 100644 --- a/src/tools/cbr/cbr_server.c +++ b/src/tools/cbr/cbr_server.c @@ -24,7 +24,7 @@ #include <stdbool.h> #ifdef __FreeBSD__ -#define __XSI_VISIBLE +#define __XSI_VISIBLE 500 #endif #include <signal.h> @@ -112,13 +112,13 @@ void handle_flow(int fd) printf("Flow %4d: %9ld SDUs (%12ld bytes) in %9ld ms" " => %9.4f p/s, %9.4f Mb/s\n", fd, - sdus-sdus_intv, - bytes_read-bytes_read_intv, + sdus - sdus_intv, + bytes_read - bytes_read_intv, us / 1000, - ((sdus-sdus_intv) / (float) us) * MILLION, - 8 * (bytes_read-bytes_read_intv) + ((sdus - sdus_intv) / (float) us) * MILLION, + 8 * (bytes_read - bytes_read_intv) / (float)(us)); - iv_start=iv_end; + iv_start = iv_end; sdus_intv = sdus; bytes_read_intv = bytes_read; ts_add(&iv_start, &intv, &iv_end); @@ -134,13 +134,13 @@ void * worker(void * o) pthread_mutex_lock(&fds_lock); pthread_cleanup_push((void(*)(void *)) pthread_mutex_unlock, (void *) &fds_lock); - while (fds[fds_index] == -1) { + while (fds[fds_index] == -1) pthread_cond_wait(&fds_signal, &fds_lock); - } cli_fd = fds[fds_index]; fds[fds_index] = -1; - pthread_cleanup_pop(1); + + pthread_cleanup_pop(true); handle_flow(cli_fd); |