Skip to content

Add interval bandwidth reporting option #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
limited wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add interval bandwidth reporting option #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
113a9f9
Add interval bandwidth reporting option
limited Oct 11, 2017
6de9cfc
Updates to PR comments
limited Dec 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ struct options {
char *urls[MAX_URLS];
size_t urls_l;
char *urls_loc;
double worker_report_interval;
};

int initialise_options(struct options *opt, int argc, char **argv);
Expand Down
40 changes: 34 additions & 6 deletions src/getter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,27 +44,37 @@ static size_t get_urls(struct worker *w, char **urls, char *urls_loc, int *total
return urls_c;
}

int get_once(struct worker *workers, char **urls_opt, size_t urls_l, char *urls_loc, int *requests)
int get_once(struct worker *workers, struct options* opt, int *requests)
{
struct worker *w;
ssize_t urls_l = opt->urls_l;
char *urls_loc = opt->urls_loc;
int cururl = 0, total_bytes = 0, urls_alloc = 0, reqs = 0, err = 0, bytes, nfds, retval, len, i;
char **urls = urls_opt;
char **urls = opt->urls;
fd_set rfds;
char buf[PIPE_BUF+1] = {}, outbuf[PIPE_BUF+1] = {};
struct timeval now_tv;
int dl_delta = 0;
double last_report = 0, now = 0, speed = 0, time_delta = 0;
unsigned int report_bytes_dl = 0;

for(w = workers; w; w = w->next) {
msg_write(w->pipe_w, "RESET", sizeof("RESET"));
msg_read(w->pipe_r, buf, sizeof(buf));
w->status = STATUS_READY;
}

if(urls_loc != NULL) {
if(opt->urls_loc != NULL) {
urls = malloc(MAX_URLS * sizeof(urls));
if((len = get_urls(workers, urls, urls_loc, &total_bytes)) < 0) return len;
urls_l = len;
urls_alloc = 1;
reqs++;
}

gettimeofday(&now_tv, NULL);
last_report = now_tv.tv_sec + now_tv.tv_usec / 1000000.0;

do {
FD_ZERO(&rfds);
nfds = -1;
Expand Down Expand Up @@ -96,10 +106,28 @@ int get_once(struct worker *workers, char **urls_opt, size_t urls_l, char *urls_
if(sscanf(buf, "OK %d bytes", &bytes) == 1) {
total_bytes += bytes;
reqs++;
w->status = STATUS_READY;
} else if(sscanf(buf, "ERR %d", &err) == 1) {
fprintf(stderr, "cURL error: %s for URL '%s'.\n", curl_easy_strerror(err), w->url);
}
w->status = STATUS_READY;
w->status = STATUS_READY;
} else if(sscanf(buf, "REP %d", &dl_delta) == 1) {
report_bytes_dl += dl_delta;
gettimeofday(&now_tv, NULL);
now = now_tv.tv_sec + now_tv.tv_usec / 1000000.0;
time_delta = now - last_report;
if(time_delta >= opt->worker_report_interval) {
speed = 8 * report_bytes_dl / time_delta; //Report on bits not bytes
fprintf(stdout, "Worker %u: %f bps (%u bytes over %f seconds) ending at %f\r\n",
w->pipe_w,
speed,
report_bytes_dl,
time_delta,
now);

report_bytes_dl = 0;
last_report = now;
}
}
}
}
} while(1);
Expand Down Expand Up @@ -173,7 +201,7 @@ int get_loop(struct options *opt)
gettimeofday(&start, NULL);
}
schedule_next(opt->interval, &start, &next);
bytes = get_once(workers, opt->urls, opt->urls_l, opt->urls_loc, &requests);
bytes = get_once(workers, opt, &requests);
gettimeofday(&end, NULL);
count++;
total_count++;
Expand Down
14 changes: 12 additions & 2 deletions src/options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ int initialise_options(struct options *opt, int argc, char **argv)
opt->urls_l = 0;
memset(&opt->urls, 0, MAX_URLS * sizeof(&opt->urls));
opt->urls_loc = NULL;
opt->worker_report_interval = 0;

if(parse_options(opt, argc, argv) < 0)
return -2;
Expand All @@ -51,20 +52,21 @@ void destroy_options(struct options *opt)

static void usage(const char *name)
{
fprintf(stderr, "Usage: %s [-46Dh] [-c <count>] [-d <dns_servers>] [-i <interval>] [-l <length>] [-n <workers>] [-o <output>] [-t <timeout>] [url_file]\n", name);
fprintf(stderr, "Usage: %s [-46Dh] [-c <count>] [-d <dns_servers>] [-i <interval>] [-l <length>] [-n <workers>] [-o <output>] [-t <timeout>] [-r <report_interval>] [url_file]\n", name);
}


