walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Adding new rate and connection allocation to threads

This commit is contained in:
Nora Shoemaker 2015-07-22 16:41:58 -07:00
parent 916e27489f
commit 65df3c63bf
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/h2load.cc
View File

@ -158,22 +158,23 @@ namespace {
// Called every second when rate mode is being used // Called every second when rate mode is being used
void second_timeout_w_cb(EV_P_ ev_timer *w, int revents) { void second_timeout_w_cb(EV_P_ ev_timer *w, int revents) {
//TODO //TODO
std::cout << "seconf_timeout_w_cb" << std::endl; //std::cout << "seconf_timeout_w_cb" << std::endl;
auto worker = static_cast<Worker *>(w->data); auto worker = static_cast<Worker *>(w->data);
auto nclients_per_second = worker->rate; auto nclients_per_second = worker->rate;
auto nclients = std::min(nclients_per_second, worker->nclients - worker->nconns_made); auto conns_remaining = worker->nclients - worker->nconns_made;
auto nclients = std::min(nclients_per_second, conns_remaining);
std::cout << "worker rate: " << worker->rate << std::endl; if (nclients_per_second > conns_remaining) {
std::cout << "nclients- nconns_made = " << worker->nclients - worker->nconns_made << std::endl; nclients += conns_remaining;
}
std::cout << "nclients: " << nclients << std::endl; std::cout << "worker: " << worker->id << " rate: " << worker->rate << std::endl;
//std::cout << "nclients- nconns_made = " << worker->nclients - worker->nconns_made << std::endl;
std::cout << "worker: " << worker->id << " nclients: " << nclients << std::endl;
for (ssize_t i = 0; i < nclients; ++i) { for (ssize_t i = 0; i < nclients; ++i) {
auto req_todo = worker->nreqs_per_client; auto req_todo = worker->config->max_concurrent_streams;
if (worker->nreqs_rem > 0) { std::cout << "worker: " << worker->id << " i: " << i << "req_todo: " << req_todo << std::endl;
++req_todo;
--worker->nreqs_rem;
}
std::cout << "i: " << i << "req_todo: " << req_todo << std::endl;
worker->clients.push_back(make_unique<Client>(worker, req_todo)); worker->clients.push_back(make_unique<Client>(worker, req_todo));
auto &client = worker->clients.back(); auto &client = worker->clients.back();
if (client->connect() != 0) { if (client->connect() != 0) {
@ -182,10 +183,11 @@ void second_timeout_w_cb(EV_P_ ev_timer *w, int revents) {
} }
++worker->nconns_made; ++worker->nconns_made;
} }
if (worker->current_second >= std::max((ssize_t)0, (worker->config->seconds - 1))) { //if (worker->current_second >= std::max((ssize_t)0, (worker->config->seconds))) {
std::cout << "worker->current_second: " << worker->current_second << std::endl; if (worker->nconns_made >= worker->nclients) {
std::cout << "worker->config->seconds: " << worker->config->seconds << std::endl; std::cout << "worker: " << worker->id << " worker->current_second: " << worker->current_second << std::endl;
std::cout << "ev_timer_stop" << std::endl; std::cout << "worker: " << worker->id << " worker->config->seconds: " << worker->config->seconds << std::endl;
//std::cout << "ev_timer_stop" << std::endl;
ev_timer_stop(worker->loop, w); ev_timer_stop(worker->loop, w);
} }
++worker->current_second; ++worker->current_second;
@ -1570,13 +1572,19 @@ int main(int argc, char **argv) {
size_t rate_per_thread = config.rate / config.nthreads; size_t rate_per_thread = config.rate / config.nthreads;
ssize_t rate_per_thread_rem = config.rate % config.nthreads; ssize_t rate_per_thread_rem = config.rate % config.nthreads;
auto nclients_extra = 0;
auto nclients_extra_per_thread = 0;
auto nclients_extra_rem_per_thread = 0;
// In rate mode, we want each Worker to create a total of // In rate mode, we want each Worker to create a total of
// C/t connections. // C/t connections.
if (config.is_rate_mode()) { if (config.is_rate_mode()) {
nclients_per_thread = config.nconns / (ssize_t)config.nthreads; nclients_extra = config.nconns - (config.seconds * config.rate);
nclients_rem = config.nconns % (ssize_t)config.nthreads; nclients_extra_per_thread = nclients_extra / (ssize_t)config.nthreads;
std::cout << "nclients_per_thread: " << nclients_per_thread << std::endl; nclients_extra_rem_per_thread = (ssize_t)nclients_extra % (ssize_t)config.nthreads;
std::cout << "nclients_rem :" << nclients_rem << std::endl;
std::cout << "nclients_extra: " << nclients_extra << std::endl;
std::cout << "nclients_extra_per_thread: " << nclients_extra_per_thread << std::endl;
std::cout << "nclients_extra_rem_per_thread: " << nclients_extra_rem_per_thread << std::endl;
std::cout << "SECONDS " << config.seconds << std::endl; std::cout << "SECONDS " << config.seconds << std::endl;
std::cout << "NREQS " << config.nreqs << std::endl; std::cout << "NREQS " << config.nreqs << std::endl;
std::cout << "N_TIME " << n_time << std::endl; std::cout << "N_TIME " << n_time << std::endl;
@ -1594,8 +1602,8 @@ int main(int argc, char **argv) {
std::vector<std::future<void>> futures; std::vector<std::future<void>> futures;
for (size_t i = 0; i < config.nthreads - 1; ++i) { for (size_t i = 0; i < config.nthreads - 1; ++i) {
auto nreqs = nreqs_per_thread + (nreqs_rem-- > 0); auto nreqs = nreqs_per_thread + (nreqs_rem-- > 0);
auto nclients = nclients_per_thread + (nclients_rem-- > 0);
auto rate = rate_per_thread + (rate_per_thread_rem-- > 0); auto rate = rate_per_thread + (rate_per_thread_rem-- > 0);
auto nclients = rate * config.seconds + nclients_extra_per_thread + (nclients_extra_rem_per_thread--);
std::cout << "spawning thread #" << i << ": " << nclients std::cout << "spawning thread #" << i << ": " << nclients
<< " concurrent clients, " << nreqs << " total requests" << " concurrent clients, " << nreqs << " total requests"
<< std::endl; << std::endl;

3
src/h2load.h
View File

@ -191,8 +191,9 @@ struct Worker {
ssize_t nreqs_per_client; ssize_t nreqs_per_client;
ssize_t nreqs_rem; ssize_t nreqs_rem;
ev_timer timeout_watcher; ev_timer timeout_watcher;
ssize_t rate;
Worker(uint32_t id, SSL_CTX *ssl_ctx, size_t nreq_todo, size_t nclients, Worker(uint32_t id, SSL_CTX *ssl_ctx, size_t nreq_todo, size_t nclients, ssize_t rate,
Config *config); Config *config);
~Worker(); ~Worker();
Worker(Worker &&o) = default; Worker(Worker &&o) = default;