diff options
| author | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-11 04:22:34 +0000 |
|---|---|---|
| committer | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-11 04:22:34 +0000 |
| commit | 787f5e460f6265f961f88b75391edeb6eeb8a720 (patch) | |
| tree | 4bd626c508e2b76b83a2d7131c832f0cac70c52c /ipc/ipc_channel.h | |
| parent | 29dd580cd7a471d5760649a8546459f31382244b (diff) | |
| download | chromium_src-787f5e460f6265f961f88b75391edeb6eeb8a720.zip chromium_src-787f5e460f6265f961f88b75391edeb6eeb8a720.tar.gz chromium_src-787f5e460f6265f961f88b75391edeb6eeb8a720.tar.bz2 | |
Revert 227999 "Alternative workaround for mac kernel bug."
> Alternative workaround for mac kernel bug.
>
> BUG=298276
>
> Review URL: https://codereview.chromium.org/25325002
This change seemed to cause the Mac ASAN bot to timeout when running
the ipc_tests.
TBR=hubbe@chromium.org
Review URL: https://codereview.chromium.org/26384003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228110 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_channel.h')
| -rw-r--r-- | ipc/ipc_channel.h | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/ipc/ipc_channel.h b/ipc/ipc_channel.h index 7e09a80..f65a62b 100644 --- a/ipc/ipc_channel.h +++ b/ipc/ipc_channel.h @@ -75,22 +75,15 @@ class IPC_EXPORT Channel : public Sender { #endif }; - // Messages internal to the IPC implementation are defined here. - // Uses Maximum value of message type (uint16), to avoid conflicting - // with normal message types, which are enumeration constants starting from 0. + // The Hello message is internal to the Channel class. It is sent + // by the peer when the channel is connected. The message contains + // just the process id (pid). The message has a special routing_id + // (MSG_ROUTING_NONE) and type (HELLO_MESSAGE_TYPE). enum { - // The Hello message is sent by the peer when the channel is connected. - // The message contains just the process id (pid). - // The message has a special routing_id (MSG_ROUTING_NONE) - // and type (HELLO_MESSAGE_TYPE). - HELLO_MESSAGE_TYPE = kuint16max, - // The CLOSE_FD_MESSAGE_TYPE is used in the IPC class to - // work around a bug in sendmsg() on Mac. When an FD is sent - // over the socket, a CLOSE_FD_MESSAGE is sent with hops = 2. - // The client will return the message with hops = 1, *after* it - // has received the message that contains the FD. When we - // receive it again on the sender side, we close the FD. - CLOSE_FD_MESSAGE_TYPE = HELLO_MESSAGE_TYPE - 1 + HELLO_MESSAGE_TYPE = kuint16max // Maximum value of message type (uint16), + // to avoid conflicting with normal + // message types, which are enumeration + // constants starting from 0. }; // The maximum message size in bytes. Attempting to receive a message of this |