From 797bd11247fb0d5774b3fd6d9d562eaa5f8b14ae Mon Sep 17 00:00:00 2001
From: Joshua Haberman <joshua@reverberate.org>
Date: Tue, 7 Jul 2009 23:48:37 -0700
Subject: Made benchmark test proto2 also.

---
 benchmark.c  | 53 --------------------------------------------
 benchmark.cc | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 53 deletions(-)
 delete mode 100644 benchmark.c
 create mode 100644 benchmark.cc

diff --git a/benchmark.c b/benchmark.c
deleted file mode 100644
index aede9d3..0000000
--- a/benchmark.c
+++ /dev/null
@@ -1,53 +0,0 @@
-
-#include "test_util.h"
-#include "upb_context.h"
-#include "upb_msg.h"
-
-int main ()
-{
-  struct upb_context c;
-  upb_context_init(&c);
-  struct upb_string fds;
-  if(!upb_strreadfile("google_messages.proto.bin", &fds)) {
-    fprintf(stderr, "Couldn't read google_speed.proto.bin.\n");
-    return 1;
-  }
-  if(!upb_context_parsefds(&c, &fds)) {
-    fprintf(stderr, "Error parsing or resolving proto.\n");
-    return 1;
-  }
-  upb_strfree(fds);
-  struct upb_string proto_name = UPB_STRLIT("benchmarks.SpeedMessage2");
-  struct upb_symtab_entry *e = upb_context_lookup(&c, &proto_name);
-  if(!e || e->type != UPB_SYM_MESSAGE) {
-    fprintf(stderr, "Error finding symbol '" UPB_STRFMT "'.\n",
-            UPB_STRARG(proto_name));
-    return 1;
-  }
-
-  struct upb_msg *m = e->ref.msg;
-  struct upb_msg_parse_state s;
-  void *data = upb_msgdata_new(m);
-  upb_msg_parse_init(&s, data, m, false, true);
-  size_t read;
-  struct upb_string str;
-  if(!upb_strreadfile("google_message2.dat", &str)) {
-    fprintf(stderr, "Error reading google_message2.dat\n");
-    return 1;
-  }
-  size_t total = 0;
-  for(int i = 0; i < 1000; i++) {
-    upb_msg_parse_reset(&s, data, m, false, true);
-    upb_status_t status = upb_msg_parse(&s, str.ptr, str.byte_len, &read);
-    if(status != UPB_STATUS_OK && read != str.byte_len) {
-      fprintf(stderr, "Error. :(  error=%d, read=%d\n", status, read);
-      return 1;
-    }
-    total += str.byte_len;
-  }
-  fprintf(stderr, "Parsed %sB\n", eng(total, 3, false));
-  upb_msg_parse_free(&s);
-  upb_msgdata_free(data, m, true);
-  upb_context_free(&c);
-  upb_strfree(str);
-}
diff --git a/benchmark.cc b/benchmark.cc
new file mode 100644
index 0000000..05184bc
--- /dev/null
+++ b/benchmark.cc
@@ -0,0 +1,72 @@
+
+#include <time.h>
+#include "google_speed.pb.h"
+#include "test_util.h"
+#include "upb_context.h"
+#include "upb_msg.h"
+
+int main ()
+{
+  struct upb_context c;
+  upb_context_init(&c);
+  struct upb_string fds;
+  if(!upb_strreadfile("google_messages.proto.bin", &fds)) {
+    fprintf(stderr, "Couldn't read google_speed.proto.bin.\n");
+    return 1;
+  }
+  if(!upb_context_parsefds(&c, &fds)) {
+    fprintf(stderr, "Error parsing or resolving proto.\n");
+    return 1;
+  }
+  upb_strfree(fds);
+  char class_name[] = "benchmarks.SpeedMessage2";
+  struct upb_string proto_name;
+  proto_name.ptr = class_name;
+  proto_name.byte_len = sizeof(class_name)-1;
+  struct upb_symtab_entry *e = upb_context_lookup(&c, &proto_name);
+  if(!e || e->type != UPB_SYM_MESSAGE) {
+    fprintf(stderr, "Error finding symbol '" UPB_STRFMT "'.\n",
+            UPB_STRARG(proto_name));
+    return 1;
+  }
+
+  struct upb_msg *m = e->ref.msg;
+  struct upb_msg_parse_state s;
+  void *data = upb_msgdata_new(m);
+  upb_msg_parse_init(&s, data, m, false, true);
+  size_t read;
+  struct upb_string str;
+  if(!upb_strreadfile("google_message2.dat", &str)) {
+    fprintf(stderr, "Error reading google_message2.dat\n");
+    return 1;
+  }
+  size_t total = 0;
+  clock_t before = clock();
+  for(int i = 0; i < 2000; i++) {
+    upb_msg_parse_reset(&s, data, m, false, true);
+    upb_status_t status = upb_msg_parse(&s, str.ptr, str.byte_len, &read);
+    if(status != UPB_STATUS_OK && read != str.byte_len) {
+      fprintf(stderr, "Error. :(  error=%d, read=%lu\n", status, read);
+      return 1;
+    }
+    total += str.byte_len;
+  }
+  double elapsed = ((double)clock() - before) / CLOCKS_PER_SEC;
+  fprintf(stderr, "Parsed %sB, ", eng(total, 3, false));
+  fprintf(stderr, "%sB/s\n", eng(total/elapsed, 3, false));
+  upb_msg_parse_free(&s);
+  upb_msgdata_free(data, m, true);
+  upb_context_free(&c);
+  upb_strfree(str);
+
+  //benchmarks::SpeedMessage2 msg;
+  //std::string stlstr(str.ptr, str.byte_len);
+  //before = clock();
+  //for(int i = 0; i < 2000; i++) {
+  //  msg.ParseFromString(stlstr);
+  //  total += str.byte_len;
+  //}
+  //elapsed = ((double)clock() - before) / CLOCKS_PER_SEC;
+  //fprintf(stderr, "Parsed %sB, ", eng(total, 3, false));
+  //fprintf(stderr, "%sB/s\n", eng(total/elapsed, 3, false));
+}
-- 
cgit v1.2.3