Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OSX fixes #10

Merged
merged 2 commits into from
Sep 26, 2015
Merged

OSX fixes #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f4cf1f
Thread priority, missing header and pthread fix for OSX
cjcliffe Sep 26, 2015
c8e928a
Adjust include to not affect other platforms
cjcliffe Sep 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
11 changes: 11 additions & 0 deletions server/ThreadPrioUnix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
#include <cstring> //memset, strerror
#include <sched.h>

#ifdef __APPLE__
#include <sys/errno.h>
#include <thread>
#endif

std::string setThreadPrio(const double prio)
{
//no negative priorities supported on this OS
Expand All @@ -21,7 +26,13 @@ std::string setThreadPrio(const double prio)
struct sched_param param;
std::memset(&param, 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, &param) != 0) return strerror(errno);
#else
if (sched_setscheduler(0, policy, &param) != 0) return strerror(errno);
#endif

return "";
}