Release plocate 1.1.22.

[plocate] / io_uring_engine.cpp

diff --git a/io_uring_engine.cpp b/io_uring_engine.cpp
index 70497a44cb122acf501d52c7062db124e6551e9d..be9366037ae0dbd9e3ad2f34f7c9995513f1d20a 100644 (file)
--- a/io_uring_engine.cpp
+++ b/io_uring_engine.cpp
@@ -7,6 +7,7 @@
 #ifndef WITHOUT_URING
 #include <liburing.h>
 #endif
+#include "complete_pread.h"
 #include "dprintf.h"
 #include "io_uring_engine.h"
 
@@ -40,12 +41,12 @@ IOUringEngine::IOUringEngine(size_t slop_bytes)
                if (!supports_stat) {
                        dprintf("io_uring on this kernel does not support statx(); will do synchronous access checking.\n");
                }
-               free(probe);
+               io_uring_free_probe(probe);
        }
 #endif
 }
 
-void IOUringEngine::submit_stat(const char *path, std::function<void()> cb)
+void IOUringEngine::submit_stat(const char *path [[maybe_unused]], std::function<void(bool)> cb [[maybe_unused]])
 {
        assert(supports_stat);
 
@@ -114,7 +115,7 @@ void IOUringEngine::submit_read_internal(io_uring_sqe *sqe, int fd, size_t len,
        ++pending_reads;
 }
 
-void IOUringEngine::submit_stat_internal(io_uring_sqe *sqe, char *path, std::function<void()> cb)
+void IOUringEngine::submit_stat_internal(io_uring_sqe *sqe, char *path, std::function<void(bool)> cb)
 {
        PendingRead *pending = new PendingRead;
        pending->op = OP_STAT;
@@ -122,7 +123,7 @@ void IOUringEngine::submit_stat_internal(io_uring_sqe *sqe, char *path, std::fun
        pending->stat.pathname = path;
        pending->stat.buf = new struct statx;
 
-       io_uring_prep_statx(sqe, /*fd=*/-1, pending->stat.pathname, AT_STATX_SYNC_AS_STAT, STATX_MODE, pending->stat.buf);
+       io_uring_prep_statx(sqe, /*fd=*/-1, pending->stat.pathname, AT_STATX_SYNC_AS_STAT | AT_SYMLINK_NOFOLLOW, STATX_MODE, pending->stat.buf);
        io_uring_sqe_set_data(sqe, pending);
        ++pending_reads;
 }
@@ -165,7 +166,7 @@ void IOUringEngine::finish()
                                --pending_reads;
 
                                size_t old_pending_reads = pending_reads;
-                               pending->stat_cb();
+                               pending->stat_cb(cqe->res == 0);
                                free(pending->stat.pathname);
                                delete pending->stat.buf;
                                delete pending;
@@ -247,20 +248,3 @@ void IOUringEngine::finish()
        }
 #endif
 }
-
-void complete_pread(int fd, void *ptr, size_t len, off_t offset)
-{
-       while (len > 0) {
-               ssize_t ret = pread(fd, ptr, len, offset);
-               if (ret == -1 && errno == EINTR) {
-                       continue;
-               }
-               if (ret <= 0) {
-                       perror("pread");
-                       exit(1);
-               }
-               ptr = reinterpret_cast<char *>(ptr) + ret;
-               len -= ret;
-               offset -= ret;
-       }
-}