Skip to content

Commit

Permalink
Add patch for freebsd
Browse files Browse the repository at this point in the history
  • Loading branch information
hodduc committed Jan 13, 2016
1 parent 2d9e205 commit 446006c
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 1 deletion.
3 changes: 2 additions & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,8 @@
}
],
"patches": [
"patch/basepatch.patch"
"patch/basepatch.patch",
"patch/freebsd.patch"
],
"custom_files": [
{"from": "custom/net_util.h", "to": "net/base/net_util.h"},
Expand Down
24 changes: 24 additions & 0 deletions patch/freebsd.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/src/base/threading/platform_thread_freebsd.cc b/src/base/threading/platform_thread_freebsd.cc
index bce1ccf..0b35e5d 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
4 changes: 4 additions & 0 deletions src/base/threading/platform_thread_freebsd.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 446006c

Please sign in to comment.