diff options
| author | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-26 14:23:56 +0000 |
|---|---|---|
| committer | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-26 14:23:56 +0000 |
| commit | 5c0b44355d76bc88064b1363fe1591668b536da5 (patch) | |
| tree | 40ad7a3881c473a356dc8b7653b2420fb49f22e2 /base/threading | |
| parent | 7a4fa4725a1b557b178c8053c5c7dd7ea8db9141 (diff) | |
| download | chromium_src-5c0b44355d76bc88064b1363fe1591668b536da5.zip chromium_src-5c0b44355d76bc88064b1363fe1591668b536da5.tar.gz chromium_src-5c0b44355d76bc88064b1363fe1591668b536da5.tar.bz2 | |
base: Re-apply WeakPtr support for SequencedWorkerPools, fixing deadlock
This reverts the revert found here: https://codereview.chromium.org/19882002
It also fixes the deadlock that caused the revert, reported here:
http://crbug.com/261448
Patchset 1 is simply what was originally committed (and reverted). Subsequent patchsets show the fix of the deadlock problem.
BUG=165590
TBR=darin
Review URL: https://chromiumcodereview.appspot.com/20163004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/threading')
| -rw-r--r-- | base/threading/sequenced_worker_pool.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/base/threading/sequenced_worker_pool.cc b/base/threading/sequenced_worker_pool.cc index 035ef2b..d992168 100644 --- a/base/threading/sequenced_worker_pool.cc +++ b/base/threading/sequenced_worker_pool.cc @@ -1124,6 +1124,10 @@ SequencedWorkerPool::Inner::g_last_sequence_number_; // static SequencedWorkerPool::SequenceToken SequencedWorkerPool::GetSequenceTokenForCurrentThread() { + // Don't construct lazy instance on check. + if (g_lazy_tls_ptr == NULL) + return SequenceToken(); + SequencedWorkerPool::SequenceToken* token = g_lazy_tls_ptr.Get().Get(); if (!token) return SequenceToken(); |