#include <sys/stat.h>
#include <unistd.h>
#include <getopt.h>
+#include <sys/inotify.h>
#include "missing.h"
#include "util.h"
static off_t arg_file_size_max = READAHEAD_FILE_SIZE_MAX;
+static ReadaheadShared *shared = NULL;
+
static int unpack_file(FILE *pack) {
char fn[PATH_MAX];
int r = 0, fd = -1;
any = true;
if (fd >= 0)
- if (readahead(fd, b * PAGE_SIZE, (c - b) * PAGE_SIZE) < 0) {
- log_warning("readahead() failed: %m");
+ if (posix_fadvise(fd, b * PAGE_SIZE, (c - b) * PAGE_SIZE, POSIX_FADV_WILLNEED) < 0) {
+ log_warning("posix_fadvise() failed: %m");
goto finish;
}
}
* intended to mean that the whole file shall be
* read */
- if (readahead(fd, 0, st.st_size) < 0) {
- log_warning("readahead() failed: %m");
+ if (posix_fadvise(fd, 0, st.st_size, POSIX_FADV_WILLNEED) < 0) {
+ log_warning("posix_fadvise() failed: %m");
goto finish;
}
}
}
static int replay(const char *root) {
- FILE *pack;
+ FILE *pack = NULL;
char line[LINE_MAX];
int r = 0;
char *pack_fn = NULL, c;
bool on_ssd, ready = false;
int prio;
+ int inotify_fd = -1;
assert(root);
goto finish;
}
+ posix_fadvise(fileno(pack), 0, 0, POSIX_FADV_WILLNEED);
+
+ if ((inotify_fd = open_inotify()) < 0) {
+ r = inotify_fd;
+ goto finish;
+ }
+
if (!(fgets(line, sizeof(line), pack))) {
log_error("Premature end of pack file.");
r = -EIO;
log_debug("Replaying...");
+ if (access("/dev/.systemd/readahead/noreplay", F_OK) >= 0) {
+ log_debug("Got termination request");
+ goto done;
+ }
+
while (!feof(pack) && !ferror(pack)) {
+ uint8_t inotify_buffer[sizeof(struct inotify_event) + FILENAME_MAX];
int k;
+ ssize_t n;
+
+ if ((n = read(inotify_fd, &inotify_buffer, sizeof(inotify_buffer))) < 0) {
+ if (errno != EINTR && errno != EAGAIN) {
+ log_error("Failed to read inotify event: %m");
+ r = -errno;
+ goto finish;
+ }
+ } else {
+ struct inotify_event *e = (struct inotify_event*) inotify_buffer;
+
+ while (n > 0) {
+ size_t step;
+
+ if ((e->mask & IN_CREATE) && streq(e->name, "noreplay")) {
+ log_debug("Got termination request");
+ goto done;
+ }
+
+ step = sizeof(struct inotify_event) + e->len;
+ assert(step <= (size_t) n);
+
+ e = (struct inotify_event*) ((uint8_t*) e + step);
+ n -= step;
+ }
+ }
if ((k = unpack_file(pack)) < 0) {
r = k;
}
}
+done:
if (!ready)
sd_notify(0, "READY=1");
if (pack)
fclose(pack);
+ if (inotify_fd >= 0)
+ close_nointr_nofail(inotify_fd);
+
free(pack_fn);
return r;
return 0;
}
+ if (!(shared = shared_get()))
+ return 1;
+
+ shared->replay = getpid();
+ __sync_synchronize();
+
if (replay(optind < argc ? argv[optind] : "/") < 0)
return 1;