From 684643ff0ab0760bb45195fb4396e4bef5dedcfc Mon Sep 17 00:00:00 2001 From: yang-g Date: Wed, 13 Feb 2019 11:02:48 -0800 Subject: [PATCH] Test fixing php --- include/grpc/grpc.h | 3 +++ src/core/lib/surface/init.h | 1 - src/php/ext/grpc/php_grpc.c | 1 + test/core/util/test_config.cc | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/grpc/grpc.h b/include/grpc/grpc.h index 3cb9cf85318..e6988f489f2 100644 --- a/include/grpc/grpc.h +++ b/include/grpc/grpc.h @@ -86,6 +86,9 @@ GRPCAPI void grpc_shutdown(void); part of stabilizing the fork support API, as tracked in https://github.com/grpc/grpc/issues/15334 */ GRPCAPI int grpc_is_initialized(void); +/** EXPERIMENTAL. Wait for grpc_shutdown to finish if it is in process. + This is only for wrapped language to use now. */ +GRPCAPI void grpc_maybe_wait_for_async_shutdown(void); /** Return a string representing the current version of grpc */ GRPCAPI const char* grpc_version_string(void); diff --git a/src/core/lib/surface/init.h b/src/core/lib/surface/init.h index 6eaa488d054..193f51447d9 100644 --- a/src/core/lib/surface/init.h +++ b/src/core/lib/surface/init.h @@ -22,6 +22,5 @@ void grpc_register_security_filters(void); void grpc_security_pre_init(void); void grpc_security_init(void); -void grpc_maybe_wait_for_async_shutdown(void); #endif /* GRPC_CORE_LIB_SURFACE_INIT_H */ diff --git a/src/php/ext/grpc/php_grpc.c b/src/php/ext/grpc/php_grpc.c index 111c6f4867d..256efad37a8 100644 --- a/src/php/ext/grpc/php_grpc.c +++ b/src/php/ext/grpc/php_grpc.c @@ -362,6 +362,7 @@ PHP_MSHUTDOWN_FUNCTION(grpc) { grpc_shutdown_timeval(TSRMLS_C); grpc_php_shutdown_completion_queue(TSRMLS_C); grpc_shutdown(); + grpc_maybe_wait_for_async_shutdown(); GRPC_G(initialized) = 0; } return SUCCESS; diff --git a/test/core/util/test_config.cc b/test/core/util/test_config.cc index 0c0492fdbbd..0caca1b164c 100644 --- a/test/core/util/test_config.cc +++ b/test/core/util/test_config.cc @@ -25,6 +25,7 @@ #include #include +#include #include #include