Index: base/debug/trace_event.h |
diff --git a/base/debug/trace_event.h b/base/debug/trace_event.h |
index 07863ad997b3d56fd46f8033a0775f08b56b279a..58bd02370bff9bbefb4f02c1aa5c4535d33112b4 100644 |
--- a/base/debug/trace_event.h |
+++ b/base/debug/trace_event.h |
@@ -292,25 +292,6 @@ |
category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, \ |
arg2_name, arg2_val) |
-// Time threshold event: |
-// Only record the event if the duration is greater than the specified |
-// threshold_us (time in microseconds). |
-// Records a pair of begin and end events called "name" for the current |
-// scope, with 0, 1 or 2 associated arguments. If the category is not |
-// enabled, then this does nothing. |
-// - category and name strings must have application lifetime (statics or |
-// literals). They may not include " chars. |
-#define TRACE_EVENT_IF_LONGER_THAN0(threshold_us, category, name) \ |
- INTERNAL_TRACE_EVENT_ADD_SCOPED_IF_LONGER_THAN(threshold_us, category, name) |
-#define TRACE_EVENT_IF_LONGER_THAN1( \ |
- threshold_us, category, name, arg1_name, arg1_val) \ |
- INTERNAL_TRACE_EVENT_ADD_SCOPED_IF_LONGER_THAN( \ |
- threshold_us, category, name, arg1_name, arg1_val) |
-#define TRACE_EVENT_IF_LONGER_THAN2( \ |
- threshold_us, category, name, arg1_name, arg1_val, arg2_name, arg2_val) \ |
- INTERNAL_TRACE_EVENT_ADD_SCOPED_IF_LONGER_THAN( \ |
- threshold_us, category, name, arg1_name, arg1_val, arg2_name, arg2_val) |
- |
// Records the value of a counter called "name" immediately. Value |
// must be representable as a 32 bit integer. |
// - category and name strings must have application lifetime (statics or |
@@ -580,9 +561,8 @@ |
#define TRACE_EVENT_API_GET_CATEGORY_ENABLED \ |
base::debug::TraceLog::GetCategoryEnabled |
-// Add a trace event to the platform tracing system. Returns thresholdBeginId |
-// for use in a corresponding end TRACE_EVENT_API_ADD_TRACE_EVENT call. |
-// int TRACE_EVENT_API_ADD_TRACE_EVENT( |
+// Add a trace event to the platform tracing system. |
+// void TRACE_EVENT_API_ADD_TRACE_EVENT( |
// char phase, |
// const unsigned char* category_enabled, |
// const char* name, |
@@ -591,8 +571,6 @@ |
// const char** arg_names, |
// const unsigned char* arg_types, |
// const unsigned long long* arg_values, |
-// int threshold_begin_id, |
-// long long threshold, |
// unsigned char flags) |
#define TRACE_EVENT_API_ADD_TRACE_EVENT \ |
base::debug::TraceLog::GetInstance()->AddTraceEvent |
@@ -655,26 +633,6 @@ |
INTERNAL_TRACE_EVENT_UID(catstatic), name); \ |
} |
-// Implementation detail: internal macro to create static category and add begin |
-// event if the category is enabled. Also adds the end event when the scope |
-// ends. If the elapsed time is < threshold time, the begin/end pair is erased. |
-#define INTERNAL_TRACE_EVENT_ADD_SCOPED_IF_LONGER_THAN(threshold, \ |
- category, name, ...) \ |
- INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category); \ |
- trace_event_internal::TraceEndOnScopeCloseThreshold \ |
- INTERNAL_TRACE_EVENT_UID(profileScope); \ |
- if (*INTERNAL_TRACE_EVENT_UID(catstatic)) { \ |
- int INTERNAL_TRACE_EVENT_UID(begin_event_id) = \ |
- trace_event_internal::AddTraceEvent( \ |
- TRACE_EVENT_PHASE_BEGIN, \ |
- INTERNAL_TRACE_EVENT_UID(catstatic), \ |
- name, trace_event_internal::kNoEventId, \ |
- TRACE_EVENT_FLAG_NONE, ##__VA_ARGS__); \ |
- INTERNAL_TRACE_EVENT_UID(profileScope).Initialize( \ |
- INTERNAL_TRACE_EVENT_UID(catstatic), name, \ |
- INTERNAL_TRACE_EVENT_UID(begin_event_id), threshold); \ |
- } |
- |
// Implementation detail: internal macro to create static category and add |
// event if the category is enabled. |
#define INTERNAL_TRACE_EVENT_ADD_WITH_ID(phase, category, name, id, flags, \ |
@@ -730,8 +688,6 @@ namespace trace_event_internal { |
// Specify these values when the corresponding argument of AddTraceEvent is not |
// used. |
const int kZeroNumArgs = 0; |
-const int kNoThreshholdBeginId = -1; |
-const long long kNoThresholdValue = 0; |
const unsigned long long kNoEventId = 0; |
// TraceID encapsulates an ID that can either be an integer or pointer. Pointers |
@@ -879,19 +835,19 @@ static inline void SetTraceValue(const std::string& arg, |
// through to the tracing API, the arg_values must live throughout |
// these procedures. |
-static inline int AddTraceEvent(char phase, |
+static inline void AddTraceEvent(char phase, |
const unsigned char* category_enabled, |
const char* name, |
unsigned long long id, |
unsigned char flags) { |
- return TRACE_EVENT_API_ADD_TRACE_EVENT( |
+ TRACE_EVENT_API_ADD_TRACE_EVENT( |
phase, category_enabled, name, id, |
kZeroNumArgs, NULL, NULL, NULL, |
- kNoThreshholdBeginId, kNoThresholdValue, flags); |
+ flags); |
} |
template<class ARG1_TYPE> |
-static inline int AddTraceEvent(char phase, |
+static inline void AddTraceEvent(char phase, |
const unsigned char* category_enabled, |
const char* name, |
unsigned long long id, |
@@ -902,14 +858,14 @@ static inline int AddTraceEvent(char phase, |
unsigned char arg_types[1]; |
unsigned long long arg_values[1]; |
SetTraceValue(arg1_val, &arg_types[0], &arg_values[0]); |
- return TRACE_EVENT_API_ADD_TRACE_EVENT( |
+ TRACE_EVENT_API_ADD_TRACE_EVENT( |
phase, category_enabled, name, id, |
num_args, &arg1_name, arg_types, arg_values, |
- kNoThreshholdBeginId, kNoThresholdValue, flags); |
+ flags); |
} |
template<class ARG1_TYPE, class ARG2_TYPE> |
-static inline int AddTraceEvent(char phase, |
+static inline void AddTraceEvent(char phase, |
const unsigned char* category_enabled, |
const char* name, |
unsigned long long id, |
@@ -924,10 +880,10 @@ static inline int AddTraceEvent(char phase, |
unsigned long long arg_values[2]; |
SetTraceValue(arg1_val, &arg_types[0], &arg_values[0]); |
SetTraceValue(arg2_val, &arg_types[1], &arg_values[1]); |
- return TRACE_EVENT_API_ADD_TRACE_EVENT( |
+ TRACE_EVENT_API_ADD_TRACE_EVENT( |
phase, category_enabled, name, id, |
num_args, arg_names, arg_types, arg_values, |
- kNoThreshholdBeginId, kNoThresholdValue, flags); |
+ flags); |
} |
// Used by TRACE_EVENTx macro. Do not use directly. |
@@ -960,41 +916,6 @@ class BASE_EXPORT TraceEndOnScopeClose { |
Data data_; |
}; |
-// Used by TRACE_EVENTx macro. Do not use directly. |
-class BASE_EXPORT TraceEndOnScopeCloseThreshold { |
- public: |
- // Note: members of data_ intentionally left uninitialized. See Initialize. |
- TraceEndOnScopeCloseThreshold() : p_data_(NULL) {} |
- ~TraceEndOnScopeCloseThreshold() { |
- if (p_data_) |
- AddEventIfEnabled(); |
- } |
- |
- // Called by macros only when tracing is enabled at the point when the begin |
- // event is added. |
- void Initialize(const unsigned char* category_enabled, |
- const char* name, |
- int threshold_begin_id, |
- long long threshold); |
- |
- private: |
- // Add the end event if the category is still enabled. |
- void AddEventIfEnabled(); |
- |
- // This Data struct workaround is to avoid initializing all the members |
- // in Data during construction of this object, since this object is always |
- // constructed, even when tracing is disabled. If the members of Data were |
- // members of this class instead, compiler warnings occur about potential |
- // uninitialized accesses. |
- struct Data { |
- long long threshold; |
- const unsigned char* category_enabled; |
- const char* name; |
- int threshold_begin_id; |
- }; |
- Data* p_data_; |
- Data data_; |
-}; |
} // namespace trace_event_internal |