From 2ab4de0beeda8b504af3a677585584c42af2b2ff Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 28 Aug 2024 20:38:48 +0000 Subject: [PATCH] Update artifacts branch --- .source-revision | 2 +- src/core/util/android/log.cc | 48 ------------------------ src/core/util/linux/log.cc | 69 ---------------------------------- src/core/util/posix/log.cc | 69 ---------------------------------- src/core/util/windows/log.cc | 73 ------------------------------------ 5 files changed, 1 insertion(+), 260 deletions(-) delete mode 100644 src/core/util/android/log.cc delete mode 100644 src/core/util/linux/log.cc delete mode 100644 src/core/util/posix/log.cc delete mode 100644 src/core/util/windows/log.cc diff --git a/.source-revision b/.source-revision index b3df9a7aa2e..62ba0c3d86b 100644 --- a/.source-revision +++ b/.source-revision @@ -1 +1 @@ -2d99ca4e0b95e024bacf889d4305bb4263ffc2bd +245941e0da74afa3e5446105ca3baad2f3bd8a70 diff --git a/src/core/util/android/log.cc b/src/core/util/android/log.cc deleted file mode 100644 index aeb2dc4b26c..00000000000 --- a/src/core/util/android/log.cc +++ /dev/null @@ -1,48 +0,0 @@ -// -// -// 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. -// -// - -#include - -#ifdef GPR_ANDROID - -#include -#include -#include -#include - -#include -#include - -#include "src/core/lib/gprpp/crash.h" - -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 = NULL; - va_list args; - va_start(args, format); - vasprintf(&message, format, args); - va_end(args); - gpr_log_message(file, line, severity, message); - free(message); -} - -#endif // GPR_ANDROID diff --git a/src/core/util/linux/log.cc b/src/core/util/linux/log.cc deleted file mode 100644 index f09ecb2dbbc..00000000000 --- a/src/core/util/linux/log.cc +++ /dev/null @@ -1,69 +0,0 @@ -// -// -// 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 - -#ifdef GPR_LINUX_LOG - -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "absl/strings/str_format.h" - -#include -#include -#include - -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/examine_stack.h" - -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); -} - -#endif // GPR_LINUX_LOG diff --git a/src/core/util/posix/log.cc b/src/core/util/posix/log.cc deleted file mode 100644 index 09791014ef8..00000000000 --- a/src/core/util/posix/log.cc +++ /dev/null @@ -1,69 +0,0 @@ -// -// -// 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. -// -// - -#include - -#ifdef GPR_POSIX_LOG - -#include -#include -#include -#include -#include -#include - -#include - -#include "absl/strings/str_format.h" - -#include -#include -#include - -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/examine_stack.h" - -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 buf[64]; - char* allocated = nullptr; - char* message = nullptr; - int ret; - va_list args; - va_start(args, format); - ret = vsnprintf(buf, sizeof(buf), format, args); - va_end(args); - if (ret < 0) { - message = nullptr; - } else if ((size_t)ret <= sizeof(buf) - 1) { - message = buf; - } else { - message = allocated = (char*)gpr_malloc((size_t)ret + 1); - va_start(args, format); - vsnprintf(message, (size_t)(ret + 1), format, args); - va_end(args); - } - gpr_log_message(file, line, severity, message); - gpr_free(allocated); -} - -#endif // defined(GPR_POSIX_LOG) diff --git a/src/core/util/windows/log.cc b/src/core/util/windows/log.cc deleted file mode 100644 index 722e4bd9a83..00000000000 --- a/src/core/util/windows/log.cc +++ /dev/null @@ -1,73 +0,0 @@ -// -// -// 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. -// -// - -#include - -#ifdef GPR_WINDOWS_LOG - -#include -#include - -#include -#include -#include -#include -#include - -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/examine_stack.h" -#include "src/core/util/string.h" - -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 = NULL; - va_list args; - int ret; - - // Determine the length. - va_start(args, format); - ret = _vscprintf(format, args); - va_end(args); - if (ret < 0) { - message = NULL; - } else { - // Allocate a new buffer, with space for the NUL terminator. - size_t strp_buflen = (size_t)ret + 1; - message = (char*)gpr_malloc(strp_buflen); - - // Print to the buffer. - va_start(args, format); - ret = vsnprintf_s(message, strp_buflen, _TRUNCATE, format, args); - va_end(args); - if ((size_t)ret != strp_buflen - 1) { - // This should never happen. - gpr_free(message); - message = NULL; - } - } - - gpr_log_message(file, line, severity, message); - gpr_free(message); -} - -#endif // GPR_WINDOWS_LOG