Move exception shifting to later; allows us to get it into SSE2.

[plocate] / plocate.cpp

diff --git a/plocate.cpp b/plocate.cpp
index d935c8874d6428064ab65deaf4989b02f8b7b076..2c5514ee8b16bc5f3c8461a0c97821e6a2216987 100644 (file)
--- a/plocate.cpp
+++ b/plocate.cpp
@@ -10,6 +10,7 @@
 #include <fcntl.h>
 #include <functional>
 #include <getopt.h>
+#include <limits.h>
 #include <memory>
 #include <stdio.h>
 #include <string.h>
@@ -25,6 +26,8 @@ using namespace std::chrono;
 #define dprintf(...)
 //#define dprintf(...) fprintf(stderr, __VA_ARGS__);
 
+#include "turbopfor.h"
+
 const char *dbpath = "/var/lib/mlocate/plocate.db";
 bool print_nul = false;
 
@@ -188,12 +191,7 @@ void Corpus::get_compressed_filename_block(uint32_t docid, function<void(string)
 
 size_t Corpus::get_num_filename_blocks() const
 {
-       // The beginning of the filename blocks is the end of the filename index blocks.
-       uint64_t end;
-       complete_pread(fd, &end, sizeof(end), hdr.filename_index_offset_bytes);
-
-       // Subtract the sentinel block.
-       return (end - hdr.filename_index_offset_bytes) / sizeof(uint64_t) - 1;
+       return hdr.num_docids;
 }
 
 size_t scan_file_block(const vector<string> &needles, string_view compressed,
@@ -393,7 +391,7 @@ void do_search_file(const vector<string> &needles, const char *filename)
                        unsigned char *pldata = reinterpret_cast<unsigned char *>(s.data());
                        if (in1.empty()) {
                                in1.resize(num + 128);
-                               p4nd1dec128v32(pldata, num, &in1[0]);
+                               decode_pfor_delta1<128>(pldata, num, /*interleaved=*/true, &in1[0]);
                                in1.resize(num);
                                dprintf("trigram '%c%c%c' (%zu bytes) decoded to %zu entries\n", trgm & 0xff,
                                        (trgm >> 8) & 0xff, (trgm >> 16) & 0xff, len, num);
@@ -401,7 +399,7 @@ void do_search_file(const vector<string> &needles, const char *filename)
                                if (in2.size() < num + 128) {
                                        in2.resize(num + 128);
                                }
-                               p4nd1dec128v32(pldata, num, &in2[0]);
+                               decode_pfor_delta1<128>(pldata, num, /*interleaved=*/true, &in2[0]);
 
                                out.clear();
                                set_intersection(in1.begin(), in1.end(), in2.begin(), in2.begin() + num,
@@ -433,6 +431,7 @@ void usage()
 {
        // The help text comes from mlocate.
        printf("Usage: plocate [OPTION]... PATTERN...\n");
+       printf("\n");
        printf("  -d, --database DBPATH  use DBPATH instead of default database (which is\n");
        printf("                         %s)\n", dbpath);
        printf("  -h, --help             print this help\n");