diff options
| author | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-08 21:30:00 +0000 |
|---|---|---|
| committer | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-08 21:30:00 +0000 |
| commit | b7c0fb6db7ae85f1c9ce1190edf5176b2eaa371b (patch) | |
| tree | 2eed041789f366b4e07a78613b0257a7e7be49b2 /base/threading/sequenced_worker_pool_unittest.cc | |
| parent | a54a0aec421fdd4dabea7a6a713f4e918e337d62 (diff) | |
| download | chromium_src-b7c0fb6db7ae85f1c9ce1190edf5176b2eaa371b.zip chromium_src-b7c0fb6db7ae85f1c9ce1190edf5176b2eaa371b.tar.gz chromium_src-b7c0fb6db7ae85f1c9ce1190edf5176b2eaa371b.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/threading/sequenced_worker_pool_unittest.cc')
| -rw-r--r-- | base/threading/sequenced_worker_pool_unittest.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/base/threading/sequenced_worker_pool_unittest.cc b/base/threading/sequenced_worker_pool_unittest.cc index f1d7ed3..eb63058 100644 --- a/base/threading/sequenced_worker_pool_unittest.cc +++ b/base/threading/sequenced_worker_pool_unittest.cc @@ -728,8 +728,6 @@ TEST_F(SequencedWorkerPoolTest, IsRunningOnCurrentThread) { scoped_refptr<SequencedWorkerPool> unused_pool = new SequencedWorkerPool(2, "unused_pool"); - EXPECT_TRUE(token1.Equals(unused_pool->GetSequenceToken())); - EXPECT_TRUE(token2.Equals(unused_pool->GetSequenceToken())); EXPECT_FALSE(pool()->RunsTasksOnCurrentThread()); EXPECT_FALSE(pool()->IsRunningSequenceOnCurrentThread(token1)); |