Skip to content
Snippets Groups Projects
Commit 768cec27 authored by Martin Karsten's avatar Martin Karsten
Browse files

- fixed yet another compile-time error left over from c56e9d4e

parent af077034
No related branches found
No related tags found
No related merge requests found
......@@ -49,8 +49,8 @@ class EventEngine {
// file operations are not considered blocking in terms of select/poll/epoll
// therefore, all file operations are executed on dedicated Cluster/SP(s)
FibreClusterGeneric<NoPoller> diskCluster;
SystemProcessor diskProcessor;
DiskCluster diskCluster;
SystemProcessor diskProcessor;
MasterPoller masterPoller; // runs without cluster
......
......@@ -29,7 +29,7 @@ class FibreClusterGeneric : public Cluster {
SystemSemaphore<true> pauseWaitSem;
SystemSemaphore<true> pauseContSem;
P poller;
P poller;
public:
FibreClusterGeneric(size_t t = 1) : paused(false), pauseContSem(1), poller(*this, t) {}
......@@ -97,7 +97,8 @@ public:
#endif
};
typedef FibreClusterGeneric<Poller> FibreCluster;
typedef FibreClusterGeneric<Poller> FibreCluster;
typedef FibreClusterGeneric<NoPoller> DiskCluster;
static inline FibreCluster& CurrCluster() {
return reinterpret_cast<FibreCluster&>(CurrProcessor().getCluster());
......
......@@ -101,7 +101,7 @@ void Poller::pollLoopSetup(void* This) {
pollLoop(*reinterpret_cast<Poller*>(This), true);
}
Poller::Poller(FibreCluster& cluster) : BasePoller("PollerFibre") {
Poller::Poller(FibreCluster& cluster, size_t) : BasePoller("PollerFibre") {
pollFibre = new Fibre(cluster, defaultStackSize, true);
pollFibre->setPriority(lowPriority);
pollFibre->run(pollLoopSetup, this);
......
......@@ -181,7 +181,7 @@ class Poller : public BasePoller {
FifoSemaphore<BinaryLock<>,true> pauseSem;
static void pollLoopSetup(void*);
public:
Poller(FibreClusterGeneric<Poller>&, size_t t);
Poller(FibreClusterGeneric<Poller>&, size_t);
~Poller() { if (!pollTerminate) stop(); }
bool stopped() { return pollTerminate; }
void stop();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment