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

- various typos and clerical updates

parent b8d2411d
No related branches found
No related tags found
No related merge requests found
...@@ -38,6 +38,7 @@ The following students (in alphabetical order) have helped with various parts of ...@@ -38,6 +38,7 @@ The following students (in alphabetical order) have helped with various parts of
The following students (in alphabetical order) have helped with various parts of libfibre: The following students (in alphabetical order) have helped with various parts of libfibre:
- Qin An (FreeBSD/kqueue) - Qin An (FreeBSD/kqueue)
- Bilal Akhtar (gdb extension)
- Peng Chen (split stack support) - Peng Chen (split stack support)
- Wen Shi (gdb extension) - Wen Shi (gdb extension)
......
...@@ -85,12 +85,13 @@ inline int MasterPoller::blockingPoll() { ...@@ -85,12 +85,13 @@ inline int MasterPoller::blockingPoll() {
if (_lfEventEngine->tryblock<true>(timerFD)) { if (_lfEventEngine->tryblock<true>(timerFD)) {
#if __linux__ #if __linux__
uint64_t count; uint64_t count;
SYSCALLIO(read(timerFD, (void*)&count, sizeof(count))); if (TRY_SYSCALLIO(read(timerFD, (void*)&count, sizeof(count)), EAGAIN) < 0) goto skipTimeout;
#endif #endif
Time currTime; Time currTime;
SYSCALL(clock_gettime(CLOCK_REALTIME, &currTime)); SYSCALL(clock_gettime(CLOCK_REALTIME, &currTime));
defaultTimerQueue->checkExpiry(currTime); defaultTimerQueue->checkExpiry(currTime);
} }
skipTimeout:
return PollerThread::blockingPoll(); return PollerThread::blockingPoll();
} }
......
...@@ -231,7 +231,7 @@ public: ...@@ -231,7 +231,7 @@ public:
void finish() { void finish() {
#if !TESTING_POLLER_IDLETIMEDWAIT #if !TESTING_POLLER_IDLETIMEDWAIT
pollThreshold = 0; pollThreshold = 0;
pollCond.signal() pollCond.signal();
#endif // !TESTING_POLLER_IDLETIMEDWAIT #endif // !TESTING_POLLER_IDLETIMEDWAIT
} }
#endif // TESTING_POLLER_IDLEWAIT #endif // TESTING_POLLER_IDLEWAIT
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
typedef uProcessor SystemProcessor; typedef uProcessor SystemProcessor;
#define CurrProcessor uThisProcessor #define CurrProcessor uThisProcessor
typedef uCluster FibreCluuster; typedef uCluster FibreCluster;
#define CurrCluster uThisCluster #define CurrCluster uThisCluster
_Task Fibre { _Task Fibre {
......
...@@ -270,10 +270,8 @@ extern void _lfNotifyTimeout(const Time& timeout); ...@@ -270,10 +270,8 @@ extern void _lfNotifyTimeout(const Time& timeout);
// **** global constants // **** global constants
#ifdef SPLIT_STACK #ifdef SPLIT_STACK
static const size_t minimumStackSize = 2 * pagesize<1>();
static const size_t defaultStackSize = 2 * pagesize<1>(); static const size_t defaultStackSize = 2 * pagesize<1>();
#else #else
static const size_t minimumStackSize = 1 * pagesize<1>();
static const size_t defaultStackSize = 16 * pagesize<1>(); static const size_t defaultStackSize = 16 * pagesize<1>();
#endif #endif
static const size_t stackProtection = pagesize<1>(); static const size_t stackProtection = pagesize<1>();
......
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