diff --git a/src/TaskScheduler.cpp b/src/TaskScheduler.cpp index ddac6c8a..a5ebcd4d 100644 --- a/src/TaskScheduler.cpp +++ b/src/TaskScheduler.cpp @@ -37,7 +37,7 @@ namespace enki static const uint32_t SPIN_COUNT = 10; static const uint32_t SPIN_BACKOFF_MULTIPLIER = 100; static const uint32_t MAX_NUM_INITIAL_PARTITIONS = 8; - static const uint32_t CACHE_LINE_SIZE = 64; // awaiting std::hardware_constructive_interference_size + static const uint32_t ENKI_CACHE_LINE_SIZE = 64; // awaiting std::hardware_constructive_interference_size }; // thread_local not well supported yet by C++11 compilers. @@ -84,9 +84,9 @@ namespace enki struct ThreadDataStore { std::atomic threadState; - char prevent_false_Share[ enki::CACHE_LINE_SIZE - sizeof(std::atomic) ]; + char prevent_false_Share[ enki::ENKI_CACHE_LINE_SIZE - sizeof(std::atomic) ]; }; - static_assert( sizeof( ThreadDataStore ) >= enki::CACHE_LINE_SIZE, "ThreadDataStore may exhibit false sharing" ); + static_assert( sizeof( ThreadDataStore ) >= enki::ENKI_CACHE_LINE_SIZE, "ThreadDataStore may exhibit false sharing" ); class PinnedTaskList : public LocklessMultiWriteIntrusiveList {};