prefix struct & functions in census_tracing.h per ctiller's suggestion.

src/core/statistics/census_rpc_stats.c

@@ -141,7 +141,7 @@ static void record_stats(census_ht* store, census_op_id op_id,
                          const census_rpc_stats* stats) {
   gpr_mu_lock(&g_mu);
   if (store != NULL) {
-    trace_obj* trace = NULL;
+    census_trace_obj* trace = NULL;
     census_internal_lock_trace_store();
     trace = census_get_trace_obj_locked(op_id);
     if (trace != NULL) {

src/core/statistics/census_tracing.c

@@ -44,10 +44,10 @@
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
 
-void trace_obj_destroy(trace_obj* obj) {
-  trace_annotation* p = obj->annotations;
+void census_trace_obj_destroy(census_trace_obj* obj) {
+  census_trace_annotation* p = obj->annotations;
   while (p != NULL) {
-    trace_annotation* next = p->next;
+    census_trace_annotation* next = p->next;
     gpr_free(p);
     p = next;
   }
@@ -55,7 +55,9 @@ void trace_obj_destroy(trace_obj* obj) {
   gpr_free(obj);
 }
 
-static void delete_trace_obj(void* obj) { trace_obj_destroy((trace_obj*)obj); }
+static void delete_trace_obj(void* obj) {
+  census_trace_obj_destroy((census_trace_obj*)obj);
+}
 
 static const census_ht_option ht_opt = {
     CENSUS_HT_UINT64 /* key type*/, 571 /* n_of_buckets */, NULL /* hash */,
@@ -87,8 +89,8 @@ static void init_mutex_once(void) {
 census_op_id census_tracing_start_op(void) {
   gpr_mu_lock(&g_mu);
   {
-    trace_obj* ret = (trace_obj*)gpr_malloc(sizeof(trace_obj));
-    memset(ret, 0, sizeof(trace_obj));
+    census_trace_obj* ret = gpr_malloc(sizeof(census_trace_obj));
+    memset(ret, 0, sizeof(census_trace_obj));
     g_id++;
     memcpy(&ret->id, &g_id, sizeof(census_op_id));
     ret->rpc_stats.cnt = 1;
@@ -102,7 +104,7 @@ census_op_id census_tracing_start_op(void) {
 
 int census_add_method_tag(census_op_id op_id, const char* method) {
   int ret = 0;
-  trace_obj* trace = NULL;
+  census_trace_obj* trace = NULL;
   gpr_mu_lock(&g_mu);
   trace = census_ht_find(g_trace_store, op_id_as_key(&op_id));
   if (trace == NULL) {
@@ -115,11 +117,11 @@ int census_add_method_tag(census_op_id op_id, const char* method) {
 }
 
 void census_tracing_print(census_op_id op_id, const char* anno_txt) {
-  trace_obj* trace = NULL;
+  census_trace_obj* trace = NULL;
   gpr_mu_lock(&g_mu);
   trace = census_ht_find(g_trace_store, op_id_as_key(&op_id));
   if (trace != NULL) {
-    trace_annotation* anno = gpr_malloc(sizeof(trace_annotation));
+    census_trace_annotation* anno = gpr_malloc(sizeof(census_trace_annotation));
     anno->ts = gpr_now();
     {
       char* d = anno->txt;
@@ -137,7 +139,7 @@ void census_tracing_print(census_op_id op_id, const char* anno_txt) {
 }
 
 void census_tracing_end_op(census_op_id op_id) {
-  trace_obj* trace = NULL;
+  census_trace_obj* trace = NULL;
   gpr_mu_lock(&g_mu);
   trace = census_ht_find(g_trace_store, op_id_as_key(&op_id));
   if (trace != NULL) {
@@ -180,33 +182,34 @@ void census_internal_lock_trace_store(void) { gpr_mu_lock(&g_mu); }
 
 void census_internal_unlock_trace_store(void) { gpr_mu_unlock(&g_mu); }
 
-trace_obj* census_get_trace_obj_locked(census_op_id op_id) {
+census_trace_obj* census_get_trace_obj_locked(census_op_id op_id) {
   if (g_trace_store == NULL) {
     gpr_log(GPR_ERROR, "Census trace store is not initialized.");
     return NULL;
   }
-  return (trace_obj*)census_ht_find(g_trace_store, op_id_as_key(&op_id));
+  return (census_trace_obj*)census_ht_find(g_trace_store, op_id_as_key(&op_id));
 }
 
-const char* census_get_trace_method_name(const trace_obj* trace) {
+const char* census_get_trace_method_name(const census_trace_obj* trace) {
   return trace->method;
 }
 
-static trace_annotation* dup_annotation_chain(trace_annotation* from) {
-  trace_annotation *ret = NULL;
-  trace_annotation **to = &ret;
+static census_trace_annotation* dup_annotation_chain(
+    census_trace_annotation* from) {
+  census_trace_annotation *ret = NULL;
+  census_trace_annotation **to = &ret;
   for (; from != NULL; from = from->next) {
-    *to = gpr_malloc(sizeof(trace_annotation));
-    memcpy(*to, from, sizeof(trace_annotation));
+    *to = gpr_malloc(sizeof(census_trace_annotation));
+    memcpy(*to, from, sizeof(census_trace_annotation));
     to = &(*to)->next;
   }
   return ret;
 }
 
-static trace_obj* trace_obj_dup(trace_obj* from) {
-  trace_obj* to = NULL;
+static census_trace_obj* trace_obj_dup(census_trace_obj* from) {
+  census_trace_obj* to = NULL;
   GPR_ASSERT(from != NULL);
-  to = gpr_malloc(sizeof(trace_obj));
+  to = gpr_malloc(sizeof(census_trace_obj));
   to->id = from->id;
   to->ts = from->ts;
   to->rpc_stats = from->rpc_stats;
@@ -215,8 +218,8 @@ static trace_obj* trace_obj_dup(trace_obj* from) {
   return to;
 }
 
-trace_obj** census_get_active_ops(int* num_active_ops) {
-  trace_obj** ret = NULL;
+census_trace_obj** census_get_active_ops(int* num_active_ops) {
+  census_trace_obj** ret = NULL;
   gpr_mu_lock(&g_mu);
   if (g_trace_store != NULL) {
     size_t n = 0;
@@ -224,9 +227,9 @@ trace_obj** census_get_active_ops(int* num_active_ops) {
     *num_active_ops = (int)n;
     if (n != 0 ) {
       size_t i = 0;
-      ret = gpr_malloc(sizeof(trace_obj *) * n);
+      ret = gpr_malloc(sizeof(census_trace_obj *) * n);
       for (i = 0; i < n; i++) {
-        ret[i] = trace_obj_dup((trace_obj*)all_kvs[i].v);
+        ret[i] = trace_obj_dup((census_trace_obj*)all_kvs[i].v);
       }
     }
     gpr_free(all_kvs);

src/core/statistics/census_tracing.h

@@ -47,22 +47,22 @@ extern "C" {
 #endif
 
 /* Struct for a trace annotation. */
-typedef struct trace_annotation {
+typedef struct census_trace_annotation {
   gpr_timespec ts;                            /* timestamp of the annotation */
   char txt[CENSUS_MAX_ANNOTATION_LENGTH + 1]; /* actual txt annotation */
-  struct trace_annotation* next;
-} trace_annotation;
+  struct census_trace_annotation* next;
+} census_trace_annotation;
 
-typedef struct trace_obj {
+typedef struct census_trace_obj {
   census_op_id id;
   gpr_timespec ts;
   census_rpc_stats rpc_stats;
   char* method;
-  trace_annotation* annotations;
-} trace_obj;
+  census_trace_annotation* annotations;
+} census_trace_obj;
 
 /* Deletes trace object. */
-void trace_obj_destroy(trace_obj* obj);
+void census_trace_obj_destroy(census_trace_obj* obj);
 
 /* Initializes trace store. This function is thread safe. */
 void census_tracing_init(void);
@@ -73,7 +73,7 @@ void census_tracing_shutdown(void);
 /* Gets trace obj corresponding to the input op_id. Returns NULL if trace store
    is not initialized or trace obj is not found. Requires trace store being
    locked before calling this function. */
-trace_obj* census_get_trace_obj_locked(census_op_id op_id);
+census_trace_obj* census_get_trace_obj_locked(census_op_id op_id);
 
 /* The following two functions acquire and release the trace store global lock.
    They are for census internal use only. */
@@ -81,13 +81,13 @@ void census_internal_lock_trace_store(void);
 void census_internal_unlock_trace_store(void);
 
 /* Gets method name associated with the input trace object. */
-const char* census_get_trace_method_name(const trace_obj* trace);
+const char* census_get_trace_method_name(const census_trace_obj* trace);
 
 /* Returns an array of pointers to trace objects of currently active operations
    and fills in number of active operations. Returns NULL if there are no active
    operations.
    Caller owns the returned objects. */
-trace_obj** census_get_active_ops(int* num_active_ops);
+census_trace_obj** census_get_active_ops(int* num_active_ops);
 
 #ifdef __cplusplus
 }

test/core/statistics/trace_test.c

@@ -181,7 +181,7 @@ static int ids_equal(census_op_id id1, census_op_id id2) {
 
 static void test_get_active_ops(void) {
   census_op_id id_1, id_2, id_3;
-  trace_obj** active_ops;
+  census_trace_obj** active_ops;
   const char* annotation_txt[] = {"annotation 1", "a2"};
   int i = 0;
   int n = 0;
@@ -200,11 +200,11 @@ static void test_get_active_ops(void) {
   GPR_ASSERT(active_ops != NULL);
   GPR_ASSERT(n == 1);
   GPR_ASSERT(ids_equal(active_ops[0]->id, id_1));
-  trace_obj_destroy(active_ops[0]);
+  census_trace_obj_destroy(active_ops[0]);
   gpr_free(active_ops);
   active_ops = NULL;
 
-  /* Start the second and third ops */
+  /* Start the second and the third ops */
   id_2 = census_tracing_start_op();
   census_add_method_tag(id_2, "foo_2");
   id_3 = census_tracing_start_op();
@@ -213,7 +213,7 @@ static void test_get_active_ops(void) {
   active_ops = census_get_active_ops(&n);
   GPR_ASSERT(n == 3);
   for (i = 0; i < 3; i++) {
-    trace_obj_destroy(active_ops[i]);
+    census_trace_obj_destroy(active_ops[i]);
   }
   gpr_free(active_ops);
   active_ops = NULL;
@@ -227,7 +227,7 @@ static void test_get_active_ops(void) {
   GPR_ASSERT(active_ops != NULL);
   GPR_ASSERT(n == 2);
   for (i = 0; i < 2; i++) {
-    trace_obj_destroy(active_ops[i]);
+    census_trace_obj_destroy(active_ops[i]);
   }
   gpr_free(active_ops);
   active_ops = NULL;