diff options
Diffstat (limited to 'src/libutil')
| -rw-r--r-- | src/libutil/hash.cc | 1 | ||||
| -rw-r--r-- | src/libutil/thread-pool.cc | 6 | ||||
| -rw-r--r-- | src/libutil/thread-pool.hh | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/libutil/hash.cc b/src/libutil/hash.cc index fa42587777..81aced0fde 100644 --- a/src/libutil/hash.cc +++ b/src/libutil/hash.cc @@ -121,6 +121,7 @@ const string base32Chars = "0123456789abcdfghijklmnpqrsvwxyz"; string printHash32(const Hash & hash) { + assert(hash.hashSize); size_t len = hash.base32Len(); assert(len); diff --git a/src/libutil/thread-pool.cc b/src/libutil/thread-pool.cc index 32363ecf00..696ecd6c38 100644 --- a/src/libutil/thread-pool.cc +++ b/src/libutil/thread-pool.cc @@ -36,7 +36,8 @@ ThreadPool::~ThreadPool() void ThreadPool::enqueue(const work_t & t) { auto state(state_.lock()); - assert(!state->quit); + if (state->quit) + throw ThreadPoolShutDown("cannot enqueue a work item while the thread pool is shutting down"); state->left.push(t); if (state->left.size() > state->workers.size() && state->workers.size() < maxThreads) state->workers.emplace_back(&ThreadPool::workerEntry, this); @@ -84,7 +85,8 @@ void ThreadPool::workerEntry() } catch (std::exception & e) { auto state(state_.lock()); if (state->exception) { - if (!dynamic_cast<Interrupted*>(&e)) + if (!dynamic_cast<Interrupted*>(&e) && + !dynamic_cast<ThreadPoolShutDown*>(&e)) printMsg(lvlError, format("error: %s") % e.what()); } else { state->exception = std::current_exception(); diff --git a/src/libutil/thread-pool.hh b/src/libutil/thread-pool.hh index 78b63467d6..b64dc52d47 100644 --- a/src/libutil/thread-pool.hh +++ b/src/libutil/thread-pool.hh @@ -10,6 +10,8 @@ namespace nix { +MakeError(ThreadPoolShutDown, Error) + /* A simple thread pool that executes a queue of work items (lambdas). */ class ThreadPool |