summaryrefslogtreecommitdiff
path: root/src/readahead-collect.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-09-25 13:32:54 +0200
committerLennart Poettering <lennart@poettering.net>2010-09-25 13:32:54 +0200
commit41a598e21a9f6cfe8dad7759c3c9facd55774acf (patch)
treeb74c8538677aaf55fa7d2bdacc6ebfbf4b57a40e /src/readahead-collect.c
parent4030d7a923427a50745fc5786f4905aa703f0bcb (diff)
readahead: disable on low memory machines
Diffstat (limited to 'src/readahead-collect.c')
-rw-r--r--src/readahead-collect.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/src/readahead-collect.c b/src/readahead-collect.c
index 937231ca42..fe35da7004 100644
--- a/src/readahead-collect.c
+++ b/src/readahead-collect.c
@@ -50,6 +50,12 @@
#define MINCORE_VEC_SIZE (READAHEAD_FILE_SIZE_MAX/PAGE_SIZE)
+/* fixme:
+ *
+ * - detect ssd/lvm/... on btrfs
+ * - read ahead directories
+ */
+
static int btrfs_defrag(int fd) {
struct btrfs_ioctl_vol_args data;
@@ -302,10 +308,7 @@ static int collect(const char *root) {
ul = fd_first_block(m->fd);
if ((k = hashmap_put(files, p, ULONG_TO_PTR(ul))) < 0) {
-
- if (k != -EEXIST)
- log_warning("set_put() failed: %s", strerror(-k));
-
+ log_warning("set_put() failed: %s", strerror(-k));
free(p);
}
}
@@ -355,7 +358,7 @@ static int collect(const char *root) {
if (on_ssd || on_btrfs) {
/* On SSD or on btrfs, just write things out in the
- * order the files where accessed. */
+ * order the files were accessed. */
HASHMAP_FOREACH_KEY(q, p, files, i)
pack_file(pack, p, on_btrfs);
@@ -442,6 +445,11 @@ int main(int argc, char *argv[]) {
log_parse_environment();
log_open();
+ if (!enough_ram()) {
+ log_info("Disabling readahead collector due to low memory.");
+ return 0;
+ }
+
if (collect(argc >= 2 ? argv[1] : "/") < 0)
return 1;