int parse_options(struct options *opt, int argc, char **argv)
{
int o;
int val;
double val_f;
FILE *output, *urlfile;
char * line;
size_t len = 0;
ssize_t read;

while((o = getopt(argc, argv, "46Dhc:d:i:l:n:o:t:")) != -1) {
while((o = getopt(argc, argv, "46Dhc:d:i:l:n:o:t:r:")) != -1) {
switch(o) {
case '4':
opt->ai_family = AF_INET;
Expand Down Expand Up @@ -129,6 +131,14 @@ int parse_options(struct options *opt, int argc, char **argv)
opt->output = output;
}
break;
case 'r':
val_f = atof(optarg);
if (val_f < 0) {
fprintf(stderr, "Invalid worker report interval value: %f\n", val_f);
return -1;
}
opt->worker_report_interval = val_f;
break;
case 't':
val = atoi(optarg);
if(val < 0) {
Expand Down
46 changes: 46 additions & 0 deletions src/worker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ struct worker_data {
CURLcode res;
int pipe_r;
int pipe_w;
double worker_report_interval;
curl_off_t last_dlnow;
};


Expand All @@ -53,6 +55,24 @@ static size_t memory_callback(void *contents, size_t size, size_t nmemb, void *u
return realsize;
}

static int prog_report(void *wd, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow) {
struct worker_data *mywd = (struct worker_data *)wd;
char outbuf[PIPE_BUF+1] = {};
ssize_t len;
curl_off_t delta;

delta = dlnow - mywd->last_dlnow;
mywd->last_dlnow = dlnow;
len = sprintf(outbuf, "REP %"CURL_FORMAT_CURL_OFF_T, delta);
msg_write(mywd->pipe_w, outbuf, len);

return 0;
}

static int old_prog_report(void *wd, double dltotal, double dlnow, double ultotal, double ulnow) {
return prog_report(wd, (curl_off_t)dltotal, (curl_off_t)dlnow, (curl_off_t)ultotal, (curl_off_t)ulnow);
}

static int init_worker(struct worker_data *data)
{
int res;
Expand Down Expand Up @@ -103,6 +123,30 @@ static int init_worker(struct worker_data *data)
}


/* Enable periodic worker reporting if enabled on CLI */
if (data->worker_report_interval > 0) {
#if LIBCURL_VERSION_NUM >= 0x72000
if ((res = curl_easy_setopt(data->curl, CURLOPT_XFERINFOFUNCTION, prog_report)) != CURLE_OK) {
fprintf(stderr, "cURL option error: %s\n", curl_easy_strerror(res));
}
if ((res = curl_easy_setopt(data->curl, CURLOPT_XFERINFODATA, data)) != CURLE_OK) {
fprintf(stderr, "cURL option error: %s\n", curl_easy_strerror(res));
}
#else
if ((res = curl_easy_setopt(data->curl, CURLOPT_PROGRESSFUNCTION, old_prog_report)) != CURLE_OK) {
fprintf(stderr, "cURL option error: %s\n", curl_easy_strerror(res));
}
if ((res = curl_easy_setopt(data->curl, CURLOPT_PROGRESSDATA, data)) != CURLE_OK) {
fprintf(stderr, "cURL option error: %s\n", curl_easy_strerror(res));
}
#endif
if ((res = curl_easy_setopt(data->curl, CURLOPT_NOPROGRESS, 0L)) != CURLE_OK) {
fprintf(stderr, "cURL option error: %s\n", curl_easy_strerror(res));
}
data->last_dlnow = 0;
}


data->chunk.memory = NULL;
data->chunk.size = 0;
data->chunk.enabled = 0;
Expand Down Expand Up @@ -179,6 +223,7 @@ static int run_worker(struct worker_data *data)
data->chunk.enabled = 1;
} else if(strncmp(buf, "URL ", 4) == 0) {
p = buf + 4;
data->last_dlnow = (curl_off_t)0;
} else {
fprintf(stderr, "Unrecognised command '%s'!\n", buf);
break;
Expand Down Expand Up @@ -257,6 +302,7 @@ int start_worker(struct worker *w, struct options *opt)
wd.timeout = opt->timeout;
wd.dns_servers = opt->dns_servers;
wd.ai_family = opt->ai_family;
wd.worker_report_interval = opt->worker_report_interval;
close(fds_r[0]);
close(fds_w[1]);
sigaction(SIGINT, &sigign, NULL);
Expand Down