summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-21 00:27:54 +0000
committerrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-21 00:27:54 +0000
commitec14a18b667d1e7030fb308ac2941b13c05fd2a8 (patch)
tree02c4de236312d85e68f57d2e983aa6b3af071a42 /net
parentd582d13c0e825e11de6febf31a2d2e9a3cf8d589 (diff)
downloadchromium_src-ec14a18b667d1e7030fb308ac2941b13c05fd2a8.zip
chromium_src-ec14a18b667d1e7030fb308ac2941b13c05fd2a8.tar.gz
chromium_src-ec14a18b667d1e7030fb308ac2941b13c05fd2a8.tar.bz2
Disk cache: Move some debugging code around to avoid triggering
a tsan warning. BUG=85647 TEST=none Review URL: http://codereview.chromium.org/7201016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/disk_cache/in_flight_io.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/disk_cache/in_flight_io.cc b/net/disk_cache/in_flight_io.cc
index ba24d61..f10b4a6 100644
--- a/net/disk_cache/in_flight_io.cc
+++ b/net/disk_cache/in_flight_io.cc
@@ -55,7 +55,6 @@ void InFlightIO::OnIOComplete(BackgroundIO* operation) {
DCHECK(single_thread_ || !running_);
single_thread_ = true;
}
- running_ = true;
#endif
callback_thread_->PostTask(FROM_HERE,
@@ -67,6 +66,7 @@ void InFlightIO::OnIOComplete(BackgroundIO* operation) {
// Runs on the primary thread.
void InFlightIO::InvokeCallback(BackgroundIO* operation, bool cancel_task) {
operation->io_completed()->Wait();
+ running_ = true;
if (cancel_task)
operation->Cancel();