diff options
author | Craig Tiller <ctiller@google.com> | 2017-05-10 08:29:54 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2017-05-10 08:29:54 -0700 |
commit | a4660cba9ab73923292263ea6db6f4d48ed2366d (patch) | |
tree | 86849e6bd10b71e126c578e777d7bb2249f6f47c | |
parent | 15285fbbf90964fb4e04727478207384390497ef (diff) | |
parent | cdc97a1226cc332ac3c71fd09aa04b6295ec9bb2 (diff) |
Merge branch 'uberpoll' of github.com:ctiller/grpc into uberpoll
-rw-r--r-- | test/core/iomgr/ev_epollsig_linux_test.c | 1 | ||||
-rw-r--r-- | test/core/iomgr/fd_conservation_posix_test.c | 1 | ||||
-rw-r--r-- | test/core/iomgr/fd_posix_test.c | 1 | ||||
-rw-r--r-- | test/core/iomgr/pollset_set_test.c | 1 | ||||
-rw-r--r-- | test/core/iomgr/resolve_address_posix_test.c | 1 | ||||
-rw-r--r-- | test/core/iomgr/resolve_address_test.c | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/test/core/iomgr/ev_epollsig_linux_test.c b/test/core/iomgr/ev_epollsig_linux_test.c index efc8ed36be..45c542de4e 100644 --- a/test/core/iomgr/ev_epollsig_linux_test.c +++ b/test/core/iomgr/ev_epollsig_linux_test.c @@ -403,6 +403,7 @@ int main(int argc, char **argv) { const char *poll_strategy = NULL; grpc_test_init(argc, argv); grpc_iomgr_init(); + grpc_iomgr_start(); poll_strategy = grpc_get_poll_strategy_name(); if (poll_strategy != NULL && strcmp(poll_strategy, "epollsig") == 0) { diff --git a/test/core/iomgr/fd_conservation_posix_test.c b/test/core/iomgr/fd_conservation_posix_test.c index 6ac322bb01..f662070655 100644 --- a/test/core/iomgr/fd_conservation_posix_test.c +++ b/test/core/iomgr/fd_conservation_posix_test.c @@ -46,6 +46,7 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_iomgr_init(); + grpc_iomgr_start(); /* set max # of file descriptors to a low value, and verify we can create and destroy many more than this number diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c index d6cee8e43a..9e8fe8bffa 100644 --- a/test/core/iomgr/fd_posix_test.c +++ b/test/core/iomgr/fd_posix_test.c @@ -543,6 +543,7 @@ int main(int argc, char **argv) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_iomgr_init(); + grpc_iomgr_start(); g_pollset = gpr_zalloc(grpc_pollset_size()); grpc_pollset_init(g_pollset, &g_mu); test_grpc_fd(); diff --git a/test/core/iomgr/pollset_set_test.c b/test/core/iomgr/pollset_set_test.c index 9755a7e552..092711381d 100644 --- a/test/core/iomgr/pollset_set_test.c +++ b/test/core/iomgr/pollset_set_test.c @@ -448,6 +448,7 @@ int main(int argc, char **argv) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_iomgr_init(); + grpc_iomgr_start(); if (poll_strategy != NULL && (strcmp(poll_strategy, "epoll") == 0 || diff --git a/test/core/iomgr/resolve_address_posix_test.c b/test/core/iomgr/resolve_address_posix_test.c index 7fba0b92be..bee7036ec8 100644 --- a/test/core/iomgr/resolve_address_posix_test.c +++ b/test/core/iomgr/resolve_address_posix_test.c @@ -176,6 +176,7 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_executor_init(); grpc_iomgr_init(); + grpc_iomgr_start(); test_unix_socket(); test_unix_socket_path_name_too_long(); { diff --git a/test/core/iomgr/resolve_address_test.c b/test/core/iomgr/resolve_address_test.c index 0425c3b3f5..83f73070dc 100644 --- a/test/core/iomgr/resolve_address_test.c +++ b/test/core/iomgr/resolve_address_test.c @@ -265,6 +265,7 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_executor_init(); grpc_iomgr_init(); + grpc_iomgr_start(); test_localhost(); test_default_port(); test_non_numeric_default_port(); |