Merge branch 'census_active_ops' of https://github.com/maxwell-demon/grpc into census_active_ops

changes/69/217569/1
Hongyu Chen 10 years ago
commit 3bef00b276
  1. 4
      src/core/statistics/census_tracing.h
  2. 2
      test/core/statistics/trace_test.c

@ -80,11 +80,11 @@ trace_obj* census_get_trace_obj_locked(census_op_id op_id);
void census_internal_lock_trace_store(void); void census_internal_lock_trace_store(void);
void census_internal_unlock_trace_store(void); void census_internal_unlock_trace_store(void);
/* Gets method tag name associated with the input trace object. */ /* 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 trace_obj* trace);
/* Returns an array of pointers to trace objects of currently active operations /* Returns an array of pointers to trace objects of currently active operations
and fills in number of active operations. Returns NULL if there's no active and fills in number of active operations. Returns NULL if there are no active
operations. operations.
Caller owns the returned objects. */ Caller owns the returned objects. */
trace_obj** census_get_active_ops(int* num_active_ops); trace_obj** census_get_active_ops(int* num_active_ops);

@ -204,7 +204,7 @@ static void test_get_active_ops(void) {
gpr_free(active_ops); gpr_free(active_ops);
active_ops = NULL; active_ops = NULL;
/* Start the second and the third ops */ /* Start the second and third ops */
id_2 = census_tracing_start_op(); id_2 = census_tracing_start_op();
census_add_method_tag(id_2, "foo_2"); census_add_method_tag(id_2, "foo_2");
id_3 = census_tracing_start_op(); id_3 = census_tracing_start_op();

Loading…
Cancel
Save