commit 141dae38f17614cb555b7e24edc217906378a991
author Brian Carlstrom <bdc@google.com> Fri Feb 03 21:22:53 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 03 21:22:53 2012 -0800
tree e10cf398f59b25a0357e604c54b7255ae09ec722
parent 807444fe87b61e9e306cab09bb51ea7fa02ce1fc
parent d85016c68488d2110dae6d4c304e7028d934d643

Merge "Fix class linker assert" into dalvik-dev

src/jdwp/jdwp_priv.h

diff --git a/src/jdwp/jdwp_priv.h b/src/jdwp/jdwp_priv.h
index d2c35dd..f1e97b7 100644
--- a/src/jdwp/jdwp_priv.h
+++ b/src/jdwp/jdwp_priv.h
@@ -19,8 +19,6 @@
 #ifndef ART_JDWP_JDWPPRIV_H_
 #define ART_JDWP_JDWPPRIV_H_
 
-#define LOG_TAG "jdwp"
-
 #include "debugger.h"
 #include "jdwp/jdwp.h"
 #include "jdwp/jdwp_event.h"

src/log_severity.h

diff --git a/src/log_severity.h b/src/log_severity.h
index 5ecfe8d..126019b 100644
--- a/src/log_severity.h
+++ b/src/log_severity.h
@@ -20,5 +20,6 @@
 typedef int LogSeverity;
 
 const int VERBOSE = 0, DEBUG = 1, INFO = 2, WARNING = 3, ERROR = 4, FATAL = 5;
+const int INTERNAL_FATAL = 6; // For Runtime::Abort.
 
 #endif  // BASE_LOG_SEVERITY_H_

src/logging_android.cc

diff --git a/src/logging_android.cc b/src/logging_android.cc
index 2c34d8a..edfa42f 100644
--- a/src/logging_android.cc
+++ b/src/logging_android.cc
@@ -15,6 +15,7 @@
  */
 
 #include "logging.h"
+#include "stringprintf.h"
 
 #include <iostream>
 #include <unistd.h>
@@ -24,19 +25,17 @@
 namespace art {
 
 static const int kLogSeverityToAndroidLogPriority[] = {
-  ANDROID_LOG_VERBOSE, ANDROID_LOG_DEBUG, ANDROID_LOG_INFO,
-  ANDROID_LOG_WARN, ANDROID_LOG_ERROR, ANDROID_LOG_FATAL
+  ANDROID_LOG_VERBOSE, ANDROID_LOG_DEBUG, ANDROID_LOG_INFO, ANDROID_LOG_WARN,
+  ANDROID_LOG_ERROR, ANDROID_LOG_FATAL, ANDROID_LOG_FATAL
 };
 
 LogMessage::LogMessage(const char* file, int line, LogSeverity severity, int error)
     : data_(new LogMessageData(line, severity, error)) {
-  const char* last_slash = strrchr(file, '/');
-  data_->file = (last_slash == NULL) ? file : last_slash + 1;
 }
 
 void LogMessage::LogLine(const char* line) {
   int priority = kLogSeverityToAndroidLogPriority[data_->severity];
-  LOG_PRI(priority, LOG_TAG, "%s:%d] %s", data_->file, data_->line_number, line);
+  LOG_PRI(priority, "art", "%s", line);
 }
 
 }  // namespace art

src/logging_linux.cc

diff --git a/src/logging_linux.cc b/src/logging_linux.cc
index 2c1d699..f3a6cf3 100644
--- a/src/logging_linux.cc
+++ b/src/logging_linux.cc
@@ -34,7 +34,7 @@
 }
 
 void LogMessage::LogLine(const char* line) {
-  std::cerr << "VDIWEF"[data_->severity] << ' '
+  std::cerr << "VDIWEFF"[data_->severity] << ' '
             << StringPrintf("%5d %5d", getpid(), ::art::GetTid()) << ' '
             << data_->file << ':' << data_->line_number << "] " << line << std::endl;
 }

src/runtime.cc

diff --git a/src/runtime.cc b/src/runtime.cc
index 579e591..3f6bcca 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -138,7 +138,7 @@
   // Many people have difficulty distinguish aborts from crashes,
   // so be explicit.
   AbortState state;
-  LOG(ERROR) << Dumpable<AbortState>(state);
+  LOG(INTERNAL_FATAL) << Dumpable<AbortState>(state);
 
   // Perform any platform-specific pre-abort actions.
   PlatformAbort(file, line);

src/runtime_linux.cc

diff --git a/src/runtime_linux.cc b/src/runtime_linux.cc
index 8fd81cc..d7b32ee 100644
--- a/src/runtime_linux.cc
+++ b/src/runtime_linux.cc
@@ -80,7 +80,7 @@
       text.erase(index, 1);
     }
     std::string log_line(StringPrintf("\t#%02zd ", i) + function_name + text);
-    LogMessage(filename.c_str(), -1, ERROR, -1).stream() << log_line;
+    LogMessage(filename.c_str(), -1, INTERNAL_FATAL, -1).stream() << log_line;
   }
 
   free(symbols);