summaryrefslogtreecommitdiffstats
path: root/base/tracked_objects.h
diff options
context:
space:
mode:
authorjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-07 20:27:08 +0000
committerjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-07 20:27:08 +0000
commit24f1756baceb15fec9b84482bf3ea69718d4760b (patch)
treef407096520964d4867fed4ec7f02c64c87a92be3 /base/tracked_objects.h
parentcf20483084539712d2898cd43dbec7247ea15f38 (diff)
downloadchromium_src-24f1756baceb15fec9b84482bf3ea69718d4760b.zip
chromium_src-24f1756baceb15fec9b84482bf3ea69718d4760b.tar.gz
chromium_src-24f1756baceb15fec9b84482bf3ea69718d4760b.tar.bz2
Revert 120789 - Propogate status setting for profiler to track parents
[There is a TSAN race report... so I'm reverting] This allows child processes to track ancestry, and report it to the browser process. Parent tracking is only turned on based on an environment variable. r=rtenneti Review URL: https://chromiumcodereview.appspot.com/9181002 TBR=jar@chromium.org Review URL: https://chromiumcodereview.appspot.com/9348028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120818 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/tracked_objects.h')
-rw-r--r--base/tracked_objects.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/base/tracked_objects.h b/base/tracked_objects.h
index c0674cc..9b7f111 100644
--- a/base/tracked_objects.h
+++ b/base/tracked_objects.h
@@ -442,17 +442,15 @@ class BASE_EXPORT ThreadData {
// PROFILING_ACTIVE (i.e., it can't be set to a higher level than what is
// compiled into the binary, and parent-child tracking at the
// PROFILING_CHILDREN_ACTIVE level might not be compiled in).
- static bool InitializeAndSetTrackingStatus(Status status);
-
- static Status status();
+ static bool InitializeAndSetTrackingStatus(bool status);
// Indicate if any sort of profiling is being done (i.e., we are more than
// DEACTIVATED).
- static bool TrackingStatus();
+ static bool tracking_status();
// For testing only, indicate if the status of parent-child tracking is turned
- // on. This is currently a compiled option, atop TrackingStatus().
- static bool TrackingParentChildStatus();
+ // on. This is currently a compiled option, atop tracking_status().
+ static bool tracking_parent_child_status();
// Special versions of Now() for getting times at start and end of a tracked
// run. They are super fast when tracking is disabled, and have some internal