forked from envoyproxy/envoy
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11 from envoyproxy/master
Sync Fork from Upstream Repo
- Loading branch information
Showing
97 changed files
with
1,639 additions
and
298 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| syntax = "proto3"; | ||
|
|
||
| package envoy.api.v2.listener; | ||
|
|
||
| option java_outer_classname = "ListenerProto"; | ||
| option java_multiple_files = true; | ||
| option java_package = "io.envoyproxy.envoy.api.v2.listener"; | ||
| option go_package = "listener"; | ||
| option csharp_namespace = "Envoy.Api.V2.ListenerNS"; | ||
| option ruby_package = "Envoy::Api::V2::ListenerNS"; | ||
|
|
||
| import "google/protobuf/struct.proto"; | ||
| import "google/protobuf/any.proto"; | ||
|
|
||
| // [#protodoc-title: Udp Listener Config] | ||
| // Listener :ref:`configuration overview <config_listeners>` | ||
|
|
||
| message UdpListenerConfig { | ||
| // Used to look up UDP listener factory, matches "raw_udp_listener" or | ||
| // "quic_listener" to create a specific udp listener. | ||
| // If not specified, treat as "raw_udp_listener". | ||
| string udp_listener_name = 1; | ||
|
|
||
| // Used to create a specific listener factory. To some factory, e.g. | ||
| // "raw_udp_listener", config is not needed. | ||
| oneof config_type { | ||
| google.protobuf.Struct config = 2; | ||
|
|
||
| google.protobuf.Any typed_config = 3; | ||
| } | ||
| } |
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| From d1d017390b799c59d6fdf7b8afa6136d218bdd61 Mon Sep 17 00:00:00 2001 | ||
| From: Benjamin Peterson <[email protected]> | ||
| Date: Fri, 3 May 2019 08:11:00 -0700 | ||
| Subject: [PATCH] Rename gettid() functions. | ||
|
|
||
| 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. | ||
| --- | ||
| src/core/lib/gpr/log_linux.cc | 4 ++-- | ||
| src/core/lib/gpr/log_posix.cc | 4 ++-- | ||
| 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 561276f0c20..8b597b4cf2f 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 b6edc14ab6b..2f7c6ce3760 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 08116b3ab53..76f59844312 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, |
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| ENVOY_BUILD_SHA=$(grep envoyproxy/envoy-build .circleci/config.yml | sed -e 's#.*envoyproxy/envoy-build:\(.*\)#\1#' | uniq) | ||
| ENVOY_BUILD_SHA=$(grep envoyproxy/envoy-build $(dirname $0)/../.circleci/config.yml | sed -e 's#.*envoyproxy/envoy-build:\(.*\)#\1#' | uniq) | ||
| [[ $(wc -l <<< "${ENVOY_BUILD_SHA}" | awk '{$1=$1};1') == 1 ]] || (echo ".circleci/config.yml hashes are inconsistent!" && exit 1) |
This file contains 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
Oops, something went wrong.