aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-03-21 08:49:56 -0700
committerGravatar Craig Tiller <ctiller@google.com>2016-03-21 08:49:56 -0700
commitd13178a2946e34fd5a084a6d56d3335269e97e41 (patch)
treecba22be0b3285536db7cb2614a8df8e660a4c813 /src
parent5389dc334ebf0c9bd82126238335177fe4612297 (diff)
parente415ca903e1fe5ef4573b355a89e53a81848aaad (diff)
Merge branch 'fix_something' of github.com:ctiller/grpc into fix_something
Diffstat (limited to 'src')
-rw-r--r--src/core/iomgr/wakeup_fd_pipe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/iomgr/wakeup_fd_pipe.c b/src/core/iomgr/wakeup_fd_pipe.c
index d1ed505875..dd2fd1f057 100644
--- a/src/core/iomgr/wakeup_fd_pipe.c
+++ b/src/core/iomgr/wakeup_fd_pipe.c
@@ -41,9 +41,10 @@
#include <string.h>
#include <unistd.h>
-#include "src/core/iomgr/socket_utils_posix.h"
#include <grpc/support/log.h>
+#include "src/core/iomgr/socket_utils_posix.h"
+
static void pipe_init(grpc_wakeup_fd* fd_info) {
int pipefd[2];
/* TODO(klempner): Make this nonfatal */
@@ -52,7 +53,6 @@ static void pipe_init(grpc_wakeup_fd* fd_info) {
gpr_log(GPR_ERROR, "pipe creation failed (%d): %s", errno, strerror(errno));
abort();
}
- GPR_ASSERT(0 == pipe(pipefd));
GPR_ASSERT(grpc_set_socket_nonblocking(pipefd[0], 1));
GPR_ASSERT(grpc_set_socket_nonblocking(pipefd[1], 1));
fd_info->read_fd = pipefd[0];