summaryrefslogtreecommitdiffstats
path: root/base/base.gypi
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-08 23:50:13 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-08 23:50:13 +0000
commit7ddc08e0882c666ce97ded90dae5133ab0934612 (patch)
tree5cf4c6812487843ba8d61f1f58809abe0cc8efb6 /base/base.gypi
parent64d44fe0d4d6d7e970ff85c1da7073cbd1667bea (diff)
downloadchromium_src-7ddc08e0882c666ce97ded90dae5133ab0934612.zip
chromium_src-7ddc08e0882c666ce97ded90dae5133ab0934612.tar.gz
chromium_src-7ddc08e0882c666ce97ded90dae5133ab0934612.tar.bz2
Revert 210434 "Revert 210433 "Revert 210423 "base: Make Sequence..."
The SequencedWorkerPool change broke CrOs (daisy) builder due to unused variable: threading/sequenced_worker_pool.cc:682:13: error: variable 'shutdown_wait_begin' reverting until that is fixed. > Revert 210433 "Revert 210423 "base: Make SequencedWorkerPool iss..." > > Undoing speculative revert. Still failed after revert. > > > Revert 210423 "base: Make SequencedWorkerPool issue globally uni..." > > > > Speculative revert for failing PageCyclerTest.FailProvisionalLoads on > > linux_clang. > > > > > base: Make SequencedWorkerPool issue globally unique SequenceTokens. > > > > > > SequencedWorkerPool currently issues SequenceTokens out of an internal member counter. This means that two different SequencedWorkerPool instances can issue identical SequenceTokens, which mucks up any attempt to distinguish sequences using only SequenceTokens. > > > > > > This change makes the SequenceTokens issued from an StaticAtomicSequenceNumber, which is globally shared amongst all SequencedWorkerPools. > > > > > > This change also makes the SequencedWorkerPool included in the nacl_untrusted builds, as it is needed for SequenceChecker and WeakPtr to work correctly. It previously was excluded because it used base/metrics. I've #ifdefed the base/metrics usage out for nacl. > > > > > > This issue is a spinoff and pre-requisite of issue 18501008: Make WeakPtr use SequenceChecker instead of ThreadChecker. > > > > > > R=akalin,darin > > > BUG=165590 > > > > > > Review URL: https://chromiumcodereview.appspot.com/18650006 > > > > TBR=tommycli@chromium.org > > > > Review URL: https://codereview.chromium.org/18271011 > > TBR=scottmg@chromium.org > > Review URL: https://codereview.chromium.org/18242008 TBR=scottmg@chromium.org Review URL: https://codereview.chromium.org/18861008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210462 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gypi')
-rw-r--r--base/base.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/base/base.gypi b/base/base.gypi
index fc7cf04..f3b16d8 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -701,6 +701,7 @@
'scoped_native_library.cc',
'files/scoped_temp_dir.cc',
'sys_info_posix.cc',
+ 'threading/sequenced_worker_pool.cc',
'third_party/dynamic_annotations/dynamic_annotations.c',
],
'sources/': [