Index: base/debug/trace_event.cc |
diff --git a/base/debug/trace_event.cc b/base/debug/trace_event.cc |
index 879f3a978f9361900a8658b61c4ead4ef5f75f0b..978da685961338ebce3e57224c72220306374510 100644 |
--- a/base/debug/trace_event.cc |
+++ b/base/debug/trace_event.cc |
@@ -110,22 +110,6 @@ void TraceValue::AppendAsJSON(std::string* out) const { |
namespace { |
-const char* GetPhaseStr(TraceEventPhase phase) { |
- switch(phase) { |
- case TRACE_EVENT_PHASE_BEGIN: |
- return "B"; |
- case TRACE_EVENT_PHASE_INSTANT: |
- return "I"; |
- case TRACE_EVENT_PHASE_END: |
- return "E"; |
- case TRACE_EVENT_PHASE_METADATA: |
- return "M"; |
- default: |
- NOTREACHED() << "Invalid phase argument"; |
- return "?"; |
- } |
-} |
- |
size_t GetAllocLength(const char* str) { return str ? strlen(str) + 1 : 0; } |
// Copies |*member| into |*buffer|, sets |*member| to point to this new |
@@ -212,6 +196,37 @@ TraceEvent::TraceEvent(unsigned long process_id, |
TraceEvent::~TraceEvent() { |
} |
+const char* TraceEvent::GetPhaseStr(TraceEventPhase phase) { |
+ switch(phase) { |
+ case TRACE_EVENT_PHASE_BEGIN: |
+ return "B"; |
+ case TRACE_EVENT_PHASE_INSTANT: |
+ return "I"; |
+ case TRACE_EVENT_PHASE_END: |
+ return "E"; |
+ case TRACE_EVENT_PHASE_METADATA: |
+ return "M"; |
+ default: |
+ NOTREACHED() << "Invalid phase argument"; |
+ return "?"; |
+ } |
+} |
+ |
+TraceEventPhase TraceEvent::GetPhase(const char* phase) { |
+ switch(*phase) { |
+ case 'B': |
+ return TRACE_EVENT_PHASE_BEGIN; |
+ case 'I': |
+ return TRACE_EVENT_PHASE_INSTANT; |
+ case 'E': |
+ return TRACE_EVENT_PHASE_END; |
+ case 'M': |
+ return TRACE_EVENT_PHASE_METADATA; |
+ default: |
+ return TRACE_EVENT_PHASE_METADATA; |
nduca
2011/10/11 20:33:37
is this right? 'X'->metdata? X->UNKNOWN and DCHECK
jbates
2011/10/12 22:35:20
Done.
|
+ } |
+} |
+ |
void TraceEvent::AppendEventsAsJSON(const std::vector<TraceEvent>& events, |
size_t start, |
size_t count, |