commit fdbd728a829569c50945908069fd8d9f8e6db3d6
author Craig Tiller <ctiller@google.com> Wed Aug 05 15:24:26 2015 -0700
committer Craig Tiller <ctiller@google.com> Wed Aug 05 15:24:26 2015 -0700
tree d94760cb637b332a895788bee92114a569a1fbec
parent 64f32dc7efe18a6fe75c71b31a36ce523290e70c

Rename constants

include/grpc/grpc.h

diff --git a/include/grpc/grpc.h b/include/grpc/grpc.h
index 0b335a0..003e1d7 100644
--- a/include/grpc/grpc.h
+++ b/include/grpc/grpc.h
@@ -358,8 +358,9 @@
 /** Propagate deadline */
 #define GRPC_PROPAGATE_DEADLINE ((gpr_uint32)1)
 /** Propagate census context */
-#define GRPC_PROPAGATE_STATS_CONTEXT ((gpr_uint32)2)
-#define GRPC_PROPAGATE_TRACING_CONTEXT ((gpr_uint32)4)
+#define GRPC_PROPAGATE_CENSUS_STATS_CONTEXT ((gpr_uint32)2)
+#define GRPC_PROPAGATE_CENSUS_TRACING_CONTEXT ((gpr_uint32)4)
+/** Propagate cancellation */
 #define GRPC_PROPAGATE_CANCELLATION ((gpr_uint32)8)
 
 /* Default propagation mask: clients of the core API are encouraged to encode
@@ -367,10 +368,10 @@
    GRPC_PROPAGATE_DEFAULTS & ~GRPC_PROPAGATE_DEADLINE to disable deadline 
    propagation. Doing so gives flexibility in the future to define new 
    propagation types that are default inherited or not. */
-#define GRPC_PROPAGATE_DEFAULTS                     \
-  ((gpr_uint32)((0xffff | GRPC_PROPAGATE_DEADLINE | \
-                 GRPC_PROPAGATE_STATS_CONTEXT |     \
-                 GRPC_PROPAGATE_TRACING_CONTEXT)))
+#define GRPC_PROPAGATE_DEFAULTS                        \
+  ((gpr_uint32)((0xffff | GRPC_PROPAGATE_DEADLINE |    \
+                 GRPC_PROPAGATE_CENSUS_STATS_CONTEXT | \
+                 GRPC_PROPAGATE_CENSUS_TRACING_CONTEXT)))
 
 /** Initialize the grpc library.
 

src/core/surface/call.c

diff --git a/src/core/surface/call.c b/src/core/surface/call.c
index 22a17f8..7ba1d54 100644
--- a/src/core/surface/call.c
+++ b/src/core/surface/call.c
@@ -374,13 +374,13 @@
     }
     /* for now GRPC_PROPAGATE_TRACING_CONTEXT *MUST* be passed with
      * GRPC_PROPAGATE_STATS_CONTEXT */
-    if (propagation_mask & GRPC_PROPAGATE_TRACING_CONTEXT) {
-      GPR_ASSERT(propagation_mask & GRPC_PROPAGATE_STATS_CONTEXT);
+    if (propagation_mask & GRPC_PROPAGATE_CENSUS_TRACING_CONTEXT) {
+      GPR_ASSERT(propagation_mask & GRPC_PROPAGATE_CENSUS_STATS_CONTEXT);
       grpc_call_context_set(call, GRPC_CONTEXT_TRACING,
                             parent_call->context[GRPC_CONTEXT_TRACING].value,
                             NULL);
     } else {
-      GPR_ASSERT(propagation_mask & GRPC_PROPAGATE_STATS_CONTEXT);
+      GPR_ASSERT(propagation_mask & GRPC_PROPAGATE_CENSUS_STATS_CONTEXT);
     }
     if (propagation_mask & GRPC_PROPAGATE_CANCELLATION) {
       call->cancellation_is_inherited = 1;