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.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 src/tools/cbr/cbr.c (limited to 'src/tools/cbr/cbr.c') diff --git a/src/tools/cbr/cbr.c b/src/tools/cbr/cbr.c new file mode 100644 index 00000000..2317cd62 --- /dev/null +++ b/src/tools/cbr/cbr.c @@ -0,0 +1,124 @@ +/* + * Ouroboros - Copyright (C) 2016 + * + * CBR traffic 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. + */ + +#define _POSIX_C_SOURCE 199506L + +#include +#include +#include +#include +#include +#include + +#define SERVER_AP_NAME "cbr-server" +#define CLIENT_AP_NAME "echo-client" + +#define MILLION 1000000 +#define BILLION 1000000000 + +#define BUF_SIZE 1500 + +#include "cbr_client.c" + +struct s { + long interval; + long timeout; +} server_settings; + +#include "cbr_server.c" + +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 options:\n" + " -i, --interval Server report interval (s)\n" + " -t, --timeout Server timeout interval (s)\n" + "\n" + "Client options:\n" + " -d --duration Duration for sending (s)\n" + " -s, --size SDU size (B)\n" + " -r, --rate Rate (b/s)\n" + "\n\n" + " --help Display this help text and exit\n"); +} + +int main(int argc, char ** argv) +{ + int duration = 60; /* One minute test */ + int size = 1000; /* 1000 byte SDU's */ + long rate = 1000000; /* 1 Mb/s */ + char * rem; + + bool server = false; + server_settings.interval = 1; /* One second reporting interval */ + server_settings.timeout = 1; + + argc--; + argv++; + while (argc > 0) { + if (strcmp(*argv, "-i") == 0 || + strcmp(*argv, "--interval") == 0) { + server_settings.interval = strtol(*(++argv), &rem, 10); + --argc; + } else if (strcmp(*argv, "-t") == 0 || + strcmp(*argv, "--timeout") == 0) { + server_settings.timeout = strtol(*(++argv), &rem, 10); + --argc; + } else if (strcmp(*argv, "-d") == 0 || + strcmp(*argv, "--duration") == 0) { + duration = strtol(*(++argv), &rem, 10); + --argc; + } else if (strcmp(*argv, "-s") == 0 || + strcmp(*argv, "--size") == 0) { + size = strtol(*(++argv), &rem, 10); + --argc; + } else if (strcmp(*argv, "-r") == 0 || + strcmp(*argv, "--rate") == 0) { + rate = strtol(*(++argv), &rem, 10); + if (*rem == 'k') + rate *= 1000; + if (*rem == 'M') + rate *= MILLION; + if (*rem == 'G') + rate *= BILLION; + --argc; + } else if (strcmp(*argv, "-l") == 0 || + strcmp(*argv, "--listen") == 0) { + server = true; + } else { + usage(); + return 0; + } + argc--; + argv++; + } + + if (server) { + return server_main(); + } + + return client_main(duration, size, rate); +} -- 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.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