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

[EDGE-879] run clang-format and make sure style is good

This commit is contained in:
Nora Shoemaker 2015-07-15 09:51:33 -07:00
parent d6551de8d4
commit 5892385e5c
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/h2load.cc
View File

@ -1408,7 +1408,7 @@ int main(int argc, char **argv) {
if (config.max_concurrent_streams == -1) { if (config.max_concurrent_streams == -1) {
config.max_concurrent_streams = reqlines.size(); config.max_concurrent_streams = reqlines.size();
} }
// if not in rate mode and -C is set, warn that we are ignoring it // if not in rate mode and -C is set, warn that we are ignoring it
if (!config.is_rate_mode() && config.nconns != 0) { if (!config.is_rate_mode() && config.nconns != 0) {
std::cerr << "-C: warning: This option can only be used with -r, and" std::cerr << "-C: warning: This option can only be used with -r, and"
@ -1416,10 +1416,10 @@ int main(int argc, char **argv) {
} }
ssize_t n_time = 0; ssize_t n_time = 0;
ssize_t c_time = 0; ssize_t c_time = 0;
// only care about n_time and c_time in rate mode // only care about n_time and c_time in rate mode
if (config.is_rate_mode() && config.max_concurrent_streams != 0) { if (config.is_rate_mode() && config.max_concurrent_streams != 0) {
n_time = (int)config.nreqs / n_time = (int)config.nreqs /
((int)config.rate * (int)config.max_concurrent_streams); ((int)config.rate * (int)config.max_concurrent_streams);
c_time = (int)config.nconns / (int)config.rate; c_time = (int)config.nconns / (int)config.rate;
} }
@ -1429,20 +1429,17 @@ int main(int argc, char **argv) {
if ((int)config.nreqs < config.nconns) { if ((int)config.nreqs < config.nconns) {
std::cerr << "-C, -n: warning: two different test times are being set. " std::cerr << "-C, -n: warning: two different test times are being set. "
<< std::endl; << std::endl;
std::cerr << "The test will run for " std::cerr << "The test will run for " << c_time << " seconds."
<< c_time << std::endl;
<< " seconds." << std::endl; } else {
}
else {
std::cout << "-C, -n: warning: two different test times are being set. " std::cout << "-C, -n: warning: two different test times are being set. "
<< std::endl; << std::endl;
std::cout << "The smaller of the two will be chosen and the test will " std::cout << "The smaller of the two will be chosen and the test will "
<< "run for " << "run for " << std::min(n_time, c_time) << " seconds."
<< std::min(n_time, c_time) << std::endl;
<< " seconds." << std::endl;
} }
} }
Headers shared_nva; Headers shared_nva;
shared_nva.emplace_back(":scheme", config.scheme); shared_nva.emplace_back(":scheme", config.scheme);
if (config.port != config.default_port) { if (config.port != config.default_port) {
@ -1555,7 +1552,7 @@ int main(int argc, char **argv) {
fut.get(); fut.get();
} }
#endif // NOTHREADS #endif // NOTHREADS
} //! config.is_rate_mode() } //! config.is_rate_mode()
// if in rate mode, create a new worker each second // if in rate mode, create a new worker each second
else { else {
// set various config values // set various config values