diff options
| author | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-02 04:14:42 +0000 |
|---|---|---|
| committer | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-02 04:14:42 +0000 |
| commit | c3498a1c9ead237b365f316b761ea3d534b671f9 (patch) | |
| tree | 7c287f6bd53347a2e91a447ce28320ae2a55fa09 /ipc | |
| parent | 09f2b5517f8cb83a2a22e0249caf3dbd07dd8d08 (diff) | |
| download | chromium_src-c3498a1c9ead237b365f316b761ea3d534b671f9.zip chromium_src-c3498a1c9ead237b365f316b761ea3d534b671f9.tar.gz chromium_src-c3498a1c9ead237b365f316b761ea3d534b671f9.tar.bz2 | |
Get service processes working on Mac and Linux.
Service processes will now launch, and attach to ipc channels.
BUG=NONE
TEST=BUILD
Review URL: http://codereview.chromium.org/6349029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73425 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_channel_posix.cc | 2 | ||||
| -rw-r--r-- | ipc/ipc_channel_proxy.cc | 2 | ||||
| -rw-r--r-- | ipc/ipc_channel_win.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc index f1aa048..9a7c55d 100644 --- a/ipc/ipc_channel_posix.cc +++ b/ipc/ipc_channel_posix.cc @@ -469,7 +469,7 @@ bool Channel::ChannelImpl::CreatePipe(const IPC::ChannelHandle& channel_handle, bool Channel::ChannelImpl::Connect() { if (server_listen_pipe_ == -1 && pipe_ == -1) { - NOTREACHED() << "Must call create on a channel before calling connect"; + DLOG(INFO) << "Must call create on a channel before calling connect"; return false; } diff --git a/ipc/ipc_channel_proxy.cc b/ipc/ipc_channel_proxy.cc index 5d23e7a..e6976ac 100644 --- a/ipc/ipc_channel_proxy.cc +++ b/ipc/ipc_channel_proxy.cc @@ -307,7 +307,7 @@ void ChannelProxy::Init(const IPC::ChannelHandle& channel_handle, // to be created immediately so that it can be accessed and passed // to other processes. Forcing it to be created immediately avoids // race conditions that may otherwise arise. - if (mode == Channel::MODE_SERVER) { + if (mode == Channel::MODE_SERVER || mode == Channel::MODE_NAMED_SERVER) { create_pipe_now = true; } #endif // defined(OS_POSIX) diff --git a/ipc/ipc_channel_win.cc b/ipc/ipc_channel_win.cc index f04191e..717cb04 100644 --- a/ipc/ipc_channel_win.cc +++ b/ipc/ipc_channel_win.cc @@ -103,7 +103,7 @@ Channel::ChannelImpl::ChannelImpl(const IPC::ChannelHandle &channel_handle, ALLOW_THIS_IN_INITIALIZER_LIST(output_state_(this)), pipe_(INVALID_HANDLE_VALUE), listener_(listener), - waiting_connect_(mode == MODE_SERVER), + waiting_connect_(mode == MODE_SERVER || mode == MODE_NAMED_SERVER), processing_incoming_(false), ALLOW_THIS_IN_INITIALIZER_LIST(factory_(this)) { switch(mode) { |