From 1f4cf1f9e03e137710e53c3da640b55d7c41a716 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Sat, 26 Sep 2015 00:53:57 -0400 Subject: [PATCH 1/2] Thread priority, missing header and pthread fix for OSX --- CMakeLists.txt | 5 +++++ client/LogAcceptor.cpp | 1 + server/ThreadPrioUnix.cpp | 11 +++++++++++ 3 files changed, 17 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index cbfd55d..548966e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,11 @@ if(CMAKE_COMPILER_IS_GNUCXX) endif(CMAKE_COMPILER_IS_GNUCXX) +#enable c++11 extensions for OSX +if (APPLE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wc++11-extensions") +endif(APPLE) + #common headers used by client and server include_directories(${CMAKE_CURRENT_SOURCE_DIR}/common) diff --git a/client/LogAcceptor.cpp b/client/LogAcceptor.cpp index 452be8e..07a9c6c 100644 --- a/client/LogAcceptor.cpp +++ b/client/LogAcceptor.cpp @@ -8,6 +8,7 @@ #include "SoapyRPCUnpacker.hpp" #include #include //sig_atomic_t +#include #include #include #include diff --git a/server/ThreadPrioUnix.cpp b/server/ThreadPrioUnix.cpp index d16b0f7..43a0956 100644 --- a/server/ThreadPrioUnix.cpp +++ b/server/ThreadPrioUnix.cpp @@ -4,6 +4,11 @@ #include "ThreadPrioHelper.hpp" #include //memset, strerror #include +#include + +#ifdef __APPLE__ +#include +#endif std::string setThreadPrio(const double prio) { @@ -21,7 +26,13 @@ std::string setThreadPrio(const double prio) struct sched_param param; std::memset(¶m, 0, sizeof(param)); param.sched_priority = minPrio + int(prio * (maxPrio-minPrio)); + +#ifdef __APPLE__ + pthread_t tID = pthread_self(); // ID of this thread + if (pthread_setschedparam(tID, policy, ¶m) != 0) return strerror(errno); +#else if (sched_setscheduler(0, policy, ¶m) != 0) return strerror(errno); +#endif return ""; } From c8e928a4a6684641cbdaaf6d29e0949a4c59b8d9 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Sat, 26 Sep 2015 00:59:51 -0400 Subject: [PATCH 2/2] Adjust include to not affect other platforms --- client/LogAcceptor.cpp | 1 - server/ThreadPrioUnix.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/client/LogAcceptor.cpp b/client/LogAcceptor.cpp index 07a9c6c..452be8e 100644 --- a/client/LogAcceptor.cpp +++ b/client/LogAcceptor.cpp @@ -8,7 +8,6 @@ #include "SoapyRPCUnpacker.hpp" #include #include //sig_atomic_t -#include #include #include #include diff --git a/server/ThreadPrioUnix.cpp b/server/ThreadPrioUnix.cpp index 43a0956..ba6bff3 100644 --- a/server/ThreadPrioUnix.cpp +++ b/server/ThreadPrioUnix.cpp @@ -4,9 +4,9 @@ #include "ThreadPrioHelper.hpp" #include //memset, strerror #include -#include #ifdef __APPLE__ +#include #include #endif