From d74d67a0e2d3de0ec208ed9b839815a70d84f727 Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Tue, 24 May 2016 20:38:01 +0200 Subject: tools, lib: cbr tool for bandwidth testing The tool sends constant bandwidth traffic between a client and a server. cbr --help for more info. Adds time_utils.h to the library containing useful functions for arithmetic with timespec and timeval structures. --- src/tools/cbr/cbr_client.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 src/tools/cbr/cbr_client.c (limited to 'src/tools/cbr/cbr_client.c') diff --git a/src/tools/cbr/cbr_client.c b/src/tools/cbr/cbr_client.c new file mode 100644 index 00000000..7b8e8b3f --- /dev/null +++ b/src/tools/cbr/cbr_client.c @@ -0,0 +1,97 @@ +/* + * Ouroboros - Copyright (C) 2016 + * + * A simple CBR generator + * + * Dimitri Staessens + * Sander Vrijders + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + +int client_main(int duration, int size, long rate) +{ + int fd = 0; + int result = 0; + bool stop = false; + char buf[size]; + long seqnr = 0; + long long gap = size * 8 * (BILLION / rate); /* ns */ + + struct timespec start; + struct timespec end; + struct timespec interval = {(gap / BILLION), gap % BILLION}; + int ms; + + if (ap_init(CLIENT_AP_NAME)) { + printf("Failed to init AP.\n"); + return -1; + } + + printf("Client started, duration %d, rate %lu b/s, size %d B.\n", + duration, rate, size); + + fd = flow_alloc(SERVER_AP_NAME, NULL, NULL); + if (fd < 0) { + printf("Failed to allocate flow.\n"); + ap_fini(); + return -1; + } + + result = flow_alloc_res(fd); + if (result < 0) { + printf("Flow allocation refused.\n"); + flow_dealloc(fd); + ap_fini(); + return -1; + } + + clock_gettime(CLOCK_REALTIME, &start); + while (!stop) { + memcpy(buf, &seqnr, sizeof(seqnr)); + + if (flow_write(fd, buf, size) == -1) { + printf("Failed to write SDU.\n"); + stop = true; + } + + nanosleep(&interval, NULL); + + seqnr++; + + clock_gettime(CLOCK_REALTIME, &end); + + if (duration != 0 + && ts_diff_us(&start, &end) / MILLION >= (long) duration) + stop = 1; + } + + clock_gettime(CLOCK_REALTIME, &end); + + ms = ts_diff_ms(&start, &end); + + printf("sent statistics: " + "%9ld SDUs, %12ld bytes in %9d ms, %4.4f Mb/s\n", + seqnr, seqnr * size, ms, (seqnr * size * 8.0)/(ms * 1000)); + + flow_dealloc(fd); + + ap_fini(); + + return 0; +} -- cgit v1.2.3 From e5f567c7647acefa295850f5ab6ccf2c10329c44 Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Tue, 24 May 2016 21:22:51 +0200 Subject: tools: fixes comments on d74d67a --- include/ouroboros/time_utils.h | 11 +++++++---- src/tools/cbr/cbr.c | 9 +++------ src/tools/cbr/cbr_client.c | 2 +- src/tools/cbr/cbr_server.c | 9 ++++++--- 4 files changed, 17 insertions(+), 14 deletions(-) (limited to 'src/tools/cbr/cbr_client.c') diff --git a/include/ouroboros/time_utils.h b/include/ouroboros/time_utils.h index d7274c1d..4b3f3463 100644 --- a/include/ouroboros/time_utils.h +++ b/include/ouroboros/time_utils.h @@ -23,14 +23,17 @@ #ifndef OUROBOROS_TIME_UTILS_H #define OUROBOROS_TIME_UTILS_H -#ifndef MILLION -#define MILLION 1000000L +#ifdef MILLION +#undef MILLION #endif -#ifndef BILLION -#define BILLION 1000000000L +#ifdef BILLION +#undef BILLION #endif +#define MILLION 1000000L +#define BILLION 1000000000L + #include #include /* LONG_MAX */ diff --git a/src/tools/cbr/cbr.c b/src/tools/cbr/cbr.c index 2317cd62..d7077e9c 100644 --- a/src/tools/cbr/cbr.c +++ b/src/tools/cbr/cbr.c @@ -31,10 +31,7 @@ #include #define SERVER_AP_NAME "cbr-server" -#define CLIENT_AP_NAME "echo-client" - -#define MILLION 1000000 -#define BILLION 1000000000 +#define CLIENT_AP_NAME "cbr-client" #define BUF_SIZE 1500 @@ -92,7 +89,7 @@ int main(int argc, char ** argv) duration = strtol(*(++argv), &rem, 10); --argc; } else if (strcmp(*argv, "-s") == 0 || - strcmp(*argv, "--size") == 0) { + strcmp(*argv, "--size") == 0) { size = strtol(*(++argv), &rem, 10); --argc; } else if (strcmp(*argv, "-r") == 0 || @@ -106,7 +103,7 @@ int main(int argc, char ** argv) rate *= BILLION; --argc; } else if (strcmp(*argv, "-l") == 0 || - strcmp(*argv, "--listen") == 0) { + strcmp(*argv, "--listen") == 0) { server = true; } else { usage(); diff --git a/src/tools/cbr/cbr_client.c b/src/tools/cbr/cbr_client.c index 7b8e8b3f..330cfa43 100644 --- a/src/tools/cbr/cbr_client.c +++ b/src/tools/cbr/cbr_client.c @@ -31,7 +31,7 @@ int client_main(int duration, int size, long rate) bool stop = false; char buf[size]; long seqnr = 0; - long long gap = size * 8 * (BILLION / rate); /* ns */ + unsigned long gap = size * 8 * (BILLION / rate); /* ns */ struct timespec start; struct timespec end; diff --git a/src/tools/cbr/cbr_server.c b/src/tools/cbr/cbr_server.c index 14791bd4..553f954d 100644 --- a/src/tools/cbr/cbr_server.c +++ b/src/tools/cbr/cbr_server.c @@ -116,12 +116,15 @@ int server_main() { int server_fd = 0; int client_fd = 0; - char * dif = DIF_NAME; + + char * dif = DIF_NAME; char * client_name = NULL; - int i = 0; + + int i = 0; + pthread_t * threads = malloc(sizeof(*threads) * 10); if (threads == NULL) - exit(1); + EXIT_FAILURE; printf("Server started, interval is %ld s, timeout is %ld s.\n", server_settings.interval, server_settings.timeout); -- cgit v1.2.3 From bfe91f5a07bf8ad0e0da0fd8079411b3a66e4a79 Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Wed, 25 May 2016 10:20:38 +0200 Subject: tools: cbr continues when a write fails the CBR tool would stop if the buffer is full. Now it will continue sending SDU's until the duration expires. --- src/tools/cbr/cbr_client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tools/cbr/cbr_client.c') diff --git a/src/tools/cbr/cbr_client.c b/src/tools/cbr/cbr_client.c index 330cfa43..78b95255 100644 --- a/src/tools/cbr/cbr_client.c +++ b/src/tools/cbr/cbr_client.c @@ -67,7 +67,7 @@ int client_main(int duration, int size, long rate) if (flow_write(fd, buf, size) == -1) { printf("Failed to write SDU.\n"); - stop = true; + continue; } nanosleep(&interval, NULL); @@ -78,7 +78,7 @@ int client_main(int duration, int size, long rate) if (duration != 0 && ts_diff_us(&start, &end) / MILLION >= (long) duration) - stop = 1; + stop = true; } clock_gettime(CLOCK_REALTIME, &end); -- cgit v1.2.3