Last active
October 19, 2021 04:36
-
-
Save drscotthawley/8eb51af1b4c92c4f18432cb045698af7 to your computer and use it in GitHub Desktop.
Patch for GRPC to work with tensorflow, created from main grpc/ directory
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc | |
index 561276f0c2..1af0935e1f 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_sys_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 b6d13b44d1..2f491c12e3 100644 | |
--- a/src/core/lib/iomgr/ev_epollex_linux.cc | |
+++ b/src/core/lib/iomgr/ev_epollex_linux.cc | |
@@ -1103,7 +1103,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_sys_gettid); } | |
#endif | |
/* pollset->mu lock must be held by the caller before calling this. | |
@@ -1123,7 +1123,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_polling_trace.enabled()) { | |
gpr_log(GPR_INFO, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment