chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hostnamed: introduce systemd-hostnamed
[elogind.git]
/
src
/
readahead-collect.c
diff --git
a/src/readahead-collect.c
b/src/readahead-collect.c
index 5c09f7a9e1df140b29f61585506476cacf7bbc19..3c48a02fc9e49dc9a92c3e43d4715a0dbcbfbbe9 100644
(file)
--- a/
src/readahead-collect.c
+++ b/
src/readahead-collect.c
@@
-92,6
+92,13
@@
static int pack_file(FILE *pack, const char *fn, bool on_btrfs) {
assert(fn);
if ((fd = open(fn, O_RDONLY|O_CLOEXEC|O_NOATIME|O_NOCTTY|O_NOFOLLOW)) < 0) {
assert(fn);
if ((fd = open(fn, O_RDONLY|O_CLOEXEC|O_NOATIME|O_NOCTTY|O_NOFOLLOW)) < 0) {
+
+ if (errno == ENOENT)
+ return 0;
+
+ if (errno == EPERM || errno == EACCES)
+ return 0;
+
log_warning("open(%s) failed: %m", fn);
r = -errno;
goto finish;
log_warning("open(%s) failed: %m", fn);
r = -errno;
goto finish;
@@
-112,9
+119,10
@@
static int pack_file(FILE *pack, const char *fn, bool on_btrfs) {
goto finish;
}
goto finish;
}
- pages = l /
PAGE_SIZE
;
+ pages = l /
page_size()
;
vec = alloca(pages);
vec = alloca(pages);
+ memset(vec, 0, pages);
if (mincore(start, l, vec) < 0) {
log_warning("mincore(%s) failed: %m", fn);
r = -errno;
if (mincore(start, l, vec) < 0) {
log_warning("mincore(%s) failed: %m", fn);
r = -errno;
@@
-282,13
+290,13
@@
static int collect(const char *root) {
log_debug("Collecting...");
log_debug("Collecting...");
- if (access("/
dev/.
systemd/readahead/cancel", F_OK) >= 0) {
+ if (access("/
run/
systemd/readahead/cancel", F_OK) >= 0) {
log_debug("Collection canceled");
r = -ECANCELED;
goto finish;
}
log_debug("Collection canceled");
r = -ECANCELED;
goto finish;
}
- if (access("/
dev/.
systemd/readahead/done", F_OK) >= 0) {
+ if (access("/
run/
systemd/readahead/done", F_OK) >= 0) {
log_debug("Got termination request");
goto done;
}
log_debug("Got termination request");
goto done;
}
@@
-398,8
+406,8
@@
static int collect(const char *root) {
char_array_0(fn);
if ((k = readlink_malloc(fn, &p)) >= 0) {
char_array_0(fn);
if ((k = readlink_malloc(fn, &p)) >= 0) {
-
if (startswith(p, "/tmp") ||
if (startswith(p, "/tmp") ||
+ endswith(p, " (deleted)") ||
hashmap_get(files, p))
/* Not interesting, or
* already read */
hashmap_get(files, p))
/* Not interesting, or
* already read */
@@
-435,7
+443,7
@@
done:
on_ssd = fs_on_ssd(root) > 0;
log_debug("On SSD: %s", yes_no(on_ssd));
on_ssd = fs_on_ssd(root) > 0;
log_debug("On SSD: %s", yes_no(on_ssd));
- on_btrfs = statfs(root, &sfs) >= 0 &&
sfs.f_type ==
BTRFS_SUPER_MAGIC;
+ on_btrfs = statfs(root, &sfs) >= 0 &&
(long) sfs.f_type == (long)
BTRFS_SUPER_MAGIC;
log_debug("On btrfs: %s", yes_no(on_btrfs));
asprintf(&pack_fn, "%s/.readahead", root);
log_debug("On btrfs: %s", yes_no(on_btrfs));
asprintf(&pack_fn, "%s/.readahead", root);
@@
-632,6
+640,7
@@
static int parse_argv(int argc, char *argv[]) {
int main(int argc, char *argv[]) {
int r;
int main(int argc, char *argv[]) {
int r;
+ const char *root;
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_parse_environment();
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_parse_environment();
@@
-640,18
+649,30
@@
int main(int argc, char *argv[]) {
if ((r = parse_argv(argc, argv)) <= 0)
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
if ((r = parse_argv(argc, argv)) <= 0)
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+ root = optind < argc ? argv[optind] : "/";
+
+ if (fs_on_read_only(root) > 0) {
+ log_info("Disabling readahead collector due to read-only media.");
+ return 0;
+ }
+
if (!enough_ram()) {
log_info("Disabling readahead collector due to low memory.");
return 0;
}
if (!enough_ram()) {
log_info("Disabling readahead collector due to low memory.");
return 0;
}
+ if (detect_virtualization(NULL) > 0) {
+ log_info("Disabling readahead collector due to execution in virtualized environment.");
+ return 0;
+ }
+
if (!(shared = shared_get()))
return 1;
shared->collect = getpid();
__sync_synchronize();
if (!(shared = shared_get()))
return 1;
shared->collect = getpid();
__sync_synchronize();
- if (collect(
optind < argc ? argv[optind] : "/"
) < 0)
+ if (collect(
root
) < 0)
return 1;
return 0;
return 1;
return 0;