aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/lib/profiling
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-10-11 20:55:06 -0700
committerGravatar Craig Tiller <ctiller@google.com>2017-10-11 20:55:06 -0700
commitd0703a65f17f34ded3556531ea06cd5c005aa0a9 (patch)
treeb5aa2c81595721c2fc350893d78bc1b8f7ecb43c /src/core/lib/profiling
parent6b7ffa01b1a962ccc7249de2c642af698aa60d26 (diff)
Get latency profiles back up and working
Diffstat (limited to 'src/core/lib/profiling')
-rw-r--r--src/core/lib/profiling/basic_timers.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/lib/profiling/basic_timers.cc b/src/core/lib/profiling/basic_timers.cc
index ab9d60481c..0ae7d7f600 100644
--- a/src/core/lib/profiling/basic_timers.cc
+++ b/src/core/lib/profiling/basic_timers.cc
@@ -209,9 +209,9 @@ static void init_output() {
static void rotate_log() {
/* Using malloc here, as this code could end up being called by gpr_malloc */
- gpr_timer_log *new = malloc(sizeof(*new));
+ gpr_timer_log *log = static_cast<gpr_timer_log *>(malloc(sizeof(*log)));
gpr_once_init(&g_once_init, init_output);
- new->num_entries = 0;
+ log->num_entries = 0;
pthread_mutex_lock(&g_mu);
if (g_thread_log != NULL) {
timer_log_remove(&g_in_progress_logs, g_thread_log);
@@ -221,9 +221,9 @@ static void rotate_log() {
} else {
g_thread_id = g_next_thread_id++;
}
- timer_log_push_back(&g_in_progress_logs, new);
+ timer_log_push_back(&g_in_progress_logs, log);
pthread_mutex_unlock(&g_mu);
- g_thread_log = new;
+ g_thread_log = log;
}
static void gpr_timers_log_add(const char *tagstr, marker_type type,