X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Freadahead%2Freadahead-collect.c;h=c1afd0d605226259a74ac458601faa2f886a5544;hb=b226d99b044222739dccfa9cf9f7a9d79576c407;hp=4fcf64c24d766833b70f01c1d7104d45079979c6;hpb=0d0f0c50d3a1d90f03972a6abb82e6413daaa583;p=elogind.git diff --git a/src/readahead/readahead-collect.c b/src/readahead/readahead-collect.c index 4fcf64c24..c1afd0d60 100644 --- a/src/readahead/readahead-collect.c +++ b/src/readahead/readahead-collect.c @@ -42,6 +42,15 @@ #include #include #include +#include + +#ifdef HAVE_LINUX_BTRFS_H +#include +#endif + +#ifdef HAVE_FANOTIFY_INIT +#include +#endif #include @@ -63,16 +72,14 @@ */ static ReadaheadShared *shared = NULL; +static usec_t starttime; /* Avoid collisions with the NULL pointer */ #define SECTOR_TO_PTR(s) ULONG_TO_PTR((s)+1) #define PTR_TO_SECTOR(p) (PTR_TO_ULONG(p)-1) static int btrfs_defrag(int fd) { - struct btrfs_ioctl_vol_args data; - - zero(data); - data.fd = fd; + struct btrfs_ioctl_vol_args data = { .fd = fd }; return ioctl(fd, BTRFS_IOC_DEFRAG, &data); } @@ -122,8 +129,7 @@ static int pack_file(FILE *pack, const char *fn, bool on_btrfs) { } pages = l / page_size(); - vec = alloca(pages); - memset(vec, 0, pages); + vec = alloca0(pages); if (mincore(start, l, vec) < 0) { log_warning("mincore(%s) failed: %m", fn); r = -errno; @@ -170,8 +176,7 @@ finish: if (start != MAP_FAILED) munmap(start, l); - if (fd >= 0) - close_nointr_nofail(fd); + safe_close(fd); return r; } @@ -180,11 +185,10 @@ static unsigned long fd_first_block(int fd) { struct { struct fiemap fiemap; struct fiemap_extent extent; - } data; - - zero(data); - data.fiemap.fm_length = ~0ULL; - data.fiemap.fm_extent_count = 1; + } data = { + .fiemap.fm_length = ~0ULL, + .fiemap.fm_extent_count = 1, + }; if (ioctl(fd, FS_IOC_FIEMAP, &data) < 0) return 0; @@ -201,6 +205,7 @@ static unsigned long fd_first_block(int fd) { struct item { const char *path; unsigned long block; + unsigned long bin; }; static int qsort_compare(const void *a, const void *b) { @@ -209,6 +214,13 @@ static int qsort_compare(const void *a, const void *b) { i = a; j = b; + /* sort by bin first */ + if (i->bin < j->bin) + return -1; + if (i->bin > j->bin) + return 1; + + /* then sort by sector */ if (i->block < j->block) return -1; if (i->block > j->block) @@ -224,7 +236,7 @@ static int collect(const char *root) { FD_INOTIFY, /* We get notifications to quit early via this fd */ _FD_MAX }; - struct pollfd pollfd[_FD_MAX]; + struct pollfd pollfd[_FD_MAX] = {}; int fanotify_fd = -1, signal_fd = -1, inotify_fd = -1, r = 0; pid_t my_pid; Hashmap *files = NULL; @@ -246,6 +258,8 @@ static int collect(const char *root) { goto finish; } + starttime = now(CLOCK_MONOTONIC); + /* If there's no pack file yet we lower the kernel readahead * so that mincore() is accurate. If there is a pack file * already we assume it is accurate enough so that kernel @@ -268,13 +282,15 @@ static int collect(const char *root) { goto finish; } - if (!(files = hashmap_new(string_hash_func, string_compare_func))) { + files = hashmap_new(string_hash_func, string_compare_func); + if (!files) { log_error("Failed to allocate set."); r = -ENOMEM; goto finish; } - if ((fanotify_fd = fanotify_init(FAN_CLOEXEC|FAN_NONBLOCK, O_RDONLY|O_LARGEFILE|O_CLOEXEC|O_NOATIME)) < 0) { + fanotify_fd = fanotify_init(FAN_CLOEXEC|FAN_NONBLOCK, O_RDONLY|O_LARGEFILE|O_CLOEXEC|O_NOATIME); + if (fanotify_fd < 0) { log_error("Failed to create fanotify object: %m"); r = -errno; goto finish; @@ -286,7 +302,8 @@ static int collect(const char *root) { goto finish; } - if ((inotify_fd = open_inotify()) < 0) { + inotify_fd = open_inotify(); + if (inotify_fd < 0) { r = inotify_fd; goto finish; } @@ -295,7 +312,6 @@ static int collect(const char *root) { my_pid = getpid(); - zero(pollfd); pollfd[FD_FANOTIFY].fd = fanotify_fd; pollfd[FD_FANOTIFY].events = POLLIN; pollfd[FD_SIGNAL].fd = signal_fd; @@ -397,7 +413,8 @@ static int collect(const char *root) { } } - if ((n = read(fanotify_fd, &data, sizeof(data))) < 0) { + n = read(fanotify_fd, &data, sizeof(data)); + if (n < 0) { if (errno == EINTR || errno == EAGAIN) continue; @@ -418,7 +435,7 @@ static int collect(const char *root) { } for (m = &data.metadata; FAN_EVENT_OK(m, n); m = FAN_EVENT_NEXT(m, n)) { - char fn[PATH_MAX]; + char fn[sizeof("/proc/self/fd/") + DECIMAL_STR_MAX(int)]; int k; if (m->fd < 0) @@ -432,9 +449,8 @@ static int collect(const char *root) { goto next_iteration; snprintf(fn, sizeof(fn), "/proc/self/fd/%i", m->fd); - char_array_0(fn); - - if ((k = readlink_malloc(fn, &p)) >= 0) { + k = readlink_malloc(fn, &p); + if (k >= 0) { if (startswith(p, "/tmp") || endswith(p, " (deleted)") || hashmap_get(files, p)) @@ -443,11 +459,31 @@ static int collect(const char *root) { free(p); else { unsigned long ul; + usec_t entrytime; + struct item *entry; + + entry = new0(struct item, 1); + if (!entry) { + r = log_oom(); + goto finish; + } ul = fd_first_block(m->fd); - if ((k = hashmap_put(files, p, SECTOR_TO_PTR(ul))) < 0) { - log_warning("set_put() failed: %s", strerror(-k)); + entrytime = now(CLOCK_MONOTONIC); + + entry->block = ul; + entry->path = strdup(p); + if (!entry->path) { + free(entry); + r = log_oom(); + goto finish; + } + entry->bin = (entrytime - starttime) / 2000000; + + k = hashmap_put(files, p, entry); + if (k < 0) { + log_warning("hashmap_put() failed: %s", strerror(-k)); free(p); } } @@ -456,23 +492,19 @@ static int collect(const char *root) { log_warning("readlink(%s) failed: %s", fn, strerror(-k)); next_iteration: - if (m->fd) - close_nointr_nofail(m->fd); + safe_close(m->fd); } } done: - if (fanotify_fd >= 0) { - close_nointr_nofail(fanotify_fd); - fanotify_fd = -1; - } + fanotify_fd = safe_close(fanotify_fd); log_debug("Writing Pack File..."); on_ssd = fs_on_ssd(root) > 0; log_debug("On SSD: %s", yes_no(on_ssd)); - on_btrfs = statfs(root, &sfs) >= 0 && (long) sfs.f_type == (long) BTRFS_SUPER_MAGIC; + on_btrfs = statfs(root, &sfs) >= 0 && F_TYPE_EQUAL(sfs.f_type, BTRFS_SUPER_MAGIC); log_debug("On btrfs: %s", yes_no(on_btrfs)); if (asprintf(&pack_fn_new, "%s/.readahead.new", root) < 0) { @@ -498,8 +530,7 @@ done: HASHMAP_FOREACH_KEY(q, p, files, i) pack_file(pack, p, on_btrfs); } else { - struct item *ordered, *j; - unsigned k, n; + unsigned n; /* On rotating media, order things by the block * numbers */ @@ -507,26 +538,31 @@ done: log_debug("Ordering..."); n = hashmap_size(files); - if (!(ordered = new(struct item, n))) { - r = log_oom(); - goto finish; - } - - j = ordered; - HASHMAP_FOREACH_KEY(q, p, files, i) { - j->path = p; - j->block = PTR_TO_SECTOR(q); - j++; - } + if (n) { + _cleanup_free_ struct item *ordered; + struct item *j; + unsigned k; + + ordered = new(struct item, n); + if (!ordered) { + r = log_oom(); + goto finish; + } - assert(ordered + n == j); + j = ordered; + HASHMAP_FOREACH_KEY(q, p, files, i) { + memcpy(j, q, sizeof(struct item)); + j++; + } - qsort(ordered, n, sizeof(struct item), qsort_compare); + assert(ordered + n == j); - for (k = 0; k < n; k++) - pack_file(pack, ordered[k].path, on_btrfs); + qsort(ordered, n, sizeof(struct item), qsort_compare); - free(ordered); + for (k = 0; k < n; k++) + pack_file(pack, ordered[k].path, on_btrfs); + } else + log_warning("No pack files"); } log_debug("Finalizing..."); @@ -551,14 +587,9 @@ done: log_debug("Done."); finish: - if (fanotify_fd >= 0) - close_nointr_nofail(fanotify_fd); - - if (signal_fd >= 0) - close_nointr_nofail(signal_fd); - - if (inotify_fd >= 0) - close_nointr_nofail(inotify_fd); + safe_close(fanotify_fd); + safe_close(signal_fd); + safe_close(inotify_fd); if (pack) { fclose(pack);