diff --git a/src/core/lib/iomgr/ev_poll_cv_posix.h b/src/core/lib/iomgr/ev_poll_cv_posix.h index 0fd3e5bbb4e..89e4929fbb6 100644 --- a/src/core/lib/iomgr/ev_poll_cv_posix.h +++ b/src/core/lib/iomgr/ev_poll_cv_posix.h @@ -62,4 +62,4 @@ typedef struct cv_fd_table { const grpc_event_engine_vtable* grpc_init_poll_cv_posix(void); -#endif /* GRPC_CORE_LIB_IOMGR_EV_POLL_POSIX_H */ +#endif /* GRPC_CORE_LIB_IOMGR_EV_POLL_CV_POSIX_H */ diff --git a/src/core/lib/iomgr/wakeup_fd_posix.c b/src/core/lib/iomgr/wakeup_fd_posix.c index 48ed92abe89..d8eafc4192c 100644 --- a/src/core/lib/iomgr/wakeup_fd_posix.c +++ b/src/core/lib/iomgr/wakeup_fd_posix.c @@ -45,7 +45,6 @@ int grpc_allow_specialized_wakeup_fd = 1; int grpc_allow_pipe_wakeup_fd = 1; int grpc_has_wakeup_fd = 1; - void grpc_wakeup_fd_global_init(void) { if (grpc_allow_specialized_wakeup_fd && grpc_specialized_wakeup_fd_vtable.check_availability()) { @@ -59,9 +58,7 @@ void grpc_wakeup_fd_global_init(void) { } } -void grpc_wakeup_fd_global_destroy(void) { - wakeup_fd_vtable = NULL; -} +void grpc_wakeup_fd_global_destroy(void) { wakeup_fd_vtable = NULL; } grpc_error *grpc_wakeup_fd_init(grpc_wakeup_fd *fd_info) { return wakeup_fd_vtable->init(fd_info); diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 7d8a18d8fef..0777274694f 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -1027,7 +1027,7 @@ argp.add_argument('--force_default_poller', default=False, action='store_const', args = argp.parse_args() if args.force_default_poller: - _POLLING_STRATEGIES = {} + _POLLING_STRATEGIES = {'linux': ['poll-cv']} jobset.measure_cpu_costs = args.measure_cpu_costs