diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-10-05 16:24:18 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-10-05 16:24:18 -0700 |
| commit | 6a739c715321c7249ce17b3ff3fbd6594c10af2f (patch) | |
| tree | 069822e02bf4dfed492bbb345e8b7bf24029b384 /src/core/client_config | |
| parent | f747bbc04327c9ef02690cd7466ec6786967c4fe (diff) | |
| parent | d48c5a5b9feb9cfacde4741e92d6dfcdae632416 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into cq_alarm
Diffstat (limited to 'src/core/client_config')
| -rw-r--r-- | src/core/client_config/resolvers/zookeeper_resolver.c | 2 | ||||
| -rw-r--r-- | src/core/client_config/subchannel.h | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/core/client_config/resolvers/zookeeper_resolver.c b/src/core/client_config/resolvers/zookeeper_resolver.c index f640a0084a..136197d4c6 100644 --- a/src/core/client_config/resolvers/zookeeper_resolver.c +++ b/src/core/client_config/resolvers/zookeeper_resolver.c @@ -45,6 +45,7 @@ #include "src/core/client_config/resolver_registry.h" #include "src/core/iomgr/resolve_address.h" #include "src/core/support/string.h" +#include "src/core/surface/api_trace.h" #include "src/core/json/json.h" /** Zookeeper session expiration time in milliseconds */ @@ -487,6 +488,7 @@ static void zookeeper_plugin_init() { } void grpc_zookeeper_register() { + GRPC_API_TRACE("grpc_zookeeper_register(void)", 0, ()); grpc_register_plugin(zookeeper_plugin_init, NULL); } diff --git a/src/core/client_config/subchannel.h b/src/core/client_config/subchannel.h index 03e7cd0590..86b7fa5851 100644 --- a/src/core/client_config/subchannel.h +++ b/src/core/client_config/subchannel.h @@ -64,13 +64,13 @@ typedef struct grpc_subchannel_args grpc_subchannel_args; #define GRPC_SUBCHANNEL_REF_EXTRA_ARGS #endif -void grpc_subchannel_ref( - grpc_subchannel *channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); +void grpc_subchannel_ref(grpc_subchannel *channel + GRPC_SUBCHANNEL_REF_EXTRA_ARGS); void grpc_subchannel_unref(grpc_exec_ctx *exec_ctx, grpc_subchannel *channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); -void grpc_subchannel_call_ref( - grpc_subchannel_call *call GRPC_SUBCHANNEL_REF_EXTRA_ARGS); +void grpc_subchannel_call_ref(grpc_subchannel_call *call + GRPC_SUBCHANNEL_REF_EXTRA_ARGS); void grpc_subchannel_call_unref(grpc_exec_ctx *exec_ctx, grpc_subchannel_call *call GRPC_SUBCHANNEL_REF_EXTRA_ARGS); |