|
1 | | -diff --git a/src/base/threading/platform_thread_freebsd.cc b/src/base/threading/platform_thread_freebsd.cc |
2 | | -index bce1ccf..0b35e5d 100644 |
3 | | ---- a/src/base/threading/platform_thread_freebsd.cc |
4 | | -+++ b/src/base/threading/platform_thread_freebsd.cc |
5 | | -@@ -12,7 +12,9 @@ |
6 | | - #include "base/logging.h" |
7 | | - #include "base/threading/platform_thread_internal_posix.h" |
8 | | - #include "base/threading/thread_id_name_manager.h" |
9 | | -+#if 0 |
10 | | - #include "base/tracked_objects.h" |
11 | | -+#endif |
| 1 | +diff --git a/src/base/process/process_posix.cc b/src/base/process/process_posix.cc |
| 2 | +index 914bce8..65dbce7 100644 |
| 3 | +--- a/src/base/process/process_posix.cc |
| 4 | ++++ b/src/base/process/process_posix.cc |
| 5 | +@@ -17,6 +17,10 @@ |
| 6 | + #include "base/third_party/dynamic_annotations/dynamic_annotations.h" |
12 | 7 | #include "build/build_config.h" |
13 | 8 |
|
14 | | - #if !defined(OS_NACL) |
15 | | -@@ -67,7 +69,9 @@ bool GetCurrentThreadPriorityForPlatform(ThreadPriority* priority) { |
16 | | - // static |
17 | | - void PlatformThread::SetName(const std::string& name) { |
18 | | - ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name); |
| 9 | ++#if defined(OS_FREEBSD) |
| 10 | ++#include <signal.h> |
| 11 | ++#endif |
| 12 | ++ |
| 13 | + #if defined(OS_MACOSX) |
| 14 | + #include <sys/event.h> |
| 15 | + #endif |
| 16 | +diff --git a/src/base/sys_info_freebsd.cc b/src/base/sys_info_freebsd.cc |
| 17 | +index 0b2008d..e196b55 100644 |
| 18 | +--- a/src/base/sys_info_freebsd.cc |
| 19 | ++++ b/src/base/sys_info_freebsd.cc |
| 20 | +@@ -24,6 +24,7 @@ int64_t SysInfo::AmountOfPhysicalMemory() { |
| 21 | + return static_cast<int64_t>(pages) * page_size; |
| 22 | + } |
| 23 | + |
19 | 24 | +#if 0 |
20 | | - tracked_objects::ThreadData::InitializeThreadContext(name); |
| 25 | + // static |
| 26 | + uint64_t SysInfo::MaxSharedMemorySize() { |
| 27 | + size_t limit; |
| 28 | +@@ -34,5 +35,6 @@ uint64_t SysInfo::MaxSharedMemorySize() { |
| 29 | + } |
| 30 | + return static_cast<uint64_t>(limit); |
| 31 | + } |
21 | 32 | +#endif |
22 | 33 |
|
23 | | - #if !defined(OS_NACL) |
24 | | - // On FreeBSD we can get the thread names to show up in the debugger by |
| 34 | + } // namespace base |
0 commit comments