Thread: [Assorted-commits] SF.net SVN: assorted:[1166] ydb/trunk/src

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1166
          http://assorted.svn.sourceforge.net/assorted/?rev=1166&view=rev
Author:   yangzhang
Date:     2009-02-06 00:32:30 +0000 (Fri, 06 Feb 2009)

Log Message:
-----------
- cleaned up the makefile a bit
- cleaned up and added some more info to the thread profiling
- added TxnBatch
- added serperf benchmark

Modified Paths:
--------------
    ydb/trunk/src/Makefile
    ydb/trunk/src/main.lzz.clamp
    ydb/trunk/src/ydb.proto

Added Paths:
-----------
    ydb/trunk/src/serperf.cc

Modified: ydb/trunk/src/Makefile
===================================================================

--- ydb/trunk/src/Makefile	2009-02-05 09:41:13 UTC (rev 1165)
+++ ydb/trunk/src/Makefile	2009-02-06 00:32:30 UTC (rev 1166)
@@ -25,28 +25,38 @@
 ifneq ($(GCOV),)
 	GCOV   := -fprofile-arcs -ftest-coverage
 endif
-LDFLAGS  := -pthread -lstx -lst -lresolv -lprotobuf -lgtest \
+ifneq ($(PPROF),)
+	PPROF  := -lprofiler
+endif
+ifneq ($(OPT),)
+	OPT    := -O3
+else
+	OPT    := -g3
+endif
+CXX      := $(WTF) $(CXX)
+LDFLAGS  := -pthread $(GPROF)
+LDLIBS   := -lstx -lst -lresolv -lprotobuf -lgtest \
             -lboost_program_options-gcc43-mt -lboost_thread-gcc43-mt \
-            -lboost_serialization-gcc43-mt $(GPROF)
+            -lboost_serialization-gcc43-mt $(PPROF)
 # The -Wno- warnings are for boost.
-CXXFLAGS := -g3 -pthread $(GPROF) -Wall -Werror -Wextra -Woverloaded-virtual \
+CXXFLAGS := $(OPT) -pthread $(GPROF) -Wall -Werror -Wextra -Woverloaded-virtual \
             -Wconversion -Wno-conversion -Wno-ignored-qualifiers \
             -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings \
             -Winit-self -Wsign-promo -Wno-unused-parameter -Wc++0x-compat \
             -Wparentheses -Wmissing-format-attribute -Wfloat-equal \
-            -Winline -Wsynth
-PBCXXFLAGS := -g3 -Wall -Werror $(GPROF)
+            -Winline -Wsynth $(CXXFLAGS)
+PBCXXFLAGS := $(OPT) -Wall -Werror $(GPROF)
 
 all: $(TARGET)
 
 $(TARGET): $(OBJS)
-	$(CXX) -o $@ $^ $(LDFLAGS)
+	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
 %.o: %.cc $(PBHDRS)
-	$(WTF) $(CXX) $(CXXFLAGS) -c -o $@ $<
+	$(COMPILE.cc) $(OUTPUT_OPTION) $<
 
 %.o: %.pb.cc %.pb.h
-	$(WTF) $(CXX) $(PBCXXFLAGS) -c -o $@ $<
+	$(CXX) -c $(PBCXXFLAGS) $(OUTPUT_OPTION) $<
 
 %.cc: %.lzz
 	lzz -hx hh -sx cc -hl -sl -hd -sd $<
@@ -72,3 +82,10 @@
 .PHONY: clean
 
 .SECONDARY: $(SRCS) $(HDRS) $(OBJS) main.lzz
+
+###
+
+serperf: serperf.o ydb.o
+	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
+
+# serperf.cc ydb.pb.h
\ No newline at end of file

Modified: ydb/trunk/src/main.lzz.clamp
===================================================================
--- ydb/trunk/src/main.lzz.clamp	2009-02-05 09:41:13 UTC (rev 1165)
+++ ydb/trunk/src/main.lzz.clamp	2009-02-06 00:32:30 UTC (rev 1166)
@@ -1125,7 +1125,6 @@
     } else if (sig == SIGUSR1) {
       toggle(do_pause);
     }
-    //break;
   }
 }
 
@@ -1291,24 +1290,29 @@
       my_spawn(memmon, "memmon");
     }
 
