diff options
author | Craig Tiller <craig.tiller@gmail.com> | 2015-02-17 22:29:04 -0800 |
---|---|---|
committer | Craig Tiller <craig.tiller@gmail.com> | 2015-02-17 22:29:04 -0800 |
commit | 7bd5ab10552cb12302aa563c2226bfb2eee1da3f (patch) | |
tree | cfb952b2fec4701027a5edc1d5a0b41938056757 /include | |
parent | 1ece67cba24c9872ae8fbd2218c57bac8ff9794d (diff) | |
parent | 52342b39501b0c9afbd68c25697d7af6118d7f9d (diff) |
Merge github.com:grpc/grpc into c++api
Conflicts:
src/core/surface/server.c
Diffstat (limited to 'include')
-rw-r--r-- | include/grpc/grpc.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/grpc/grpc.h b/include/grpc/grpc.h index 705fb9d115..621740e038 100644 --- a/include/grpc/grpc.h +++ b/include/grpc/grpc.h @@ -590,15 +590,19 @@ void grpc_server_start(grpc_server *server); /* Begin shutting down a server. After completion, no new calls or connections will be admitted. - Existing calls will be allowed to complete. */ + Existing calls will be allowed to complete. + Shutdown is idempotent. */ void grpc_server_shutdown(grpc_server *server); /* As per grpc_server_shutdown, but send a GRPC_SERVER_SHUTDOWN event when - there are no more calls being serviced. */ + there are no more calls being serviced. + Shutdown is idempotent, and all tags will be notified at once if multiple + grpc_server_shutdown_and_notify calls are made. */ void grpc_server_shutdown_and_notify(grpc_server *server, void *tag); /* Destroy a server. - Forcefully cancels all existing calls. */ + Forcefully cancels all existing calls. + Implies grpc_server_shutdown() if one was not previously performed. */ void grpc_server_destroy(grpc_server *server); #ifdef __cplusplus |