From 2cc07cdcdce146c7eb945058b5893d3f179f29da Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fl.fischer@fau.de>
Date: Mon, 1 Feb 2021 16:19:02 +0100
Subject: [PATCH] fix build with locked work-stealing queues and add test
---
.gitlab-ci.yml | 9 +++++++++
emper/strategies/AbstractWorkStealingScheduler.hpp | 7 ++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f0c6fce..9c0d8cff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -121,6 +121,10 @@ variables:
variables:
EMPER_LOG_TIMESTAMP: "false"
+.locked-ws-queues:
+ variables:
+ EMPER_LOCKED_WS_QUEUE: "true"
+
test-gcc:
extends:
- .test
@@ -201,3 +205,8 @@ test-do-not-log-timestamp:
extends:
- .test
- .do-not-log-timestamp
+
+test-locked-ws-queues:
+ extends:
+ - .test
+ - .locked-ws-queues
diff --git a/emper/strategies/AbstractWorkStealingScheduler.hpp b/emper/strategies/AbstractWorkStealingScheduler.hpp
index 6e3564fb..ce0d378d 100644
--- a/emper/strategies/AbstractWorkStealingScheduler.hpp
+++ b/emper/strategies/AbstractWorkStealingScheduler.hpp
@@ -9,7 +9,12 @@
#include "NextFiberResult.hpp"
#include "Scheduler.hpp"
#include "emper-common.h"
-#include "lib/adt/WsClQueue.hpp" // for WsClQueue
+
+#ifdef EMPER_LOCKED_WS_QUEUE
+#include "lib/adt/LockedQueue.hpp"
+#else
+#include "lib/adt/WsClQueue.hpp"
+#endif
class Fiber;
class Runtime;
--
GitLab