aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-10-12 19:28:18 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-10-12 19:28:18 +0000
commit6a73dc17c633bfa150a41354f843c91d805ef795 (patch)
treef439f8505192b0ea88d04f0233e54fb315986b7b
parente072003cb1cc8d863ed0766fac78e6fb46b80176 (diff)
No longer any need to scope the notify call. Also remove comment on timeout.
-rw-r--r--storage/src/vespa/storage/common/storagelink.h1
-rw-r--r--storageframework/src/vespa/storageframework/generic/thread/thread.cpp4
2 files changed, 1 insertions, 4 deletions
diff --git a/storage/src/vespa/storage/common/storagelink.h b/storage/src/vespa/storage/common/storagelink.h
index b6460979d81..ee6525c8288 100644
--- a/storage/src/vespa/storage/common/storagelink.h
+++ b/storage/src/vespa/storage/common/storagelink.h
@@ -198,7 +198,6 @@ public:
* Returns the next event from the event queue
* @param msg The next event
* @param timeout Millisecs to wait if the queue is empty
- * (0 = don't wait, -1 = forever)
* @return true or false if the queue was empty.
*/
bool getNext(std::shared_ptr<api::StorageMessage>& msg, vespalib::duration timeout);
diff --git a/storageframework/src/vespa/storageframework/generic/thread/thread.cpp b/storageframework/src/vespa/storageframework/generic/thread/thread.cpp
index 2a53b1de329..24ed28d077b 100644
--- a/storageframework/src/vespa/storageframework/generic/thread/thread.cpp
+++ b/storageframework/src/vespa/storageframework/generic/thread/thread.cpp
@@ -20,9 +20,7 @@ void
Thread::interruptAndJoin(std::condition_variable &cv)
{
interrupt();
- {
- cv.notify_all();
- }
+ cv.notify_all();
join();
}