Skip to content

Instantly share code, notes, and snippets.

@nytpu

nytpu/aether_grpc.patch

Created May 4, 2020 06:03
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save nytpu/47022045f3adee98c6ee2eaeebcb5f20 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save nytpu/47022045f3adee98c6ee2eaeebcb5f20 to your computer and use it in GitHub Desktop.
Download ZIP
Fix grpc in Aether to get to compile under Linux
Raw
aether_grpc.patch
diff -ruN node_modules/grpc/binding.gyp grpc/binding.gyp
--- node_modules/grpc/binding.gyp 1985-10-26 02:15:00.000000000 -0600
+++ grpc/binding.gyp 2020-05-03 23:41:17.531449701 -0600
@@ -60,7 +60,6 @@
'-g',
'-Wall',
'-Wextra',
- '-Werror',
'-Wno-long-long',
'-Wno-unused-parameter',
'-DOSATOMIC_USE_INLINED=1',
@@ -73,11 +72,9 @@
'-g',
],
'cflags_c': [
- '-Werror',
'-std=c99'
],
'cflags_cc': [
- '-Werror',
'-std=c++1y'
],
'include_dirs': [
@@ -190,7 +187,6 @@
'-g',
'-Wall',
'-Wextra',
- '-Werror',
'-Wno-long-long',
'-Wno-unused-parameter',
'-DOSATOMIC_USE_INLINED=1',
@@ -203,7 +199,6 @@
'-g',
'-Wall',
'-Wextra',
- '-Werror',
'-Wno-long-long',
'-Wno-unused-parameter',
'-DOSATOMIC_USE_INLINED=1',
diff -ruN node_modules/grpc/deps/grpc/src/core/lib/gpr/log_linux.cc grpc/deps/grpc/src/core/lib/gpr/log_linux.cc
--- node_modules/grpc/deps/grpc/src/core/lib/gpr/log_linux.cc 1985-10-26 02:15:00.000000000 -0600
+++ grpc/deps/grpc/src/core/lib/gpr/log_linux.cc 2020-05-03 23:40:11.264195936 -0600
@@ -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 @@
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 -ruN node_modules/grpc/deps/grpc/src/core/lib/gpr/log_linux.cc.orig grpc/deps/grpc/src/core/lib/gpr/log_linux.cc.orig
--- node_modules/grpc/deps/grpc/src/core/lib/gpr/log_linux.cc.orig 1969-12-31 17:00:00.000000000 -0700
+++ grpc/deps/grpc/src/core/lib/gpr/log_linux.cc.orig 2020-05-03 23:27:17.022724386 -0600
@@ -0,0 +1,97 @@
+/*
+ *
+ * Copyright 2015 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef _POSIX_SOURCE
+#define _POSIX_SOURCE
+#endif
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <grpc/support/port_platform.h>
+
+#ifdef GPR_LINUX_LOG
+
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
+#include <inttypes.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/syscall.h>
+#include <time.h>
+#include <unistd.h>
+
+static long sys_gettid(void) { return syscall(__NR_gettid); }
+
+void gpr_log(const char* file, int line, gpr_log_severity severity,
+ const char* format, ...) {
+ /* Avoid message construction if gpr_log_message won't log */
+ if (gpr_should_log(severity) == 0) {
+ return;
+ }
+ char* message = nullptr;
+ va_list args;
+ va_start(args, format);
+ if (vasprintf(&message, format, args) == -1) {
+ va_end(args);
+ return;
+ }
+ va_end(args);
+ gpr_log_message(file, line, severity, message);
+ /* message has been allocated by vasprintf above, and needs free */
+ free(message);
+}
+
+void gpr_default_log(gpr_log_func_args* args) {
+ const char* final_slash;
+ char* prefix;
+ const char* display_file;
+ char time_buffer[64];
+ time_t timer;
+ gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
+ struct tm tm;
+ static __thread long tid = 0;
+ if (tid == 0) tid = sys_gettid();
+
+ timer = static_cast<time_t>(now.tv_sec);
+ final_slash = strrchr(args->file, '/');
+ if (final_slash == nullptr)
+ display_file = args->file;
+ else
+ display_file = final_slash + 1;
+
+ if (!localtime_r(&timer, &tm)) {
+ strcpy(time_buffer, "error:localtime");
+ } else if (0 ==
+ strftime(time_buffer, sizeof(time_buffer), "%m%d %H:%M:%S", &tm)) {
+ strcpy(time_buffer, "error:strftime");
+ }
+
+ gpr_asprintf(&prefix, "%s%s.%09" PRId32 " %7ld %s:%d]",
+ gpr_log_severity_string(args->severity), time_buffer,
+ now.tv_nsec, tid, display_file, args->line);
+
+ fprintf(stderr, "%-60s %s\n", prefix, args->message);
+ gpr_free(prefix);
+}
+
+#endif /* GPR_LINUX_LOG */
diff -ruN node_modules/grpc/deps/grpc/src/core/lib/gpr/log_posix.cc grpc/deps/grpc/src/core/lib/gpr/log_posix.cc
--- node_modules/grpc/deps/grpc/src/core/lib/gpr/log_posix.cc 1985-10-26 02:15:00.000000000 -0600
+++ grpc/deps/grpc/src/core/lib/gpr/log_posix.cc 2020-05-03 23:40:27.560176017 -0600
@@ -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 @@
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 -ruN node_modules/grpc/deps/grpc/src/core/lib/iomgr/ev_epollex_linux.cc grpc/deps/grpc/src/core/lib/iomgr/ev_epollex_linux.cc
--- node_modules/grpc/deps/grpc/src/core/lib/iomgr/ev_epollex_linux.cc 1985-10-26 02:15:00.000000000 -0600
+++ grpc/deps/grpc/src/core/lib/iomgr/ev_epollex_linux.cc 2020-05-03 23:41:00.282153110 -0600
@@ -1102,7 +1102,7 @@
}
#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 @@
#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,
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment