From 07a5b191bb8eae329585bb2115c185d0608f7494 Mon Sep 17 00:00:00 2001 From: SChernykh Date: Sat, 17 Dec 2022 12:52:08 +0100 Subject: [PATCH] Fixes for different BSD variants --- CMakeLists.txt | 5 +++++ external/src/RandomX | 2 +- src/util.cpp | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 20379e6..63b1e86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -184,6 +184,7 @@ include(CheckCXXSourceCompiles) check_cxx_source_compiles("int main(){ return __builtin_clzll(1);}" HAVE_BUILTIN_CLZLL) check_cxx_source_compiles("#include \n#pragma intrinsic(_BitScanReverse64)\nint main(){unsigned long r;_BitScanReverse64(&r,1);return r;}" HAVE_BITSCANREVERSE64) +check_cxx_source_compiles("#include \nint main(){sched_param param;return sched_setscheduler(0, SCHED_IDLE, ¶m);}" HAVE_SCHED) if (HAVE_BUILTIN_CLZLL) add_definitions(/DHAVE_BUILTIN_CLZLL) @@ -193,6 +194,10 @@ if (HAVE_BITSCANREVERSE64) add_definitions(/DHAVE_BITSCANREVERSE64) endif() +if (HAVE_SCHED) + add_definitions(/DHAVE_SCHED) +endif() + add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES}) if (STATIC_BINARY OR STATIC_LIBS) diff --git a/external/src/RandomX b/external/src/RandomX index 118bb7b..8903191 160000 --- a/external/src/RandomX +++ b/external/src/RandomX @@ -1 +1 @@ -Subproject commit 118bb7b1b3efe5b1e3f811b0b122abdbb952fb87 +Subproject commit 89031917e9780b3ea0439bf362446efe5b59244c diff --git a/src/util.cpp b/src/util.cpp index 5e55831..cee53c8 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -21,7 +21,7 @@ #include #include -#ifndef _WIN32 +#if !defined(_WIN32) && defined(HAVE_SCHED) #include #endif @@ -66,7 +66,7 @@ void make_thread_background() SetThreadPriorityBoost(GetCurrentThread(), true); SetThreadPriority(GetCurrentThread(), THREAD_MODE_BACKGROUND_BEGIN); SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_IDLE); -#elif !defined(__APPLE__) && !defined(__FreeBSD__) +#elif defined(HAVE_SCHED) sched_param param; param.sched_priority = 0; if (sched_setscheduler(0, SCHED_IDLE, ¶m) != 0) {