Startup race fixes to tracked objects

base/tracked.cc

 // Copyright (c) 2011 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 "build/build_config.h"
 
 #if defined(COMPILER_MSVC)
 // MSDN says to #include <intrin.h>, but that breaks the VS2005 build.
 extern "C" {
 void* _ReturnAddress();
@@ skipping 68 matching lines @@
   return _ReturnAddress();
 #elif defined(COMPILER_GCC)
   return __builtin_extract_return_addr(__builtin_return_address(0));
 #endif  // COMPILER_GCC
 
   return NULL;
 }
 
 //------------------------------------------------------------------------------
 
-#ifndef TRACK_ALL_TASK_OBJECTS
+#if !defined(TRACK_ALL_TASK_OBJECTS)
 
 Tracked::Tracked() : birth_program_counter_(NULL) {}
 Tracked::~Tracked() {}
 
 void Tracked::SetBirthPlace(const Location& from_here) {
   birth_program_counter_ = from_here.program_counter();
 }
 
 const Location Tracked::GetBirthPlace() const {
   static Location kNone("NoFunctionName", "NeedToSetBirthPlace", -1, NULL);
   return kNone;
 }
-bool Tracked::MissingBirthplace() const { return false; }
+bool Tracked::MissingBirthPlace() const { return false; }
 void Tracked::ResetBirthTime() {}
 
 #else
 
 Tracked::Tracked()
     : tracked_births_(NULL),
       tracked_birth_time_(TimeTicks::Now()) {
 }
 
 Tracked::~Tracked() {
@@ skipping 10 matching lines @@
     tracked_births_->ForgetBirth();
   ThreadData* current_thread_data = ThreadData::current();
   if (!current_thread_data)
     return;  // Shutdown started, and this thread wasn't registered.
   tracked_births_ = current_thread_data->TallyABirth(from_here);
 
   birth_program_counter_ = from_here.program_counter();
 }
 
 const Location Tracked::GetBirthPlace() const {
-  return tracked_births_->location();
+  static Location kNone("UnknownFunctionName", "UnknownFile", -1, NULL);
+  return tracked_births_ ? tracked_births_->location() : kNone;
 }
 
 void Tracked::ResetBirthTime() {
   tracked_birth_time_ = TimeTicks::Now();
 }
 
-bool Tracked::MissingBirthplace() const {
-  return -1 == tracked_births_->location().line_number();
+bool Tracked::MissingBirthPlace() const {
+  return  !tracked_births_ || tracked_births_->location().line_number() == -1;
 }
 
-#endif  // NDEBUG
+#endif  // defined(TRACK_ALL_TASK_OBJECTS)

[awong, 2011/07/14 21:02:04]

!

[joth, 2011/07/15 07:57:24]

Done.

 
 }  // namespace tracked_objects