Fix the benchmark app to handle real-world events

apps/benchmark/event.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "apps/benchmark/event.h"
 
 #include <map>
 #include <stack>
 
 #include "base/json/json_reader.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 
 namespace benchmark {
 
 Event::Event() {}
 
 Event::Event(EventType type,
              std::string name,
              std::string categories,
              base::TimeTicks timestamp,
              base::TimeDelta duration)
     : type(type),
       name(name),
       categories(categories),
       timestamp(timestamp),
       duration(duration) {}
 
 Event::~Event() {}
 
 namespace {
 // ID uniquely identifying an asynchronous event stack.
 struct AsyncEventStackId {
-  int id;
+  std::string id;
   std::string cat;
 };
 
 bool operator<(const AsyncEventStackId& t, const AsyncEventStackId& o) {
   return t.id < o.id || (t.id == o.id && t.cat < o.cat);
 }
 
 // ID uniquely identifying a duration event stack.
 typedef int DurationEventStackId;
 
 // Makes a unique id for a duration event stack.
 bool GetDurationEventStackId(base::DictionaryValue* event_dict,
                              DurationEventStackId* durationId) {
   if (!event_dict->GetInteger("tid", durationId)) {
-    LOG(ERROR) << "Incorrect trace event (missing tid).";
+    LOG(ERROR) << "Incorrect trace event (missing tid): " << *event_dict;
     return false;
   }
   return true;
 }
 
 // Makes a unique key for an async event stack.
 bool GetAsyncEventStackId(base::DictionaryValue* event_dict,
                           AsyncEventStackId* asyncId) {
-  if (!event_dict->GetInteger("id", &asyncId->id)) {
-    LOG(ERROR) << "Incorrect async trace event (missing id).";
+  const base::Value* value;
+  if (!event_dict->Get("id", &value)) {
+    LOG(ERROR) << "Incorrect async trace event (missing id): " << *event_dict;
     return false;
   }
 
-  // We can have an empty category, but it is still relevant for event merging,
+  if (value->IsType(base::Value::TYPE_INTEGER)) {
+    int id_int;
+    // We already verified the type, so it should be an integer.
+    DCHECK(value->GetAsInteger(&id_int));
+    asyncId->id = base::IntToString(id_int);
+  } else if (value->IsType(base::Value::TYPE_STRING)) {
+    DCHECK(value->GetAsString(&asyncId->id));
+  } else {
+    LOG(ERROR) << "Incorrect async trace event (id of wrong type): "

[ppi, 2015/10/01 13:09:44]

(id of wrong type) -> (id is neither string nor int)

[etiennej, 2015/10/01 13:25:17]

Done.

+               << *event_dict;
+  }
+
+  // We can have an empty category, but it is still relevant for event
+  // merging,

[ppi, 2015/10/01 13:09:44]

the comment block needs re-align

[etiennej, 2015/10/01 13:25:17]

Done.

   // per the documentation.
   std::string cat;
   event_dict->GetString("cat", &asyncId->cat);
 
   return true;
 }
 
 // Given a beginning event, registers its beginning for future merging.
 template <typename T>
 void RegisterEventBegin(
@@ skipping 168 matching lines @@
   }
 
   if (!JoinEvents(event_list))
     return false;
 
   if (!ParseEvents(event_list, result))
     return false;
   return true;
 }
 }  // namespace benchmark