diff options
| author | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 05:56:05 +0000 |
|---|---|---|
| committer | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 05:56:05 +0000 |
| commit | 065c87ba63bbc2954d56f2755fdc2232204c7f7d (patch) | |
| tree | 59b800bb54002457ab4d26fe48411fb99e2a46cd /base/debug | |
| parent | f65e54f3f7466f8734351d6c917b0d571057cdef (diff) | |
| download | chromium_src-065c87ba63bbc2954d56f2755fdc2232204c7f7d.zip chromium_src-065c87ba63bbc2954d56f2755fdc2232204c7f7d.tar.gz chromium_src-065c87ba63bbc2954d56f2755fdc2232204c7f7d.tar.bz2 | |
Fix trace event macro naming issue
Review URL: https://chromiumcodereview.appspot.com/10908183
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155955 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/debug')
| -rw-r--r-- | base/debug/trace_event.h | 8 | ||||
| -rw-r--r-- | base/debug/trace_event_unittest.cc | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/base/debug/trace_event.h b/base/debug/trace_event.h index d73bb0a..804b4681 100644 --- a/base/debug/trace_event.h +++ b/base/debug/trace_event.h @@ -422,18 +422,18 @@ // ASYNC_BEGIN event above. The |step| param identifies this step within the // async event. This should be called at the beginning of the next phase of an // asynchronous operation. -#define TRACE_EVENT_ASYNC_BEGIN_STEP0(category, name, id, step) \ +#define TRACE_EVENT_ASYNC_STEP0(category, name, id, step) \ INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, \ category, name, id, TRACE_EVENT_FLAG_NONE, "step", step) -#define TRACE_EVENT_ASYNC_BEGIN_STEP1(category, name, id, step, \ +#define TRACE_EVENT_ASYNC_STEP1(category, name, id, step, \ arg1_name, arg1_val) \ INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, \ category, name, id, TRACE_EVENT_FLAG_NONE, "step", step, \ arg1_name, arg1_val) -#define TRACE_EVENT_COPY_ASYNC_BEGIN_STEP0(category, name, id, step) \ +#define TRACE_EVENT_COPY_ASYNC_STEP0(category, name, id, step) \ INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, \ category, name, id, TRACE_EVENT_FLAG_COPY, "step", step) -#define TRACE_EVENT_COPY_ASYNC_BEGIN_STEP1(category, name, id, step, \ +#define TRACE_EVENT_COPY_ASYNC_STEP1(category, name, id, step, \ arg1_name, arg1_val) \ INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, \ category, name, id, TRACE_EVENT_FLAG_COPY, "step", step, \ diff --git a/base/debug/trace_event_unittest.cc b/base/debug/trace_event_unittest.cc index 1f358fb..75a6ce4 100644 --- a/base/debug/trace_event_unittest.cc +++ b/base/debug/trace_event_unittest.cc @@ -352,9 +352,9 @@ void TraceWithAllMacroVariants(WaitableEvent* task_complete_event) { "name1", "value1", "name2", "value2"); - TRACE_EVENT_ASYNC_BEGIN_STEP0("all", "TRACE_EVENT_ASYNC_BEGIN_STEP0 call", + TRACE_EVENT_ASYNC_STEP0("all", "TRACE_EVENT_ASYNC_STEP0 call", 5, "step1"); - TRACE_EVENT_ASYNC_BEGIN_STEP1("all", "TRACE_EVENT_ASYNC_BEGIN_STEP1 call", + TRACE_EVENT_ASYNC_STEP1("all", "TRACE_EVENT_ASYNC_STEP1 call", 5, "step2", "name1", "value1"); TRACE_EVENT_ASYNC_END0("all", "TRACE_EVENT_ASYNC_END0 call", 5); @@ -483,11 +483,11 @@ void ValidateAllTraceMacrosCreatedData(const ListValue& trace_parsed) { EXPECT_SUB_FIND_("name2"); EXPECT_SUB_FIND_("value2"); - EXPECT_FIND_("TRACE_EVENT_ASYNC_BEGIN_STEP0 call"); + EXPECT_FIND_("TRACE_EVENT_ASYNC_STEP0 call"); EXPECT_SUB_FIND_("id"); EXPECT_SUB_FIND_("5"); EXPECT_SUB_FIND_("step1"); - EXPECT_FIND_("TRACE_EVENT_ASYNC_BEGIN_STEP1 call"); + EXPECT_FIND_("TRACE_EVENT_ASYNC_STEP1 call"); EXPECT_SUB_FIND_("id"); EXPECT_SUB_FIND_("5"); EXPECT_SUB_FIND_("step2"); @@ -1026,7 +1026,7 @@ TEST_F(TraceEventTestFixture, AsyncBeginEndEvents) { unsigned long long id = 0xfeedbeeffeedbeefull; TRACE_EVENT_ASYNC_BEGIN0( "cat", "name1", id); - TRACE_EVENT_ASYNC_BEGIN_STEP0( "cat", "name1", id, "step1"); + TRACE_EVENT_ASYNC_STEP0( "cat", "name1", id, "step1"); TRACE_EVENT_ASYNC_END0("cat", "name1", id); TRACE_EVENT_BEGIN0( "cat", "name2"); TRACE_EVENT_ASYNC_BEGIN0( "cat", "name3", 0); |