From cceb8032fb1c0805d2579346cc0ac0fb2527ec43 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flow@cs.fau.de>
Date: Tue, 1 Aug 2017 15:38:45 +0200
Subject: [PATCH] Actually use the LawsMpscQueue typedef
---
emper/strategies/laws/LawsScheduler.cpp | 4 ++--
emper/strategies/laws/LawsScheduler.hpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/emper/strategies/laws/LawsScheduler.cpp b/emper/strategies/laws/LawsScheduler.cpp
index 994bc276..bbccdb6f 100644
--- a/emper/strategies/laws/LawsScheduler.cpp
+++ b/emper/strategies/laws/LawsScheduler.cpp
@@ -7,7 +7,7 @@
#define EMPER_OVERFLOW_QUEUE
-thread_local adt::MpscQueue<Fiber> LawsScheduler::priorityQueue;
+thread_local LawsScheduler::LawsMpscQueue LawsScheduler::priorityQueue;
thread_local LawsScheduler::WsQueue<LawsScheduler::QUEUE_SIZE> LawsScheduler::queue;
@@ -15,7 +15,7 @@ LawsScheduler::LawsScheduler(Runtime& runtime, LawsStrategy& lawsStrategy) : Sch
, lawsStrategy(lawsStrategy) {
const workerid_t workerCount = runtime.getWorkerCount();
queues = new LawsScheduler::WsQueue<QUEUE_SIZE>*[workerCount];
- priorityQueues = new adt::MpscQueue<Fiber>*[workerCount];
+ priorityQueues = new LawsScheduler::LawsMpscQueue*[workerCount];
mainThreadQueue = &queue;
auto newWorkerHook = [this]() {
diff --git a/emper/strategies/laws/LawsScheduler.hpp b/emper/strategies/laws/LawsScheduler.hpp
index 39918d79..f7ed1a4b 100644
--- a/emper/strategies/laws/LawsScheduler.hpp
+++ b/emper/strategies/laws/LawsScheduler.hpp
@@ -30,11 +30,11 @@ public:
static const int QUEUE_SIZE = 1024;
private:
- adt::MpscQueue<Fiber>** priorityQueues;
+ LawsMpscQueue** priorityQueues;
WsQueue<QUEUE_SIZE>** queues;
- static thread_local adt::MpscQueue<Fiber> priorityQueue;
+ static thread_local LawsMpscQueue priorityQueue;
static thread_local LawsScheduler::WsQueue<QUEUE_SIZE> queue;
--
GitLab