diff --git a/emper/Emper.hpp b/emper/Emper.hpp index 1add14fc78b50c24aab57f91ff505e7557d16e34..876429339de81c15eac612a45c8f7958059aa416 100644 --- a/emper/Emper.hpp +++ b/emper/Emper.hpp @@ -22,10 +22,10 @@ constexpr auto inRuntime = Emper::inRuntime; void printInfo(std::ostream& strm = std::cout); -static const size_t WS_VICTIM_COUNT = EMPER_WS_VICTIM_COUNT; -static const size_t WS_VICTIM_DENOMINATOR = EMPER_WS_VICTIM_DENOMINATOR; +const size_t WS_VICTIM_COUNT = EMPER_WS_VICTIM_COUNT; +const size_t WS_VICTIM_DENOMINATOR = EMPER_WS_VICTIM_DENOMINATOR; -static const bool STATS = +const bool STATS = #ifdef EMPER_STATS true #else @@ -47,7 +47,7 @@ void statsAdd(C& counter, long a) { } } -static const bool WORKER_SLEEP = +const bool WORKER_SLEEP = #ifdef EMPER_WORKER_SLEEP true #else @@ -61,10 +61,10 @@ enum class WorkerWakeupStrategy { all, }; -static const enum WorkerWakeupStrategy WORKER_WAKEUP_STRATEGY = +const enum WorkerWakeupStrategy WORKER_WAKEUP_STRATEGY = WorkerWakeupStrategy::EMPER_WORKER_WAKEUP_STRATEGY; -static const bool WORKER_IGNORE_WAKEUP_HINT = +const bool WORKER_IGNORE_WAKEUP_HINT = #ifdef EMPER_WORKER_IGNORE_WAKEUP_HINT true #else @@ -72,7 +72,7 @@ static const bool WORKER_IGNORE_WAKEUP_HINT = #endif ; -static const bool LIBURCU = +const bool LIBURCU = #ifdef EMPER_LIBURCU true #else @@ -80,7 +80,7 @@ static const bool LIBURCU = #endif ; -static const bool WAITFREE_WORK_STEALING = +const bool WAITFREE_WORK_STEALING = #ifdef EMPER_WAITFREE_WORK_STEALING true #else @@ -88,7 +88,7 @@ static const bool WAITFREE_WORK_STEALING = #endif ; -static const bool DEBUG = +const bool DEBUG = #ifndef NDEBUG true #else @@ -102,9 +102,9 @@ enum class LogTimeStamp { local, }; -static const enum LogTimeStamp LOG_TIMESTAMP = LogTimeStamp::EMPER_LOG_TIMESTAMP; +const enum LogTimeStamp LOG_TIMESTAMP = LogTimeStamp::EMPER_LOG_TIMESTAMP; -static const bool OVERFLOW_QUEUE = +const bool OVERFLOW_QUEUE = #ifdef EMPER_OVERFLOW_QUEUE true #else @@ -112,7 +112,7 @@ static const bool OVERFLOW_QUEUE = #endif ; -static const bool CHECK_ANYWHERE_QUEUE_WHILE_STEALING = +const bool CHECK_ANYWHERE_QUEUE_WHILE_STEALING = #ifdef EMPER_CHECK_ANYWHERE_QUEUE_WHILE_STEALING true #else @@ -122,7 +122,7 @@ static const bool CHECK_ANYWHERE_QUEUE_WHILE_STEALING = auto getFullVersion() -> std::string; -static const bool BLOCKED_CONTEXT_SET = +const bool BLOCKED_CONTEXT_SET = #ifdef EMPER_BLOCKED_CONTEXT_SET DEBUG #else @@ -130,7 +130,7 @@ static const bool BLOCKED_CONTEXT_SET = #endif ; -static const bool IO = +const bool IO = #ifdef EMPER_IO true #else @@ -138,7 +138,7 @@ static const bool IO = #endif ; -static const bool IO_STEALING = +const bool IO_STEALING = #ifdef EMPER_IO_STEALING true #else @@ -146,7 +146,7 @@ static const bool IO_STEALING = #endif ; -static const bool IO_LOCKLESS_CQ = +const bool IO_LOCKLESS_CQ = #ifdef EMPER_IO_LOCKLESS_CQ true #else @@ -159,10 +159,10 @@ enum class IoLocklessMemoryOrder { strong, }; -static const enum IoLocklessMemoryOrder IO_LOCKLESS_MEMORY_ORDER = +const enum IoLocklessMemoryOrder IO_LOCKLESS_MEMORY_ORDER = IoLocklessMemoryOrder::EMPER_IO_LOCKLESS_MEMORY_ORDER; -static const bool IO_SINGLE_URING = +const bool IO_SINGLE_URING = #ifdef EMPER_IO_SINGLE_URING true #else @@ -170,7 +170,7 @@ static const bool IO_SINGLE_URING = #endif ; -static const bool IO_TRY_SYSCALL = +const bool IO_TRY_SYSCALL = #ifdef EMPER_IO_TRY_SYSCALL true #else @@ -178,9 +178,9 @@ static const bool IO_TRY_SYSCALL = #endif ; -static const bool IO_WORKER_URING = IO && !IO_SINGLE_URING; +const bool IO_WORKER_URING = IO && !IO_SINGLE_URING; -static const bool WAITFREE_IO_STEALING = +const bool WAITFREE_IO_STEALING = #ifdef EMPER_IO_WAITFREE_STEALING true #else @@ -204,7 +204,7 @@ enum class IoSqPoller { numa, }; -static const enum IoSqPoller IO_SQ_POLLER = IoSqPoller::EMPER_IO_SQ_POLLER; +const enum IoSqPoller IO_SQ_POLLER = IoSqPoller::EMPER_IO_SQ_POLLER; enum class IoCompleterBehavior { schedule, @@ -212,10 +212,10 @@ enum class IoCompleterBehavior { none, }; -static const enum IoCompleterBehavior IO_COMPLETER_BEHAVIOR = +const enum IoCompleterBehavior IO_COMPLETER_BEHAVIOR = IoCompleterBehavior::EMPER_IO_COMPLETER_BEHAVIOR; -static const bool SET_AFFINITY_ON_BLOCK = +const bool SET_AFFINITY_ON_BLOCK = #ifdef EMPER_SET_AFFINITY_ON_BLOCK true #else @@ -223,7 +223,7 @@ static const bool SET_AFFINITY_ON_BLOCK = #endif ; -static const bool HAS_FS_PATH = +const bool HAS_FS_PATH = #ifdef EMPER_HAS_FS_PATH true #else @@ -239,7 +239,7 @@ enum class CompleterSchedParam { idle, }; -static const CompleterSchedParam COMPLETER_SCHED_PARAM = +const CompleterSchedParam COMPLETER_SCHED_PARAM = CompleterSchedParam::EMPER_IO_COMPLETER_SCHED_PARAM; enum class ContinuationStealingMode { @@ -248,14 +248,13 @@ enum class ContinuationStealingMode { waitfree, }; -static const ContinuationStealingMode CONTINUATION_STEALING_MODE = +const ContinuationStealingMode CONTINUATION_STEALING_MODE = ContinuationStealingMode::EMPER_CONTINUATION_STEALING_MODE; -static const bool CONTINUATION_STEALING_MODE_LOCKED = +const bool CONTINUATION_STEALING_MODE_LOCKED = CONTINUATION_STEALING_MODE == ContinuationStealingMode::locked; -static const bool CONTINUATION_STEALING = - CONTINUATION_STEALING_MODE != ContinuationStealingMode::disabled; +const bool CONTINUATION_STEALING = CONTINUATION_STEALING_MODE != ContinuationStealingMode::disabled; enum class ContinuationStealingMadviseStack { no, @@ -263,10 +262,10 @@ enum class ContinuationStealingMadviseStack { free, }; -static const enum ContinuationStealingMadviseStack CONTINUATION_STEALING_MADVISE_STACK = +const enum ContinuationStealingMadviseStack CONTINUATION_STEALING_MADVISE_STACK = ContinuationStealingMadviseStack::EMPER_CONTINUATION_STEALING_MADVISE_STACK; -static const bool BUILD_WITH_CLANG = +const bool BUILD_WITH_CLANG = #ifdef EMPER_BUILD_WITH_CLANG true #else @@ -274,7 +273,7 @@ static const bool BUILD_WITH_CLANG = #endif ; -static const bool CONTEXT_MANAGER_WITH_MEMORY_MANAGER = +const bool CONTEXT_MANAGER_WITH_MEMORY_MANAGER = #ifdef EMPER_CONTEXT_MANAGER_WITH_MEMORY_MANAGER true #else @@ -282,11 +281,11 @@ static const bool CONTEXT_MANAGER_WITH_MEMORY_MANAGER = #endif ; -static const size_t ASSUME_PAGE_SIZE = EMPER_ASSUME_PAGE_SIZE; +const size_t ASSUME_PAGE_SIZE = EMPER_ASSUME_PAGE_SIZE; -static const size_t MIN_CONTEXT_STACK_SIZE = EMPER_MIN_CONTEXT_STACK_SIZE; +const size_t MIN_CONTEXT_STACK_SIZE = EMPER_MIN_CONTEXT_STACK_SIZE; -static const size_t ASSUME_CACHE_LINE_SIZE = EMPER_ASSUME_CACHE_LINE_SIZE; +const size_t ASSUME_CACHE_LINE_SIZE = EMPER_ASSUME_CACHE_LINE_SIZE; const bool STACK_GUARD_PAGE = #ifdef EMPER_STACK_GUARD_PAGE