diff options
| author |  Sree Kuchibhotla <sreecha@users.noreply.github.com> | 2017-07-14 15:25:34 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-07-14 15:25:34 -0700 |
| commit | ac51c2aa9b6d5cef7f3b4a498c7ae8a3d60960ad (patch) | |
| tree | 768ffff2a88f33ba6aa06edaa250837b5577f29f /src | |
| parent | 5eb70d30156ed4d49a1f97d5c7a8fc71d8775c76 (diff) | |
| parent | a69878a2172e1514e9411a1e0d275f7870b80b6b (diff) | |
Merge pull request #11825 from sreecha/asan_failure
Fix memory leak in bm_cq_multiple_threads (due to not calling grpc_shutdown)
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/lib/iomgr/ev_posix.c | 4 | ||||
| -rw-r--r-- | src/core/lib/iomgr/ev_posix.h | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/ev_posix.c b/src/core/lib/iomgr/ev_posix.c index a5ae04cb5b..cff77e641c 100644 --- a/src/core/lib/iomgr/ev_posix.c +++ b/src/core/lib/iomgr/ev_posix.c @@ -121,6 +121,10 @@ void grpc_set_event_engine_test_only( g_event_engine = ev_engine; } +const grpc_event_engine_vtable *grpc_get_event_engine_test_only() { + return g_event_engine; +} + /* Call this only after calling grpc_event_engine_init() */ const char *grpc_get_poll_strategy_name() { return g_poll_strategy_name; } diff --git a/src/core/lib/iomgr/ev_posix.h b/src/core/lib/iomgr/ev_posix.h index 54c4f2ee11..0de7333843 100644 --- a/src/core/lib/iomgr/ev_posix.h +++ b/src/core/lib/iomgr/ev_posix.h @@ -153,7 +153,9 @@ void grpc_pollset_set_del_fd(grpc_exec_ctx *exec_ctx, typedef int (*grpc_poll_function_type)(struct pollfd *, nfds_t, int); extern grpc_poll_function_type grpc_poll_function; -/* This should be used for testing purposes ONLY */ +/* WARNING: The following two functions should be used for testing purposes + * ONLY */ void grpc_set_event_engine_test_only(const grpc_event_engine_vtable *); +const grpc_event_engine_vtable *grpc_get_event_engine_test_only(); #endif /* GRPC_CORE_LIB_IOMGR_EV_POSIX_H */ |