Fix upb's parsetostruct benchmark.

1 files changed, 37 insertions, 41 deletions

diff --git a/benchmarks/parsetostruct.upb_table.c b/benchmarks/parsetostruct.upb_table.c
index 494d5b7..dfdad36 100644
--- a/benchmarks/parsetostruct.upb_table.c
+++ b/benchmarks/parsetostruct.upb_table.c
@@ -1,80 +1,76 @@
 
 #include "main.c"
 
-#include "upb_data.h"
 #include "upb_def.h"
 #include "upb_decoder.h"
+#include "upb_strstream.h"
+#include "upb_glue.h"
+#include "upb_msg.h"
 
-static upb_symtab *s;
-static upb_strptr str;
+static upb_string *input_str;
 static upb_msgdef *def;
-static upb_msg *msgs[NUM_MESSAGES];
-static upb_decoder *decoder;
-static upb_msgsink *sink;
+static upb_msg *msg;
 
 static bool initialize()
 {
   // Initialize upb state, decode descriptor.
   upb_status status = UPB_STATUS_INIT;
-  s = upb_symtab_new();
-  upb_strptr fds = upb_strreadfile(MESSAGE_DESCRIPTOR_FILE);
-  if(upb_string_isnull(fds)) {
-    fprintf(stderr, "Couldn't read " MESSAGE_DESCRIPTOR_FILE ": %s.\n",
-            status.msg);
+  upb_symtab *s = upb_symtab_new();
+  upb_symtab_add_descriptorproto(s);
+
+  upb_string *fds_str = upb_strreadfile(MESSAGE_DESCRIPTOR_FILE);
+  if(fds_str == NULL) {
+    fprintf(stderr, "Couldn't read " MESSAGE_DESCRIPTOR_FILE ":"),
+    upb_printerr(&status);
     return false;
   }
-  upb_symtab_add_desc(s, fds, &status);
+  upb_parsedesc(s, fds_str, &status);
+  upb_string_unref(fds_str);
+
   if(!upb_ok(&status)) {
-    fprintf(stderr, "Error importing " MESSAGE_DESCRIPTOR_FILE ": %s.\n",
-            status.msg);
+    fprintf(stderr, "Error importing " MESSAGE_DESCRIPTOR_FILE ":");
+    upb_printerr(&status);
     return false;
   }
-  upb_string_unref(fds);
 
-  upb_strptr proto_name = upb_strdupc(MESSAGE_NAME);
-  def = upb_downcast_msgdef(upb_symtab_lookup(s, proto_name));
+  def = upb_dyncast_msgdef(upb_symtab_lookup(s, UPB_STRLIT(MESSAGE_NAME)));
   if(!def) {
     fprintf(stderr, "Error finding symbol '" UPB_STRFMT "'.\n",
-            UPB_STRARG(proto_name));
+            UPB_STRARG(UPB_STRLIT(MESSAGE_NAME)));
     return false;
   }
-  upb_string_unref(proto_name);
-
-  for(int i = 0; i < NUM_MESSAGES; i++)
-    msgs[i] = upb_msg_new(def);
+  upb_symtab_unref(s);
 
   // Read the message data itself.
-  str = upb_strreadfile(MESSAGE_FILE);
-  if(upb_string_isnull(str)) {
+  input_str = upb_strreadfile(MESSAGE_FILE);
+  if(input_str == NULL) {
     fprintf(stderr, "Error reading " MESSAGE_FILE "\n");
     return false;
   }
-  decoder = upb_decoder_new(def);
-  sink = upb_msgsink_new(def);
+  upb_status_uninit(&status);
+  msg = upb_msg_new(def);
   return true;
 }
 
 static void cleanup()
 {
-  for(int i = 0; i < NUM_MESSAGES; i++)
-    upb_msg_unref(msgs[i], def);
-  upb_string_unref(str);
-  upb_symtab_unref(s);
-  upb_decoder_free(decoder);
-  upb_msgsink_free(sink);
+  upb_string_unref(input_str);
+  upb_msg_unref(msg, def);
+  upb_def_unref(UPB_UPCAST(def));
 }
 
 static size_t run(int i)
 {
+  (void)i;
   upb_status status = UPB_STATUS_INIT;
-  upb_msg *msg = msgs[i%NUM_MESSAGES];
-  upb_msgsink_reset(sink, msg);
-  upb_decoder_reset(decoder, upb_msgsink_sink(sink));
   upb_msg_clear(msg, def);
-  size_t decoded = upb_decoder_decode(decoder, str, &status);
-  if(!upb_ok(&status) || decoded != upb_strlen(str)) {
-    fprintf(stderr, "Decode error: %s\n", status.msg);
-    return 0;
-  }
-  return upb_strlen(str);
+  upb_strtomsg(input_str, msg, def, &status);
+  if(!upb_ok(&status)) goto err;
+  upb_status_uninit(&status);
+  return upb_string_len(input_str);
+
+err:
+  fprintf(stderr, "Decode error: ");
+  upb_printerr(&status);
+  return 0;
 }