From 96d9f1fa7d10b6ada396a61af175d458d4bf1fda Mon Sep 17 00:00:00 2001
From: Martin Karsten <mkarsten@uwaterloo.ca>
Date: Sun, 24 Jun 2018 15:43:02 -0400
Subject: [PATCH] - various typos and clerical updates
---
README.md | 1 +
src/libfibre/Poller.cc | 3 ++-
src/libfibre/Poller.h | 2 +-
src/libfibre/include/u++.h | 2 +-
src/libfibre/lfbasics.h | 2 --
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 40ee753..c83f697 100644
--- a/README.md
+++ b/README.md
@@ -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:
- Qin An (FreeBSD/kqueue)
+- Bilal Akhtar (gdb extension)
- Peng Chen (split stack support)
- Wen Shi (gdb extension)
diff --git a/src/libfibre/Poller.cc b/src/libfibre/Poller.cc
index 556c5b9..8363633 100644
--- a/src/libfibre/Poller.cc
+++ b/src/libfibre/Poller.cc
@@ -85,12 +85,13 @@ inline int MasterPoller::blockingPoll() {
if (_lfEventEngine->tryblock<true>(timerFD)) {
#if __linux__
uint64_t count;
- SYSCALLIO(read(timerFD, (void*)&count, sizeof(count)));
+ if (TRY_SYSCALLIO(read(timerFD, (void*)&count, sizeof(count)), EAGAIN) < 0) goto skipTimeout;
#endif
Time currTime;
SYSCALL(clock_gettime(CLOCK_REALTIME, &currTime));
defaultTimerQueue->checkExpiry(currTime);
}
+skipTimeout:
return PollerThread::blockingPoll();
}
diff --git a/src/libfibre/Poller.h b/src/libfibre/Poller.h
index 13b70a1..651f617 100644
--- a/src/libfibre/Poller.h
+++ b/src/libfibre/Poller.h
@@ -231,7 +231,7 @@ public:
void finish() {
#if !TESTING_POLLER_IDLETIMEDWAIT
pollThreshold = 0;
- pollCond.signal()
+ pollCond.signal();
#endif // !TESTING_POLLER_IDLETIMEDWAIT
}
#endif // TESTING_POLLER_IDLEWAIT
diff --git a/src/libfibre/include/u++.h b/src/libfibre/include/u++.h
index c5857b1..5090729 100644
--- a/src/libfibre/include/u++.h
+++ b/src/libfibre/include/u++.h
@@ -11,7 +11,7 @@
typedef uProcessor SystemProcessor;
#define CurrProcessor uThisProcessor
-typedef uCluster FibreCluuster;
+typedef uCluster FibreCluster;
#define CurrCluster uThisCluster
_Task Fibre {
diff --git a/src/libfibre/lfbasics.h b/src/libfibre/lfbasics.h
index 1884237..db9c1a9 100644
--- a/src/libfibre/lfbasics.h
+++ b/src/libfibre/lfbasics.h
@@ -270,10 +270,8 @@ extern void _lfNotifyTimeout(const Time& timeout);
// **** global constants
#ifdef SPLIT_STACK
-static const size_t minimumStackSize = 2 * pagesize<1>();
static const size_t defaultStackSize = 2 * pagesize<1>();
#else
-static const size_t minimumStackSize = 1 * pagesize<1>();
static const size_t defaultStackSize = 16 * pagesize<1>();
#endif
static const size_t stackProtection = pagesize<1>();
--
GitLab