Disk cache: First pass to make it possible to have...

net/disk_cache/trace.cc

 // Copyright (c) 2006-2008 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 "net/disk_cache/trace.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 24 matching lines @@
   OutputDebugStringA(msg);
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 }  // namespace
 
 namespace disk_cache {
 
+// s_trace_buffer and s_trace_object are not singletons because I want the
+// buffer to be destroyed and re-created when the last user goes away, and it
+// must be straightforward to access the buffer from the debugger.
+static TraceObject* s_trace_object = NULL;
+
+// Static.
+TraceObject* TraceObject::GetTraceObject() {
+  if (s_trace_object)
+    return s_trace_object;
+
+  s_trace_object = new TraceObject();
+  return s_trace_object;
+}
+
 #if ENABLE_TRACING
 
 static TraceBuffer* s_trace_buffer = NULL;
 
-bool InitTrace(void) {
-  DCHECK(!s_trace_buffer);
+void InitTrace(void) {
   if (s_trace_buffer)
-    return false;
+    return;
 
   s_trace_buffer = new TraceBuffer;
   memset(s_trace_buffer, 0, sizeof(*s_trace_buffer));
-  return true;
 }
 
 void DestroyTrace(void) {
   DCHECK(s_trace_buffer);
   delete s_trace_buffer;
   s_trace_buffer = NULL;
+  s_trace_object = NULL;
 }
 
 void Trace(const char* format, ...) {
   DCHECK(s_trace_buffer);
   va_list ap;
   va_start(ap, format);
 
 #if defined(OS_WIN)
   vsprintf_s(s_trace_buffer->buffer[s_trace_buffer->current], format, ap);
 #else
@@ skipping 38 matching lines @@
       if (current ==  kNumberOfEntries)
         current = 0;
     }
   }
 
   DebugOutput("End of Traces\n");
 }
 
 #else  // ENABLE_TRACING
 
-bool InitTrace(void) {
-  return true;
+void InitTrace(void) {
+  return;
 }
 
 void DestroyTrace(void) {
+  s_trace_object = NULL;
 }
 
 void Trace(const char* format, ...) {
 }
 
 #endif  // ENABLE_TRACING
 
 }  // namespace disk_cache