X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=plocate.cpp;h=d021cc89d6281bf90a74cc56a005dd83b29b293c;hb=a2a3c6f0a7037c012839c5b24523b9f9e3f6f195;hp=7cc4f5a4eb2587f4bb685aaa83155e8951f06dd2;hpb=cb87fdb5ede1d5a9fa0a5a309d9ccf98f42fe0b7;p=plocate diff --git a/plocate.cpp b/plocate.cpp index 7cc4f5a..d021cc8 100644 --- a/plocate.cpp +++ b/plocate.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -347,7 +348,7 @@ uint64_t scan_all_docids(const vector &needles, int fd, const Corpus &co dprintf("Using %u worker threads for linear scan.\n", num_threads); unique_ptr threads(new WorkerThread[num_threads]); for (unsigned i = 0; i < num_threads; ++i) { - threads[i].t = thread([&threads, &mu, &queue_added, &queue_removed, &work_queue, &done, &offsets, &needles, &access_rx_cache, engine{ corpus.engine }, &matched, i] { + threads[i].t = thread([&threads, &mu, &queue_added, &queue_removed, &work_queue, &done, &offsets, &needles, &access_rx_cache, &matched, i] { // regcomp() takes a lock on the regex, so each thread will need its own. const vector *use_needles = &needles; vector recompiled_needles; @@ -378,7 +379,8 @@ uint64_t scan_all_docids(const vector &needles, int fd, const Corpus &co for (uint32_t docid = io_docid; docid < last_docid; ++docid) { size_t relative_offset = offsets[docid] - offsets[io_docid]; size_t len = offsets[docid + 1] - offsets[docid]; - scan_file_block(*use_needles, { &compressed[relative_offset], len }, engine, &access_rx_cache, docid, &receiver, &matched); + // IOUringEngine isn't thread-safe, so we do any needed stat()s synchronously (nullptr engine). + scan_file_block(*use_needles, { &compressed[relative_offset], len }, /*engine=*/nullptr, &access_rx_cache, docid, &receiver, &matched); } } });