diff options
| author | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 17:09:21 +0000 |
|---|---|---|
| committer | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 17:09:21 +0000 |
| commit | dbe5d207423cafcd99684cef2f119a7e197798d3 (patch) | |
| tree | 2e19e0b01436955084b24f5ad701d3bf6abda538 /base/location.h | |
| parent | 1fd253983318446dcaebb317d7767ba0c403bd58 (diff) | |
| download | chromium_src-dbe5d207423cafcd99684cef2f119a7e197798d3.zip chromium_src-dbe5d207423cafcd99684cef2f119a7e197798d3.tar.gz chromium_src-dbe5d207423cafcd99684cef2f119a7e197798d3.tar.bz2 | |
Revert of Revert 108752 - Support tracking of IPC messages as tasks in profiler
This is a relanding of all the cleanup found in the
original CL, without the hooks to actually monitor the
IPC calls. I'm trying to find out what caused the
ASAN bot failures by landing piecemeal (per discussion
with Joi).
The original CL was:
Support tracking of IPC messages as tasks in profiler
Also started to do more cleanup, including creating
a base/profiler directory, and moving parts of the
over-sized tracked_objects.* into that directory.
r=rtenneti
Review URL: http://codereview.chromium.org/8480014
But this CL is:
TBR=joi
Review URL: http://codereview.chromium.org/8499022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109040 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/location.h')
| -rw-r--r-- | base/location.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/base/location.h b/base/location.h index 523bfaf..2fbe62c 100644 --- a/base/location.h +++ b/base/location.h @@ -72,11 +72,13 @@ class BASE_EXPORT Location { BASE_EXPORT const void* GetProgramCounter(); // Define a macro to record the current source location. -#define FROM_HERE tracked_objects::Location( \ - __FUNCTION__, \ - __FILE__, \ - __LINE__, \ - tracked_objects::GetProgramCounter()) \ +#define FROM_HERE FROM_HERE_WITH_EXPLICIT_FUNCTION(__FUNCTION__) + +#define FROM_HERE_WITH_EXPLICIT_FUNCTION(function_name) \ + ::tracked_objects::Location(function_name, \ + __FILE__, \ + __LINE__, \ + ::tracked_objects::GetProgramCounter()) } // namespace tracked_objects |