Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cc351b1 authored by Dan Albert's avatar Dan Albert
Browse files

Remove LogMessage::LogLineLowStack. 

This was ported over from ART, but even they only use it in a single
place.

Change-Id: Ia34dc54b56c764ede79b2957bf3dc8df0f1323ee
parent 4d9281da

base/include/base/logging.h

+0 −4
Original line number Diff line number Diff line
@@ -241,10 +241,6 @@ class LogMessage { 
  static void LogLine(const char* file, unsigned int line, LogSeverity severity,

                      const char* msg);



  // A variant of the above for use with little stack.

  static void LogLineLowStack(const char* file, unsigned int line,

                              LogSeverity severity, const char* msg);



 private:

  const std::unique_ptr<LogMessageData> data_;

base/logging.cpp

+0 −44
Original line number Diff line number Diff line
@@ -245,50 +245,6 @@ void LogMessage::LogLine(const char* file, unsigned int line, 
#endif

}



void LogMessage::LogLineLowStack(const char* file, unsigned int line,

                                 LogSeverity log_severity, const char* message) {

#ifdef __ANDROID__

  // Use android_writeLog() to avoid stack-based buffers used by

  // android_printLog().

  const char* tag = ProgramInvocationShortName();

  int priority = kLogSeverityToAndroidLogPriority[log_severity];

  char* buf = nullptr;

  size_t buf_size = 0u;

  if (priority == ANDROID_LOG_FATAL) {

    // Allocate buffer for snprintf(buf, buf_size, "%s:%u] %s", file, line,

    // message) below.  If allocation fails, fall back to printing only the

    // message.

    buf_size = strlen(file) + 1 /* ':' */ +

               std::numeric_limits<typeof(line)>::max_digits10 + 2 /* "] " */ +

               strlen(message) + 1 /* terminating 0 */;

    buf = reinterpret_cast<char*>(malloc(buf_size));

  }

  if (buf != nullptr) {

    snprintf(buf, buf_size, "%s:%u] %s", file, line, message);

    android_writeLog(priority, tag, buf);

    free(buf);

  } else {

    android_writeLog(priority, tag, message);

  }

#else

  static const char* log_characters = "VDIWEF";

  CHECK_EQ(strlen(log_characters), FATAL + 1U);



  const char* program_name = ProgramInvocationShortName();

  write(STDERR_FILENO, program_name, strlen(program_name));

  write(STDERR_FILENO, " ", 1);

  write(STDERR_FILENO, &log_characters[log_severity], 1);

  write(STDERR_FILENO, " ", 1);

  // TODO: pid and tid.

  write(STDERR_FILENO, file, strlen(file));

  // TODO: line.

  UNUSED(line);

  write(STDERR_FILENO, "] ", 2);

  write(STDERR_FILENO, message, strlen(message));

  write(STDERR_FILENO, "\n", 1);

#endif

}



ScopedLogSeverity::ScopedLogSeverity(LogSeverity level) {

  old_ = gMinimumLogSeverity;

  gMinimumLogSeverity = level;