aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/lib/profiling
diff options
context:
space:
mode:
authorGravatar yang-g <yangg@google.com>2018-03-15 11:19:15 -0700
committerGravatar yang-g <yangg@google.com>2018-03-15 11:19:15 -0700
commite05618f379a5f2339da3e600984d64ffbf3dd745 (patch)
tree46f7310e6707d38a09f00949179ac3aa9b9fb8ed /src/core/lib/profiling
parente5821cdad2a45072a0b023a8ea003cff4f03791f (diff)
Make scope name unique and add missing header.
Diffstat (limited to 'src/core/lib/profiling')
-rw-r--r--src/core/lib/profiling/basic_timers.cc1
-rw-r--r--src/core/lib/profiling/timers.h9
2 files changed, 7 insertions, 3 deletions
diff --git a/src/core/lib/profiling/basic_timers.cc b/src/core/lib/profiling/basic_timers.cc
index 43384fd0ca..8be5508919 100644
--- a/src/core/lib/profiling/basic_timers.cc
+++ b/src/core/lib/profiling/basic_timers.cc
@@ -26,6 +26,7 @@
#include <grpc/support/log.h>
#include <grpc/support/sync.h>
#include <grpc/support/time.h>
+#include <inttypes.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/core/lib/profiling/timers.h b/src/core/lib/profiling/timers.h
index d0188b5054..7ff72783ec 100644
--- a/src/core/lib/profiling/timers.h
+++ b/src/core/lib/profiling/timers.h
@@ -82,9 +82,12 @@ class ProfileScope {
};
} // namespace grpc
-#define GPR_TIMER_SCOPE(tag, important) \
- ::grpc::ProfileScope _profile_scope_##__LINE__((tag), (important), __FILE__, \
- __LINE__)
+#define GPR_TIMER_SCOPE_NAME_INTERNAL(prefix, line) prefix##line
+#define GPR_TIMER_SCOPE_NAME(prefix, line) \
+ GPR_TIMER_SCOPE_NAME_INTERNAL(prefix, line)
+#define GPR_TIMER_SCOPE(tag, important) \
+ ::grpc::ProfileScope GPR_TIMER_SCOPE_NAME(_profile_scope_, __LINE__)( \
+ (tag), (important), __FILE__, __LINE__)
#endif /* at least one profiler requested. */