Commit ce44fef5 authored by morrita's avatar morrita Committed by Commit bot

Refactoring: Let ChannelPosix adopt ScopedFD.

This gets rid of raw close() call usign base::ScopedFD.
Ownership of FDs become clearer.

This is a preparation for kiling base::FileDescriptor.

R=jam@chromium.org, agl@chromium.org
BUG=415294

Review URL: https://codereview.chromium.org/602193004

Cr-Commit-Position: refs/heads/master@{#297285}
parent 98a07838
This diff is collapsed.
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "base/files/scoped_file.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/process/process.h" #include "base/process/process.h"
#include "ipc/file_descriptor_set_posix.h" #include "ipc/file_descriptor_set_posix.h"
...@@ -152,20 +153,20 @@ class IPC_EXPORT ChannelPosix : public Channel, ...@@ -152,20 +153,20 @@ class IPC_EXPORT ChannelPosix : public Channel,
// File descriptor we're listening on for new connections if we listen // File descriptor we're listening on for new connections if we listen
// for connections. // for connections.
int server_listen_pipe_; base::ScopedFD server_listen_pipe_;
// The pipe used for communication. // The pipe used for communication.
int pipe_; base::ScopedFD pipe_;
// For a server, the client end of our socketpair() -- the other end of our // For a server, the client end of our socketpair() -- the other end of our
// pipe_ that is passed to the client. // pipe_ that is passed to the client.
int client_pipe_; base::ScopedFD client_pipe_;
mutable base::Lock client_pipe_lock_; // Lock that protects |client_pipe_|. mutable base::Lock client_pipe_lock_; // Lock that protects |client_pipe_|.
#if defined(IPC_USES_READWRITE) #if defined(IPC_USES_READWRITE)
// Linux/BSD use a dedicated socketpair() for passing file descriptors. // Linux/BSD use a dedicated socketpair() for passing file descriptors.
int fd_pipe_; base::ScopedFD fd_pipe_;
int remote_fd_pipe_; base::ScopedFD remote_fd_pipe_;
#endif #endif
// The "name" of our pipe. On Windows this is the global identifier for // The "name" of our pipe. On Windows this is the global identifier for
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment