diff options
| author | Benjamin Peterson <benjamin@dropbox.com> | 2019-05-03 08:11:00 -0700 |
|---|---|---|
| committer | Bo Hu <bohu@google.com> | 2020-05-12 17:18:05 +0000 |
| commit | 0d80ea35ba09d0462ca13f236cc9ddc3fb749c57 (patch) | |
| tree | 9f364a343878337ab2e3fb8af6d3430f4bd5ff71 | |
| parent | e98d8e08c4aefff66cf36fe84236efd9cfcacdd0 (diff) | |
| download | grpc-grpc-aosp-emu-30-release.tar.gz | |
Rename gettid() functions.aosp-emu-30-release
BUG: 152456395
BUG: 146226835
glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts.
Change-Id: I7d260578d67232f94076c61e7c7ee651529d16ee
| -rw-r--r-- | src/core/lib/gpr/log_linux.cc | 4 | ||||
| -rw-r--r-- | src/core/lib/gpr/log_posix.cc | 4 | ||||
| -rw-r--r-- | src/core/lib/iomgr/ev_epollex_linux.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc index 561276f0c2..8b597b4cf2 100644 --- a/src/core/lib/gpr/log_linux.cc +++ b/src/core/lib/gpr/log_linux.cc @@ -40,7 +40,7 @@ #include <time.h> #include <unistd.h> -static long gettid(void) { return syscall(__NR_gettid); } +static long sys_gettid(void) { return syscall(__NR_gettid); } void gpr_log(const char* file, int line, gpr_log_severity severity, const char* format, ...) { @@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) { gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); struct tm tm; static __thread long tid = 0; - if (tid == 0) tid = gettid(); + if (tid == 0) tid = sys_gettid(); timer = static_cast<time_t>(now.tv_sec); final_slash = strrchr(args->file, '/'); diff --git a/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc index b6edc14ab6..2f7c6ce376 100644 --- a/src/core/lib/gpr/log_posix.cc +++ b/src/core/lib/gpr/log_posix.cc @@ -31,7 +31,7 @@ #include <string.h> #include <time.h> -static intptr_t gettid(void) { return (intptr_t)pthread_self(); } +static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); } void gpr_log(const char* file, int line, gpr_log_severity severity, const char* format, ...) { @@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) { char* prefix; gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]", gpr_log_severity_string(args->severity), time_buffer, - (int)(now.tv_nsec), gettid(), display_file, args->line); + (int)(now.tv_nsec), sys_gettid(), display_file, args->line); fprintf(stderr, "%-70s %s\n", prefix, args->message); gpr_free(prefix); diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc index 08116b3ab5..76f5984431 100644 --- a/src/core/lib/iomgr/ev_epollex_linux.cc +++ b/src/core/lib/iomgr/ev_epollex_linux.cc @@ -1102,7 +1102,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, } #ifndef NDEBUG -static long gettid(void) { return syscall(__NR_gettid); } +static long sys_gettid(void) { return syscall(__NR_gettid); } #endif /* pollset->mu lock must be held by the caller before calling this. @@ -1122,7 +1122,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, #define WORKER_PTR (&worker) #endif #ifndef NDEBUG - WORKER_PTR->originator = gettid(); + WORKER_PTR->originator = sys_gettid(); #endif if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { gpr_log(GPR_INFO, |