diff options
| -rw-r--r-- | chrome/common/service_process_util_posix.cc | 4 | ||||
| -rw-r--r-- | tools/valgrind/tsan/suppressions.txt | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/chrome/common/service_process_util_posix.cc b/chrome/common/service_process_util_posix.cc index e15d1df..5592edf 100644 --- a/chrome/common/service_process_util_posix.cc +++ b/chrome/common/service_process_util_posix.cc @@ -59,6 +59,7 @@ ServiceProcessState::StateData::StateData() : set_action_(false) { } void ServiceProcessState::StateData::SignalReady() { + CHECK_EQ(g_signal_socket, -1); CHECK(MessageLoopForIO::current()->WatchFileDescriptor( sockets_[0], true, MessageLoopForIO::WATCH_READ, &watcher_, shut_down_monitor_.get())); @@ -104,6 +105,7 @@ ServiceProcessState::StateData::~StateData() { PLOG(ERROR) << "sigaction"; } } + g_signal_socket = -1; } void ServiceProcessState::CreateState() { @@ -120,7 +122,6 @@ void ServiceProcessState::CreateState() { bool ServiceProcessState::SignalReady( base::MessageLoopProxy* message_loop_proxy, Task* shutdown_task) { CHECK(state_); - CHECK_EQ(g_signal_socket, -1); scoped_ptr<Task> scoped_shutdown_task(shutdown_task); #if defined(OS_LINUX) @@ -141,7 +142,6 @@ bool ServiceProcessState::SignalReady( } void ServiceProcessState::TearDownState() { - g_signal_socket = -1; if (state_) { state_->Release(); state_ = NULL; diff --git a/tools/valgrind/tsan/suppressions.txt b/tools/valgrind/tsan/suppressions.txt index 8178d86..668f579 100644 --- a/tools/valgrind/tsan/suppressions.txt +++ b/tools/valgrind/tsan/suppressions.txt @@ -105,14 +105,6 @@ } { - bug_71695 - ThreadSanitizer:Race - ... - fun:ServiceProcessState::TearDownState* - fun:ServiceProcessState::SignalStopped* -} - -{ bug_72169a ThreadSanitizer:Race fun:base::Thread::ThreadMain* |