Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(868)

Unified Diff: chrome/common/service_process_util_posix.cc

Issue 6722032: fix up small race on g_signal_socket (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove suppression Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/valgrind/tsan/suppressions.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/service_process_util_posix.cc
diff --git a/chrome/common/service_process_util_posix.cc b/chrome/common/service_process_util_posix.cc
index e15d1dfae5066cbff72b249805fe1b2cd085f1e0..5592edfc56ec4d6c73bc6a6367da41aadbfa30dc 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;
« no previous file with comments | « no previous file | tools/valgrind/tsan/suppressions.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698