Upgrade logging to resemble base/logging.h.

tools/relocation_packer/src/debug.cc

Index: tools/relocation_packer/src/debug.cc
diff --git a/tools/relocation_packer/src/debug.cc b/tools/relocation_packer/src/debug.cc
index b78e25062d689ad5b3a9520fd978a8c0e8c672ea..bf57ec36c3d34ea18e5de42189258b7e94be7d04 100644
--- a/tools/relocation_packer/src/debug.cc
+++ b/tools/relocation_packer/src/debug.cc
@@ -2,43 +2,54 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <stdarg.h>
-#include <stdio.h>
+#include <stdlib.h>
+#include <iostream>
+#include <string>
 
 #include "debug.h"

[rmcilroy, 2014/07/16 11:38:48]

nit - debug.h at the top

[simonb (inactive), 2014/07/16 12:51:03]

Done.

 
 namespace relocation_packer {
 
-Logger* Logger::instance_ = NULL;
-
-Logger* Logger::GetInstance() {
-  if (instance_ == NULL)
-    instance_ = new Logger;
-  return instance_;
+// Construct a new message logger.  Prints if level is less than or equal to
+// the level set with SetVerbose() and predicate is true.
+Logger::Logger(Severity severity, int level, bool predicate) {
+  severity_ = severity;
+  level_ = level;
+  predicate_ = predicate;
 }
 
-void Logger::Log(const char* format, va_list args) {
-  vfprintf(stdout, format, args);
+// On destruction, flush and print the strings accumulated.  Abort if FATAL.
+Logger::~Logger() {
+  if (predicate_) {
+    if (level_ <= max_level_) {
+      std::ostream* log = severity_ == INFO ? info_stream_ : error_stream_;
+      std::string tag;
+      switch (severity_) {
+        case INFO: tag = "INFO"; break;
+        case WARNING: tag = "WARNING"; break;
+        case ERROR: tag = "ERROR"; break;
+        case FATAL: tag = "FATAL"; break;
+      }
+      stream_.flush();
+      *log << tag << ": " << stream_.str() << std::endl;
+    }
+    if (severity_ == FATAL)
+      abort();
+  }
 }
 
-void Logger::Log(const char* format, ...) {
-  va_list args;
-  va_start(args, format);
-  GetInstance()->Log(format, args);
-  va_end(args);
+// Reset to initial state.
+void Logger::Reset() {
+  max_level_ = -1;
+  info_stream_ = &std::cout;
+  error_stream_ = &std::cerr;
 }
 
-void Logger::VLog(const char* format, ...) {
-  if (GetInstance()->is_verbose_) {
-    va_list args;
-    va_start(args, format);
-    GetInstance()->Log(format, args);
-    va_end(args);
-  }
-}
+// Verbosity.  Not thread-safe.
+int Logger::max_level_ = -1;
 
-void Logger::SetVerbose(bool flag) {
-  GetInstance()->is_verbose_ = flag;
-}
+// Logging streams.  Not thread-safe.
+std::ostream* Logger::info_stream_ = &std::cout;
+std::ostream* Logger::error_stream_ = &std::cerr;
 
 }  // namespace relocation_packer