Merge branch 'fix_locked_ws_queue' into 'master'

fix build with locked work-stealing queues and add test

See merge request i4/manycore/emper!79

.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

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;