From: Steinar H. Gunderson Date: Sat, 15 Oct 2022 13:44:47 +0000 (+0200) Subject: Use unique_lock CTAD. X-Git-Tag: 1.1.17~4 X-Git-Url: https://git.sesse.net/?p=plocate;a=commitdiff_plain;h=19e638d54b74f7593ba607ab53b430385b7ae531 Use unique_lock CTAD. It's not useful to write unique_lock in C++17; unique_lock will do. --- diff --git a/plocate.cpp b/plocate.cpp index a1cd97a..28a9c28 100644 --- a/plocate.cpp +++ b/plocate.cpp @@ -367,7 +367,7 @@ uint64_t scan_all_docids(const vector &needles, int fd, const Corpus &co string compressed; { - unique_lock lock(mu); + unique_lock lock(mu); queue_added.wait(lock, [&work_queue, &done] { return !work_queue.empty() || done; }); if (done && work_queue.empty()) { return; @@ -397,7 +397,7 @@ uint64_t scan_all_docids(const vector &needles, int fd, const Corpus &co complete_pread(fd, &compressed[0], io_len, offsets[io_docid]); { - unique_lock lock(mu); + unique_lock lock(mu); queue_removed.wait(lock, [&work_queue] { return work_queue.size() < 256; }); // Allow ~2MB of data queued up. work_queue.emplace_back(io_docid, last_docid, move(compressed)); queue_added.notify_one(); // Avoid the thundering herd.