+    long long start = thread_start_time = current_time_millis();
     // At the end, print thread profiling information.
     finally f(lambda() {
       if (profile_threads) {
+        long long end = current_time_millis();
+        long long all = end - __ref(start);
         cout << "thread profiling results:" << endl;
-        long long total;
+        long long total = 0;
         typedef pair<st_thread_t, long long> entry;
         foreach (entry p, threadtimes) {
-          const string &name = threadname(p.first);
-          if (name != "main" && name != "handle_sig_sync")
-            total += p.second;
+          total += p.second;
         }
+        cout << "total " << total << " all " << all << endl;
         foreach (entry p, threadtimes) {
-          const string &name = threadname(p.first);
-          if (name != "main" && name != "handle_sig_sync")
-            cout << "- " << threadname(p.first) << ": " << p.second
-                 << " (" << (static_cast<double>(p.second) / total) << "%)"
-                 << endl;
+          cout << "- " << threadname(p.first) << ": " << p.second << " ms ("
+               << (static_cast<double>(p.second) / total) << "% of total, "
+               << (static_cast<double>(p.second) / all) << "% of all)" << endl;
         }
+        cout << "- total: " << total << " ms (" << double(total) / all
+             << "% of all)" << endl;
+        cout << "- unaccounted: " << all - total << " ms ("
+             << double(all - total) / all << "% of all)" << endl;
+        cout << "- all: " << all << " ms" << endl;
       }
     });
 

Added: ydb/trunk/src/serperf.cc
===================================================================
--- ydb/trunk/src/serperf.cc	                        (rev 0)
+++ ydb/trunk/src/serperf.cc	2009-02-06 00:32:30 UTC (rev 1166)
@@ -0,0 +1,80 @@
+#include <iostream>
+#include <sstream>
+#include <commons/time.h>
+#include "ydb.pb.h"
+#include <boost/archive/binary_oarchive.hpp>
+
+using namespace boost::archive;
+using namespace std;
+using namespace commons;
+
+int main(int argc, char **argv) {
+  const int count = atoi(argv[1]), batchsize = atoi(argv[2]);
+  
+  TxnBatch batch;
+  for (int i = 0; i < batchsize; ++i) {
+    Txn &txn = *batch.add_txn();
+    txn.set_seqno(i);
+    for (int j = 0; j < 5; j++) {
+      Op *op = txn.add_op();
+      op->set_key(j);
+      op->set_value(-j);
+      op->set_type(Op::read);
+    }
+  }
+
+  {
+    long long start = current_time_millis();
+    for (int i = 0; i < count; ++i) {
+      stringstream ss;
+      batch.SerializeToOstream(&ss);
+    }
+    long long time = current_time_millis() - start;
+    double tps = 100 * static_cast<double>(count * batchsize) / time;
+    cout << "protobuf: " << time << " ms, " << tps << " tps" << endl;
+  }
+
+  {
+    long long start = current_time_millis();
+    for (int i = 0; i < count; ++i) {
+      stringbuf sb;
+      binary_oarchive oa(sb);
+      for (int j = 0; j < batchsize; ++j) {
+        const Txn &txn = batch.txn(j);
+        int seqno = txn.seqno();
+        oa << seqno;
+        for (int k = 0; k < 5; ++k) {
+          const Op &op = txn.op(k);
+          int key = op.key(), value = op.value(), type = op.value();
+          oa << key << value << type;
+        }
+      }
+    }
+    long long time = current_time_millis() - start;
+    double tps = 100 * static_cast<double>(count * batchsize) / time;
+    cout << "boost: " << time << " ms, " << tps << " tps" << endl;
+  }
+
+  {
+    long long start = current_time_millis();
+    for (int i = 0; i < count; ++i) {
+      stringbuf sb;
+      for (int j = 0; j < batchsize; ++j) {
+        const Txn &txn = batch.txn(j);
+#define write(x) { typeof(x) __x = x; sb.sputn((char*)(&__x), sizeof __x); }
+        write(txn.seqno());
+        for (int k = 0; k < 5; ++k) {
+          const Op &op = txn.op(k);
+          write(op.key());
+          write(op.value());
+          write(op.type());
+        }
+      }
+    }
+    long long time = current_time_millis() - start;
+    double tps = 100 * static_cast<double>(count * batchsize) / time;
+    cout << "streambuf.sputn: " << time << " ms, " << tps << " tps" << endl;
+  }
+
+  return 0;
+}

Modified: ydb/trunk/src/ydb.proto
===================================================================
--- ydb/trunk/src/ydb.proto	2009-02-05 09:41:13 UTC (rev 1165)
+++ ydb/trunk/src/ydb.proto	2009-02-06 00:32:30 UTC (rev 1166)
@@ -75,3 +75,7 @@
 // into action.
 message Ready {
 }
+
+message TxnBatch {
+  repeated Txn txn = 1;
+}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Assorted-commits] SF.net SVN: assorted:[1166] ydb/trunk/src

assorted-commits