New test infrastructure for producing verbose logs in failing tests.

base/logging_win.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/logging_win.h"
 #include "base/memory/singleton.h"
 #include <initguid.h>  // NOLINT
 
 namespace logging {
 
 using base::win::EtwEventLevel;
@@ skipping 38 matching lines @@
 
   // Bail if we're not logging, not at that level,
   // or if we're post-atexit handling.
   LogEventProvider* provider = LogEventProvider::GetInstance();
   if (provider == NULL || level > provider->enable_level())
     return false;
 
   // And now log the event.
   if (provider->enable_flags() & ENABLE_LOG_MESSAGE_ONLY) {
     EtwMofEvent<1> event(kLogEventId, LOG_MESSAGE, level);
-    event.SetField(0, message.length() + 1 - message_start,
-        message.c_str() + message_start);
+    if (provider->enable_flags() & ENABLE_DETAILED_LOG_MESSAGE) {
+      event.SetField(0, message.length() + 1, message.c_str());
+    } else {
+      event.SetField(0, message.length() + 1 - message_start,
+          message.c_str() + message_start);
+    }
 
     provider->Log(event.get());
   } else {
     const size_t kMaxBacktraceDepth = 32;
     void* backtrace[kMaxBacktraceDepth];
     DWORD depth = 0;
 
     // Capture a stack trace if one is requested.
     // requested per our enable flags.
     if (provider->enable_flags() & ENABLE_STACK_TRACE_CAPTURE)
       depth = CaptureStackBackTrace(2, kMaxBacktraceDepth, backtrace, NULL);
 
     EtwMofEvent<5> event(kLogEventId, LOG_MESSAGE_FULL, level);
     if (file == NULL)
       file = "";
 
     // Add the stack trace.
     event.SetField(0, sizeof(depth), &depth);
     event.SetField(1, sizeof(backtrace[0]) * depth, &backtrace);
     // The line.
     event.SetField(2, sizeof(line), &line);
     // The file.
     event.SetField(3, strlen(file) + 1, file);
     // And finally the message.
-    event.SetField(4, message.length() + 1 - message_start,
-        message.c_str() + message_start);
+    if (provider->enable_flags() & ENABLE_DETAILED_LOG_MESSAGE) {
+      event.SetField(4, message.length() + 1, message.c_str());
+    } else {
+      event.SetField(4, message.length() + 1 - message_start,
+          message.c_str() + message_start);
+    }
 
     provider->Log(event.get());
   }
 
   // Don't increase verbosity in other log destinations.
   if (severity < provider->old_log_level_)
     return true;
 
   return false;
 }
@@ skipping 32 matching lines @@
     SetMinLogLevel(TRACE_LEVEL_INFORMATION - level);
   }
 }
 
 void LogEventProvider::OnEventsDisabled() {
   // Restore the old log level.
   SetMinLogLevel(old_log_level_);
 }
 
 }  // namespace logging