aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/surface
diff options
context:
space:
mode:
authorGravatar David Garcia Quintas <dgq@google.com>2015-04-29 09:46:33 -0700
committerGravatar David Garcia Quintas <dgq@google.com>2015-04-29 09:46:33 -0700
commit8954e90b72e69ef353eddb1fcfd4765a75b79111 (patch)
tree5feff80a6f029a8cc319d9ace21d14753ceb066f /src/core/surface
parenta9eb302abaccdd3609d81ba75434cccaed49f4fd (diff)
Integration of Systemtap (STAP) for profiling.
This commit includes a faulty Makefile to be fixed in a follow commit.
Diffstat (limited to 'src/core/surface')
-rw-r--r--src/core/surface/channel_create.c4
-rw-r--r--src/core/surface/init.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c
index 73b3670ccc..c44dcce7de 100644
--- a/src/core/surface/channel_create.c
+++ b/src/core/surface/channel_create.c
@@ -198,7 +198,7 @@ grpc_channel *grpc_channel_create(const char *target,
#define MAX_FILTERS 3
const grpc_channel_filter *filters[MAX_FILTERS];
int n = 0;
- GRPC_STAP_TIMING_NS_BEGIN(1);
+ GRPC_TIMER_BEGIN(PTAG_OTHER_BASE + 2, NULL);
filters[n++] = &grpc_client_surface_filter;
if (grpc_channel_args_is_census_enabled(args)) {
filters[n++] = &grpc_client_census_filter;
@@ -214,6 +214,6 @@ grpc_channel *grpc_channel_create(const char *target,
grpc_client_setup_create_and_attach(grpc_channel_get_channel_stack(channel),
args, mdctx, initiate_setup, done_setup,
s);
- GRPC_STAP_TIMING_NS_END(1);
+ GRPC_TIMER_END(PTAG_OTHER_BASE + 2, NULL);
return channel;
}
diff --git a/src/core/surface/init.c b/src/core/surface/init.c
index 5a119a47cc..bfee28e5fc 100644
--- a/src/core/surface/init.c
+++ b/src/core/surface/init.c
@@ -64,7 +64,7 @@ void grpc_init(void) {
grpc_iomgr_init();
grpc_tracer_init("GRPC_TRACE");
census_init();
- grpc_timers_log_global_init();
+ grpc_timers_global_init();
}
gpr_mu_unlock(&g_init_mu);
}
@@ -74,7 +74,7 @@ void grpc_shutdown(void) {
if (--g_initializations == 0) {
grpc_iomgr_shutdown();
census_shutdown();
- grpc_timers_log_global_destroy();
+ grpc_timers_global_destroy();
}
gpr_mu_unlock(&g_init_mu);
}