summaryrefslogtreecommitdiff
path: root/Source/Core/Common/Thread.cpp
diff options
context:
space:
mode:
authorScott Mansell <phiren@gmail.com>2015-07-13 19:51:18 +1200
committerScott Mansell <phiren@gmail.com>2015-07-13 19:51:18 +1200
commitda38e3a8ae7be05ca783e72f0bce821dc23646bd (patch)
treed9522fbe017dfe00fe2bd5cde44d3554c3e6ab00 /Source/Core/Common/Thread.cpp
parent87e19f1c190719bd1280eb94bcdf372caca5287b (diff)
parentfff113b64ffbb673d803d18c28f833c7d2b6c02d (diff)
Merge pull request #2741 from endrift/fix-freebsd-build-stable
Fix FreeBSD (stable)
Diffstat (limited to 'Source/Core/Common/Thread.cpp')
-rw-r--r--Source/Core/Common/Thread.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/Core/Common/Thread.cpp b/Source/Core/Common/Thread.cpp
index fb091ee2a7..1e60fbb29f 100644
--- a/Source/Core/Common/Thread.cpp
+++ b/Source/Core/Common/Thread.cpp
@@ -8,7 +8,7 @@
#ifdef __APPLE__
#include <mach/mach.h>
-#elif defined BSD4_4
+#elif defined BSD4_4 || defined __FreeBSD__
#include <pthread_np.h>
#endif
@@ -94,8 +94,12 @@ void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask)
#ifdef __APPLE__
thread_policy_set(pthread_mach_thread_np(thread),
THREAD_AFFINITY_POLICY, (integer_t *)&mask, 1);
-#elif (defined __linux__ || defined BSD4_4) && !(defined ANDROID)
+#elif (defined __linux__ || defined BSD4_4 || defined __FreeBSD__) && !(defined ANDROID)
+#ifdef __FreeBSD__
+ cpuset_t cpu_set;
+#else
cpu_set_t cpu_set;
+#endif
CPU_ZERO(&cpu_set);
for (int i = 0; i != sizeof(mask) * 8; ++i)
@@ -125,6 +129,8 @@ void SetCurrentThreadName(const char* szThreadName)
{
#ifdef __APPLE__
pthread_setname_np(szThreadName);
+#elif defined __FreeBSD__
+ pthread_set_name_np(pthread_self(), szThreadName);
#else
pthread_setname_np(pthread_self(), szThreadName);
#endif