FreeBSD specific changes

devsisters · Mar 11, 2016 · 1ac7395 · 1ac7395
1 parent 42dd489
commit 1ac7395
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/patch/platform_thread_remove_tracked_objects.patch b/patch/platform_thread_remove_tracked_objects.patch
@@ -46,3 +46,27 @@ index 95ed324..054de87 100644
 
  #if !defined(OS_NACL)
    // On linux we can get the thread names to show up in the debugger by setting
+diff --git a/src/base/threading/platform_thread_freebsd.cc b/src/base/threading/platform_thread_freebsd.cc
+index 44f14c8..bddb6ac 100644
+--- a/src/base/threading/platform_thread_freebsd.cc
++++ b/src/base/threading/platform_thread_freebsd.cc
+@@ -12,7 +12,9 @@
+ #include "base/logging.h"
+ #include "base/threading/platform_thread_internal_posix.h"
+ #include "base/threading/thread_id_name_manager.h"
++#if 0
+ #include "base/tracked_objects.h"
++#endif
+ #include "build/build_config.h"
+
+ #if !defined(OS_NACL)
+@@ -67,7 +69,9 @@ bool GetCurrentThreadPriorityForPlatform(ThreadPriority* priority) {
+ // static
+ void PlatformThread::SetName(const std::string& name) {
+   ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
++#if 0
+   tracked_objects::ThreadData::InitializeThreadContext(name);
++#endif
+
+ #if !defined(OS_NACL)
+   // On FreeBSD we can get the thread names to show up in the debugger by
diff --git a/src/base/threading/platform_thread_freebsd.cc b/src/base/threading/platform_thread_freebsd.cc
@@ -12,7 +12,9 @@
 #include "base/logging.h"
 #include "base/threading/platform_thread_internal_posix.h"
 #include "base/threading/thread_id_name_manager.h"
+#if 0
 #include "base/tracked_objects.h"
+#endif
 #include "build/build_config.h"
 
 #if !defined(OS_NACL)
@@ -67,7 +69,9 @@ bool GetCurrentThreadPriorityForPlatform(ThreadPriority* priority) {
 // static
 void PlatformThread::SetName(const std::string& name) {
   ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
+#if 0
   tracked_objects::ThreadData::InitializeThreadContext(name);
+#endif
 
 #if !defined(OS_NACL)
   // On FreeBSD we can get the thread names to show up in the debugger by