diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-23 16:10:37 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-23 16:10:37 +0000 |
| commit | 334f65b91dfd5995ac36be18bc4d963429e1634c (patch) | |
| tree | 498f82ebde5c18636c2c6c27d05927b5538b6510 /base/debug | |
| parent | 0fbe5d660903cdf965b5982f60ac31e24e5fa236 (diff) | |
| download | chromium_src-334f65b91dfd5995ac36be18bc4d963429e1634c.zip chromium_src-334f65b91dfd5995ac36be18bc4d963429e1634c.tar.gz chromium_src-334f65b91dfd5995ac36be18bc4d963429e1634c.tar.bz2 | |
disable sampling tracing in split_link build
These variables are used directly in both DLL halves. Since it's not critical
functionality, just disable the sampling tracer in split dll build.
NOTRY=true
TBR=brettw@chromium.org
R=cpu@chromium.org
BUG=237249
Review URL: https://chromiumcodereview.appspot.com/15697008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201815 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/debug')
| -rw-r--r-- | base/debug/trace_event.h | 3 | ||||
| -rw-r--r-- | base/debug/trace_event_impl.cc | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/base/debug/trace_event.h b/base/debug/trace_event.h index dbcea29..abd3901 100644 --- a/base/debug/trace_event.h +++ b/base/debug/trace_event.h @@ -733,12 +733,15 @@ // Defines visibility for classes in trace_event.h #define TRACE_EVENT_API_CLASS_EXPORT BASE_EXPORT +// Not supported in split-dll build. http://crbug.com/237249 +#if !defined(CHROME_SPLIT_DLL) // The thread buckets for the sampling profiler. TRACE_EVENT_API_CLASS_EXPORT extern TRACE_EVENT_API_ATOMIC_WORD g_trace_state0; TRACE_EVENT_API_CLASS_EXPORT extern TRACE_EVENT_API_ATOMIC_WORD g_trace_state1; TRACE_EVENT_API_CLASS_EXPORT extern TRACE_EVENT_API_ATOMIC_WORD g_trace_state2; #define TRACE_EVENT_API_THREAD_BUCKET(thread_bucket) \ g_trace_state##thread_bucket +#endif //////////////////////////////////////////////////////////////////////////////// diff --git a/base/debug/trace_event_impl.cc b/base/debug/trace_event_impl.cc index 8e045f8..e8b3083 100644 --- a/base/debug/trace_event_impl.cc +++ b/base/debug/trace_event_impl.cc @@ -40,10 +40,13 @@ class DeleteTraceLogForTesting { } }; +// Not supported in split-dll build. http://crbug.com/237249 +#if !defined(CHROME_SPLIT_DLL) // The thread buckets for the sampling profiler. BASE_EXPORT TRACE_EVENT_API_ATOMIC_WORD g_trace_state0; BASE_EXPORT TRACE_EVENT_API_ATOMIC_WORD g_trace_state1; BASE_EXPORT TRACE_EVENT_API_ATOMIC_WORD g_trace_state2; +#endif namespace base { namespace debug { @@ -932,6 +935,8 @@ void TraceLog::SetEnabled(const CategoryFilter& category_filter, category_filter_ = CategoryFilter(category_filter); EnableIncludedCategoryGroups(); + // Not supported in split-dll build. http://crbug.com/237249 +#if !defined(CHROME_SPLIT_DLL) if (options & ENABLE_SAMPLING) { sampling_thread_.reset(new TraceSamplingThread); sampling_thread_->RegisterSampleBucket( @@ -951,6 +956,7 @@ void TraceLog::SetEnabled(const CategoryFilter& category_filter, DCHECK(false) << "failed to create thread"; } } +#endif } const CategoryFilter& TraceLog::GetCurrentCategoryFilter() { |