Skip to content
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

Jump to bottom

Uniform request timing in each connection #100

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

Uniform request timing in each connection #100

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
828e46b
Uniform request timing in each connection
martin-beran Oct 13, 2020
2f7d8e7
Fixed handling of long option --uniform
martin-beran Oct 22, 2020
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
20 changes: 15 additions & 5 deletions src/wrk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ static struct config {
bool u_latency;
bool dynamic;
bool record_all_responses;
bool uniform;
char *host;
char *script;
SSL_CTX *ctx;
Expand Down Expand Up @@ -64,6 +65,7 @@ static void usage() {
" -B, --batch_latency Measure latency of whole \n"
" batches of pipelined ops \n"
" (as opposed to each op) \n"
" -u, --uniform Distribute requests uniformly in time\n"
" -v, --version Print version details \n"
" -R, --rate <T> work rate (throughput) \n"
" in requests/sec (total) \n"
Expand Down Expand Up @@ -267,6 +269,10 @@ void *thread_main(void *arg) {

connection *c = thread->cs;

uint64_t step = 5;
if (cfg.uniform) {
step = 1000 / thread->throughput;
}
for (uint64_t i = 0; i < thread->connections; i++, c++) {
c->thread = thread;
c->ssl = cfg.ctx ? SSL_new(cfg.ctx) : NULL;
Expand All @@ -276,12 +282,12 @@ void *thread_main(void *arg) {
c->catch_up_throughput = throughput * 2;
c->complete = 0;
c->caught_up = true;
// Stagger connects 5 msec apart within thread:
aeCreateTimeEvent(loop, i * 5, delayed_initial_connect, c, NULL);
// Stagger connects <step> msec apart within thread:
aeCreateTimeEvent(loop, i * step, delayed_initial_connect, c, NULL);
}

uint64_t calibrate_delay = CALIBRATE_DELAY_MS + (thread->connections * 5);
uint64_t timeout_delay = TIMEOUT_INTERVAL_MS + (thread->connections * 5);
uint64_t calibrate_delay = CALIBRATE_DELAY_MS + (thread->connections * step);
uint64_t timeout_delay = TIMEOUT_INTERVAL_MS + (thread->connections * step);

aeCreateTimeEvent(loop, calibrate_delay, calibrate, thread, NULL);
aeCreateTimeEvent(loop, timeout_delay, check_timeouts, thread, NULL);
Expand Down Expand Up @@ -704,6 +710,7 @@ static struct option longopts[] = {
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, 'v' },
{ "rate", required_argument, NULL, 'R' },
{ "uniform", no_argument, NULL, 'u' },
{ NULL, 0, NULL, 0 }
};

Expand All @@ -718,7 +725,7 @@ static int parse_args(struct config *cfg, char **url, struct http_parser_url *pa
cfg->rate = 0;
cfg->record_all_responses = true;

while ((c = getopt_long(argc, argv, "t:c:d:s:H:T:R:LUBrv?", longopts, NULL)) != -1) {
while ((c = getopt_long(argc, argv, "t:c:d:us:H:T:R:LUBrv?", longopts, NULL)) != -1) {
switch (c) {
case 't':
if (scan_metric(optarg, &cfg->threads)) return -1;
Expand All @@ -745,6 +752,9 @@ static int parse_args(struct config *cfg, char **url, struct http_parser_url *pa
cfg->latency = true;
cfg->u_latency = true;
break;
case 'u':
cfg->uniform = true;
break;
case 'T':
if (scan_time(optarg, &cfg->timeout)) return -1;
cfg->timeout *= 1000;
Expand Down