Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(905)

Unified Diff: src/tracing/trace-event.cc

Issue 2311983002: Revert of [RuntimeCallStats] Move tracing runtime instrumentation closer to the original version. (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/tracing/trace-event.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/tracing/trace-event.cc
diff --git a/src/tracing/trace-event.cc b/src/tracing/trace-event.cc
index 7a40e2da1a9802caf090540591d640b75515581d..7fda7baae5d4a6905a08ed5da294032769595789 100644
--- a/src/tracing/trace-event.cc
+++ b/src/tracing/trace-event.cc
@@ -6,7 +6,6 @@
#include <string.h>
-#include "src/counters.h"
#include "src/isolate.h"
#include "src/v8.h"
@@ -28,9 +27,8 @@
TRACE_EVENT_PHASE_END, p_data_->category_group_enabled, p_data_->name,
v8::internal::tracing::kGlobalScope, v8::internal::tracing::kNoId,
v8::internal::tracing::kNoId, TRACE_EVENT_FLAG_NONE,
- "runtime-call-stats", TRACE_STR_COPY(p_data_->isolate->counters()
- ->tracing_runtime_call_stats()
- ->Dump()));
+ "runtime-call-stats",
+ TRACE_STR_COPY(p_data_->isolate->trace_event_stats_table()->Dump()));
} else {
v8::internal::tracing::AddTraceEvent(
TRACE_EVENT_PHASE_END, p_data_->category_group_enabled, p_data_->name,
@@ -39,14 +37,14 @@
}
}
-void CallStatsScopedTracer::Initialize(v8::internal::Isolate* isolate,
+void CallStatsScopedTracer::Initialize(Isolate* isolate,
const uint8_t* category_group_enabled,
const char* name) {
data_.isolate = isolate;
data_.category_group_enabled = category_group_enabled;
data_.name = name;
p_data_ = &data_;
- RuntimeCallStats* table = isolate->counters()->tracing_runtime_call_stats();
+ TraceEventStatsTable* table = isolate->trace_event_stats_table();
has_parent_scope_ = table->InUse();
if (!has_parent_scope_) table->Reset();
v8::internal::tracing::AddTraceEvent(
@@ -55,6 +53,88 @@
TRACE_EVENT_FLAG_NONE, v8::internal::tracing::kNoId);
}
+void TraceEventStatsTable::Enter(Isolate* isolate,
+ TraceEventCallStatsTimer* timer,
+ CounterId counter_id) {
+ TraceEventStatsTable* table = isolate->trace_event_stats_table();
+ RuntimeCallCounter* counter = &(table->*counter_id);
+ timer->Start(counter, table->current_timer_);
+ table->current_timer_ = timer;
+}
+
+void TraceEventStatsTable::Leave(Isolate* isolate,
+ TraceEventCallStatsTimer* timer) {
+ TraceEventStatsTable* table = isolate->trace_event_stats_table();
+ if (table->current_timer_ == timer) {
+ table->current_timer_ = timer->Stop();
+ }
+}
+
+void TraceEventStatsTable::Reset() {
+ in_use_ = true;
+ current_timer_ = nullptr;
+
+#define RESET_COUNTER(name) this->name.Reset();
+ FOR_EACH_MANUAL_COUNTER(RESET_COUNTER)
+#undef RESET_COUNTER
+
+#define RESET_COUNTER(name, nargs, result_size) this->Runtime_##name.Reset();
+ FOR_EACH_INTRINSIC(RESET_COUNTER)
+#undef RESET_COUNTER
+
+#define RESET_COUNTER(name) this->Builtin_##name.Reset();
+ BUILTIN_LIST_C(RESET_COUNTER)
+#undef RESET_COUNTER
+
+#define RESET_COUNTER(name) this->API_##name.Reset();
+ FOR_EACH_API_COUNTER(RESET_COUNTER)
+#undef RESET_COUNTER
+
+#define RESET_COUNTER(name) this->Handler_##name.Reset();
+ FOR_EACH_HANDLER_COUNTER(RESET_COUNTER)
+#undef RESET_COUNTER
+}
+
+const char* TraceEventStatsTable::Dump() {
+ buffer_.str(std::string());
+ buffer_.clear();
+ buffer_ << "{";
+#define DUMP_COUNTER(name) \
+ if (this->name.count > 0) this->name.Dump(buffer_);
+ FOR_EACH_MANUAL_COUNTER(DUMP_COUNTER)
+#undef DUMP_COUNTER
+
+#define DUMP_COUNTER(name, nargs, result_size) \
+ if (this->Runtime_##name.count > 0) this->Runtime_##name.Dump(buffer_);
+ FOR_EACH_INTRINSIC(DUMP_COUNTER)
+#undef DUMP_COUNTER
+
+#define DUMP_COUNTER(name) \
+ if (this->Builtin_##name.count > 0) this->Builtin_##name.Dump(buffer_);
+ BUILTIN_LIST_C(DUMP_COUNTER)
+#undef DUMP_COUNTER
+
+#define DUMP_COUNTER(name) \
+ if (this->API_##name.count > 0) this->API_##name.Dump(buffer_);
+ FOR_EACH_API_COUNTER(DUMP_COUNTER)
+#undef DUMP_COUNTER
+
+#define DUMP_COUNTER(name) \
+ if (this->Handler_##name.count > 0) this->Handler_##name.Dump(buffer_);
+ FOR_EACH_HANDLER_COUNTER(DUMP_COUNTER)
+#undef DUMP_COUNTER
+ buffer_ << "\"END\":[]}";
+ const std::string& buffer_str = buffer_.str();
+ size_t length = buffer_str.size();
+ if (length > len_) {
+ buffer_c_str_.reset(new char[length + 1]);
+ len_ = length;
+ }
+ strncpy(buffer_c_str_.get(), buffer_str.c_str(), length + 1);
+ in_use_ = false;
+ return buffer_c_str_.get();
+}
+
} // namespace tracing
} // namespace internal
} // namespace v8
« no previous file with comments | « src/tracing/trace-event.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698