Update benchmark code and script

Qihoo360 · Mar 14, 2017 · 16fc93c · 16fc93c
1 parent 36d2039
commit 16fc93c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/benchmark/throughput/evpp/client.cc b/benchmark/throughput/evpp/client.cc
@@ -112,10 +112,10 @@ class Client {
                 totalBytesRead += it->bytes_read();
                 totalMessagesRead += it->messages_read();
             }
-            LOG_WARN << "name=" << name_ << totalBytesRead << " total bytes read";
-            LOG_WARN << "name=" << name_ << totalMessagesRead << " total messages read";
-            LOG_WARN << "name=" << name_ << static_cast<double>(totalBytesRead) / static_cast<double>(totalMessagesRead) << " average message size";
-            LOG_WARN << "name=" << name_ << static_cast<double>(totalBytesRead) / (timeout_ * 1024 * 1024) << " MiB/s throughput";
+            LOG_WARN << "name=" << name_ << " " << totalBytesRead << " total bytes read";
+            LOG_WARN << "name=" << name_ << " " << totalMessagesRead << " total messages read";
+            LOG_WARN << "name=" << name_ << " " << static_cast<double>(totalBytesRead) / static_cast<double>(totalMessagesRead) << " average message size";
+            LOG_WARN << "name=" << name_ << " " << static_cast<double>(totalBytesRead) / (timeout_ * 1024 * 1024) << " MiB/s throughput";
             loop_->QueueInLoop(std::bind(&Client::Quit, this));
         }
     }
@@ -163,6 +163,7 @@ void Session::OnConnection(const evpp::TCPConnPtr& conn) {
 
 int main(int argc, char* argv[]) {
     google::InitGoogleLogging(argv[0]);
+    FLAGS_stderrthreshold = 0;
     if (argc != 7) {
         fprintf(stderr, "Usage: client <host_ip> <port> <threads> <blocksize> <sessions> <time_seconds>\n");
         return -1;

diff --git a/benchmark/throughput/evpp/client_fixed_size.cc b/benchmark/throughput/evpp/client_fixed_size.cc
@@ -121,10 +121,10 @@ class Client {
                 totalBytesRead += it->bytes_read();
                 totalMessagesRead += it->messages_read();
             }
-            LOG_WARN << "name=" << name_ << totalBytesRead << " total bytes read";
-            LOG_WARN << "name=" << name_ << totalMessagesRead << " total messages read";
-            LOG_WARN << "name=" << name_ << static_cast<double>(totalBytesRead) / static_cast<double>(totalMessagesRead) << " average message size";
-            LOG_WARN << "name=" << name_ << static_cast<double>(totalBytesRead) / (timeout_ * 1024 * 1024) << " MiB/s throughput";
+            LOG_WARN << "name=" << name_ << " " << totalBytesRead << " total bytes read";
+            LOG_WARN << "name=" << name_ << " " << totalMessagesRead << " total messages read";
+            LOG_WARN << "name=" << name_ << " " << static_cast<double>(totalBytesRead) / static_cast<double>(totalMessagesRead) << " average message size";
+            LOG_WARN << "name=" << name_ << " " << static_cast<double>(totalBytesRead) / (timeout_ * 1024 * 1024) << " MiB/s throughput";
             loop_->QueueInLoop(std::bind(&Client::Quit, this));
         }
     }
@@ -172,6 +172,7 @@ void Session::OnConnection(const evpp::TCPConnPtr& conn) {
 
 int main(int argc, char* argv[]) {
     google::InitGoogleLogging(argv[0]);
+    FLAGS_stderrthreshold = 0;
     if (argc != 7) {
         fprintf(stderr, "Usage: client <host_ip> <port> <threads> <blocksize> <sessions> <time_seconds>\n");
         return -1;

diff --git a/benchmark/throughput/evpp/single_thread.sh b/benchmark/throughput/evpp/single_thread.sh
@@ -3,11 +3,11 @@
 set -x
 
 killall benchmark_pingpong_server
-timeout=${timeout:-5}
+timeout=${timeout:-100}
 #bufsize=${bufsize:-16384}
 nothreads=1
 
-for bufsize in 1024 2048 4096 8192 16384 81920 409600 819200; do
+for bufsize in 1024 2048 4096 8192 16384 81920 409600; do
 for nosessions in 1 10 100 1000 10000; do
   echo "======================> Bufsize: $bufsize Threads: $nothreads Sessions: $nosessions"
   taskset -c 1 ./benchmark_pingpong_server 33333 $nothreads & srvpid=$!