From 04e0dcae14f6bde8f4feec4516b12d4f787a517f Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Thu, 15 Jun 2023 12:18:13 -0700 Subject: Rename AsyncSignalSafeWriteToStderr to AsyncSignalSafeWriteError. It no longer strictly writes to stderr, since Emscripten/WebAssembly now use _emscripten_err which might be replaced by something that is not the same as stderr by the host. PiperOrigin-RevId: 540655336 Change-Id: Icc2a430a0db53a1282ef5558e9f3648db67e972c --- absl/base/internal/raw_logging.cc | 4 ++-- absl/base/internal/raw_logging.h | 2 +- absl/debugging/failure_signal_handler.cc | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/absl/base/internal/raw_logging.cc b/absl/base/internal/raw_logging.cc index 5ea49bca..c866d957 100644 --- a/absl/base/internal/raw_logging.cc +++ b/absl/base/internal/raw_logging.cc @@ -177,7 +177,7 @@ void RawLogVA(absl::LogSeverity severity, const char* file, int line, } else { DoRawLog(&buf, &size, "%s", kTruncated); } - AsyncSignalSafeWriteToStderr(buffer, strlen(buffer)); + AsyncSignalSafeWriteError(buffer, strlen(buffer)); } #else static_cast(format); @@ -205,7 +205,7 @@ void DefaultInternalLog(absl::LogSeverity severity, const char* file, int line, } // namespace -void AsyncSignalSafeWriteToStderr(const char* s, size_t len) { +void AsyncSignalSafeWriteError(const char* s, size_t len) { absl::base_internal::ErrnoSaver errno_saver; #if defined(__EMSCRIPTEN__) // In WebAssembly, bypass filesystem emulation via fwrite. diff --git a/absl/base/internal/raw_logging.h b/absl/base/internal/raw_logging.h index 3f852d31..b79550b2 100644 --- a/absl/base/internal/raw_logging.h +++ b/absl/base/internal/raw_logging.h @@ -130,7 +130,7 @@ void RawLog(absl::LogSeverity severity, const char* file, int line, // Writes the provided buffer directly to stderr, in a signal-safe, low-level // manner. Preserves errno. -void AsyncSignalSafeWriteToStderr(const char* s, size_t len); +void AsyncSignalSafeWriteError(const char* s, size_t len); // compile-time function to get the "base" filename, that is, the part of // a filename after the last "/" or "\" path separator. The search starts at diff --git a/absl/debugging/failure_signal_handler.cc b/absl/debugging/failure_signal_handler.cc index 0db2a896..fd6a4927 100644 --- a/absl/debugging/failure_signal_handler.cc +++ b/absl/debugging/failure_signal_handler.cc @@ -378,8 +378,7 @@ static void AbslFailureSignalHandler(int signo, siginfo_t*, void* ucontext) { // First write to stderr. WriteFailureInfo( signo, ucontext, my_cpu, +[](const char* data) { - absl::raw_log_internal::AsyncSignalSafeWriteToStderr(data, - strlen(data)); + absl::raw_log_internal::AsyncSignalSafeWriteError(data, strlen(data)); }); // Riskier code (because it is less likely to be async-signal-safe) -- cgit v1.2.3