bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove TRACE_EVENT_COPY_XXX overloads (fixes #3497)

Browse Source 
This functionality is not compatible with Chromium's new tracing implementation
based on Perfetto.
This commit is contained in:
Marshall Greenblatt
2023-05-08 13:03:41 +03:00
parent cf14b2a972
commit b8e1c6a59d
7 changed files with 120 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

220
libcef/common/base_impl.cc
View File

@@ -23,33 +23,20 @@ CEF_EXPORT void cef_trace_event_instant(const char* /* category */,
const char* arg1_name,
uint64 arg1_val,
const char* arg2_name,
uint64 arg2_val,
int copy) {
uint64 arg2_val) {
DCHECK(name);
if (!name) {
return;
}
if (copy) {
if (arg1_name == nullptr && arg2_name == nullptr) {
TRACE_EVENT_COPY_INSTANT0(kCategory, name, TRACE_EVENT_SCOPE_THREAD);
} else if (arg2_name == nullptr) {
TRACE_EVENT_COPY_INSTANT1(kCategory, name, TRACE_EVENT_SCOPE_THREAD,
arg1_name, arg1_val);
} else {
TRACE_EVENT_COPY_INSTANT2(kCategory, name, TRACE_EVENT_SCOPE_THREAD,
arg1_name, arg1_val, arg2_name, arg2_val);
}
if (arg1_name == nullptr && arg2_name == nullptr) {
TRACE_EVENT_INSTANT0(kCategory, name, TRACE_EVENT_SCOPE_THREAD);
} else if (arg2_name == nullptr) {
TRACE_EVENT_INSTANT1(kCategory, name, TRACE_EVENT_SCOPE_THREAD, arg1_name,
arg1_val);
} else {
if (arg1_name == nullptr && arg2_name == nullptr) {
TRACE_EVENT_INSTANT0(kCategory, name, TRACE_EVENT_SCOPE_THREAD);
} else if (arg2_name == nullptr) {
TRACE_EVENT_INSTANT1(kCategory, name, TRACE_EVENT_SCOPE_THREAD, arg1_name,
arg1_val);
} else {
TRACE_EVENT_INSTANT2(kCategory, name, TRACE_EVENT_SCOPE_THREAD, arg1_name,
arg1_val, arg2_name, arg2_val);
}
TRACE_EVENT_INSTANT2(kCategory, name, TRACE_EVENT_SCOPE_THREAD, arg1_name,
arg1_val, arg2_name, arg2_val);
}
}
@@ -58,32 +45,19 @@ CEF_EXPORT void cef_trace_event_begin(const char* /* category */,
const char* arg1_name,
uint64 arg1_val,
const char* arg2_name,
uint64 arg2_val,
int copy) {
uint64 arg2_val) {
DCHECK(name);
if (!name) {
return;
}
if (copy) {
if (arg1_name == nullptr && arg2_name == nullptr) {
TRACE_EVENT_BEGIN_WITH_FLAGS0(kCategory, name, TRACE_EVENT_FLAG_COPY);
} else if (arg2_name == nullptr) {
TRACE_EVENT_BEGIN_WITH_FLAGS1(kCategory, name, TRACE_EVENT_FLAG_COPY,
arg1_name, arg1_val);
} else {
TRACE_EVENT_COPY_BEGIN2(kCategory, name, arg1_name, arg1_val, arg2_name,
arg2_val);
}
if (arg1_name == nullptr && arg2_name == nullptr) {
TRACE_EVENT_BEGIN0(kCategory, name);
} else if (arg2_name == nullptr) {
TRACE_EVENT_BEGIN1(kCategory, name, arg1_name, arg1_val);
} else {
if (arg1_name == nullptr && arg2_name == nullptr) {
TRACE_EVENT_BEGIN0(kCategory, name);
} else if (arg2_name == nullptr) {
TRACE_EVENT_BEGIN1(kCategory, name, arg1_name, arg1_val);
} else {
TRACE_EVENT_BEGIN2(kCategory, name, arg1_name, arg1_val, arg2_name,
arg2_val);
}
TRACE_EVENT_BEGIN2(kCategory, name, arg1_name, arg1_val, arg2_name,
arg2_val);
}
}
@@ -92,32 +66,18 @@ CEF_EXPORT void cef_trace_event_end(const char* /* category */,
const char* arg1_name,
uint64 arg1_val,
const char* arg2_name,
uint64 arg2_val,
int copy) {
uint64 arg2_val) {
DCHECK(name);
if (!name) {
return;
}
if (copy) {
if (arg1_name == nullptr && arg2_name == nullptr) {
TRACE_EVENT_END_WITH_FLAGS0(kCategory, name, TRACE_EVENT_FLAG_COPY);
} else if (arg2_name == nullptr) {
TRACE_EVENT_END_WITH_FLAGS1(kCategory, name, TRACE_EVENT_FLAG_COPY,
arg1_name, arg1_val);
} else {
TRACE_EVENT_COPY_END2(kCategory, name, arg1_name, arg1_val, arg2_name,
arg2_val);
}
if (arg1_name == nullptr && arg2_name == nullptr) {
TRACE_EVENT_END0(kCategory, name);
} else if (arg2_name == nullptr) {
TRACE_EVENT_END1(kCategory, name, arg1_name, arg1_val);
} else {
if (arg1_name == nullptr && arg2_name == nullptr) {
TRACE_EVENT_END0(kCategory, name);
} else if (arg2_name == nullptr) {
TRACE_EVENT_END1(kCategory, name, arg1_name, arg1_val);
} else {
TRACE_EVENT_END2(kCategory, name, arg1_name, arg1_val, arg2_name,
arg2_val);
}
TRACE_EVENT_END2(kCategory, name, arg1_name, arg1_val, arg2_name, arg2_val);
}
}
@@ -126,27 +86,17 @@ CEF_EXPORT void cef_trace_counter(const char* /* category */,
const char* value1_name,
uint64 value1_val,
const char* value2_name,
uint64 value2_val,
int copy) {
uint64 value2_val) {
DCHECK(name);
if (!name) {
return;
}
if (copy) {
if (value1_name == nullptr && value2_name == nullptr) {
TRACE_COPY_COUNTER1(kCategory, name, value1_val);
} else {
TRACE_COPY_COUNTER2(kCategory, name, value1_name, value1_val, value2_name,
value2_val);
}
if (value1_name == nullptr && value2_name == nullptr) {
TRACE_COUNTER1(kCategory, name, value1_val);
} else {
if (value1_name == nullptr && value2_name == nullptr) {
TRACE_COUNTER1(kCategory, name, value1_val);
} else {
TRACE_COUNTER2(kCategory, name, value1_name, value1_val, value2_name,
value2_val);
}
TRACE_COUNTER2(kCategory, name, value1_name, value1_val, value2_name,
value2_val);
}
}
@@ -156,27 +106,17 @@ CEF_EXPORT void cef_trace_counter_id(const char* /* category */,
const char* value1_name,
uint64 value1_val,
const char* value2_name,
uint64 value2_val,
int copy) {
uint64 value2_val) {
DCHECK(name);
if (!name) {
return;
}
if (copy) {
if (value1_name == nullptr && value2_name == nullptr) {
TRACE_COPY_COUNTER_ID1(kCategory, name, id, value1_val);
} else {
TRACE_COPY_COUNTER_ID2(kCategory, name, id, value1_name, value1_val,
value2_name, value2_val);
}
if (value1_name == nullptr && value2_name == nullptr) {
TRACE_COUNTER_ID1(kCategory, name, id, value1_val);
} else {
if (value1_name == nullptr && value2_name == nullptr) {
TRACE_COUNTER_ID1(kCategory, name, id, value1_val);
} else {
TRACE_COUNTER_ID2(kCategory, name, id, value1_name, value1_val,
value2_name, value2_val);
}
TRACE_COUNTER_ID2(kCategory, name, id, value1_name, value1_val, value2_name,
value2_val);
}
}
@@ -186,31 +126,19 @@ CEF_EXPORT void cef_trace_event_async_begin(const char* /* category */,
const char* arg1_name,
uint64 arg1_val,
const char* arg2_name,
uint64 arg2_val,
int copy) {
uint64 arg2_val) {
DCHECK(name);
if (!name) {
return;
}
if (copy) {
if (arg1_name == nullptr && arg2_name == nullptr) {
TRACE_EVENT_COPY_ASYNC_BEGIN0(kCategory, name, id);
} else if (arg2_name == nullptr) {
TRACE_EVENT_COPY_ASYNC_BEGIN1(kCategory, name, id, arg1_name, arg1_val);
} else {
TRACE_EVENT_COPY_ASYNC_BEGIN2(kCategory, name, id, arg1_name, arg1_val,
arg2_name, arg2_val);
}
if (arg1_name == nullptr && arg2_name == nullptr) {
TRACE_EVENT_ASYNC_BEGIN0(kCategory, name, id);
} else if (arg2_name == nullptr) {
TRACE_EVENT_ASYNC_BEGIN1(kCategory, name, id, arg1_name, arg1_val);
} else {
if (arg1_name == nullptr && arg2_name == nullptr) {
TRACE_EVENT_ASYNC_BEGIN0(kCategory, name, id);
} else if (arg2_name == nullptr) {
TRACE_EVENT_ASYNC_BEGIN1(kCategory, name, id, arg1_name, arg1_val);
} else {
TRACE_EVENT_ASYNC_BEGIN2(kCategory, name, id, arg1_name, arg1_val,
arg2_name, arg2_val);
}
TRACE_EVENT_ASYNC_BEGIN2(kCategory, name, id, arg1_name, arg1_val,
arg2_name, arg2_val);
}
}
@@ -219,30 +147,17 @@ CEF_EXPORT void cef_trace_event_async_step_into(const char* /* category */,
uint64 id,
uint64 step,
const char* arg1_name,
uint64 arg1_val,
int copy) {
uint64 arg1_val) {
DCHECK(name);
if (!name) {
return;
}
if (copy) {
if (arg1_name == nullptr) {
INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP_INTO,
kCategory, name, id,
TRACE_EVENT_FLAG_COPY, "step", step);
} else {
INTERNAL_TRACE_EVENT_ADD_WITH_ID(
TRACE_EVENT_PHASE_ASYNC_STEP_INTO, kCategory, name, id,
TRACE_EVENT_FLAG_COPY, "step", step, arg1_name, arg1_val);
}
if (arg1_name == nullptr) {
TRACE_EVENT_ASYNC_STEP_INTO0(kCategory, name, id, step);
} else {
if (arg1_name == nullptr) {
TRACE_EVENT_ASYNC_STEP_INTO0(kCategory, name, id, step);
} else {
TRACE_EVENT_ASYNC_STEP_INTO1(kCategory, name, id, step, arg1_name,
arg1_val);
}
TRACE_EVENT_ASYNC_STEP_INTO1(kCategory, name, id, step, arg1_name,
arg1_val);
}
}
@@ -251,30 +166,17 @@ CEF_EXPORT void cef_trace_event_async_step_past(const char* /* category */,
uint64 id,
uint64 step,
const char* arg1_name,
uint64 arg1_val,
int copy) {
uint64 arg1_val) {
DCHECK(name);
if (!name) {
return;
}
if (copy) {
if (arg1_name == nullptr) {
INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP_PAST,
kCategory, name, id,
TRACE_EVENT_FLAG_COPY, "step", step);
} else {
INTERNAL_TRACE_EVENT_ADD_WITH_ID(
TRACE_EVENT_PHASE_ASYNC_STEP_PAST, kCategory, name, id,
TRACE_EVENT_FLAG_COPY, "step", step, arg1_name, arg1_val);
}
if (arg1_name == nullptr) {
TRACE_EVENT_ASYNC_STEP_PAST0(kCategory, name, id, step);
} else {
if (arg1_name == nullptr) {
TRACE_EVENT_ASYNC_STEP_PAST0(kCategory, name, id, step);
} else {
TRACE_EVENT_ASYNC_STEP_PAST1(kCategory, name, id, step, arg1_name,
arg1_val);
}
TRACE_EVENT_ASYNC_STEP_PAST1(kCategory, name, id, step, arg1_name,
arg1_val);
}
}
@@ -284,31 +186,19 @@ CEF_EXPORT void cef_trace_event_async_end(const char* /* category */,
const char* arg1_name,
uint64 arg1_val,
const char* arg2_name,
uint64 arg2_val,
int copy) {
uint64 arg2_val) {
DCHECK(name);
if (!name) {
return;
}
if (copy) {
if (arg1_name == nullptr && arg2_name == nullptr) {
TRACE_EVENT_COPY_ASYNC_END0(kCategory, name, id);
} else if (arg2_name == nullptr) {
TRACE_EVENT_COPY_ASYNC_END1(kCategory, name, id, arg1_name, arg1_val);
} else {
TRACE_EVENT_COPY_ASYNC_END2(kCategory, name, id, arg1_name, arg1_val,
arg2_name, arg2_val);
}
if (arg1_name == nullptr && arg2_name == nullptr) {
TRACE_EVENT_ASYNC_END0(kCategory, name, id);
} else if (arg2_name == nullptr) {
TRACE_EVENT_ASYNC_END1(kCategory, name, id, arg1_name, arg1_val);
} else {
if (arg1_name == nullptr && arg2_name == nullptr) {
TRACE_EVENT_ASYNC_END0(kCategory, name, id);
} else if (arg2_name == nullptr) {
TRACE_EVENT_ASYNC_END1(kCategory, name, id, arg1_name, arg1_val);
} else {
TRACE_EVENT_ASYNC_END2(kCategory, name, id, arg1_name, arg1_val,
arg2_name, arg2_val);
}
TRACE_EVENT_ASYNC_END2(kCategory, name, id, arg1_name, arg1_val, arg2_name,
arg2_val);
}
}