shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-05 13:18:06 +03:00
Code

readahead: ignore replay events when collecting

Browse Source
This commit is contained in:
Lennart Poettering 2010-09-28 21:46:14 +02:00
parent c457e08335
commit d9c7a87b35
4 changed files with 86 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/readahead-collect.c
View File

@ -64,6 +64,8 @@ static unsigned arg_files_max = 16*1024;
static off_t arg_file_size_max = READAHEAD_FILE_SIZE_MAX;
static usec_t arg_timeout = 2*USEC_PER_MINUTE;
static ReadaheadShared *shared = NULL;
/* 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)
@ -379,36 +381,44 @@ 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];
int k;
if (m->pid != my_pid && m->fd >= 0) {
char fn[PATH_MAX];
int k;
if (m->fd < 0)
goto next_iteration;
snprintf(fn, sizeof(fn), "/proc/self/fd/%i", m->fd);
char_array_0(fn);
if (m->pid == my_pid)
goto next_iteration;
if ((k = readlink_malloc(fn, &p)) >= 0) {
__sync_synchronize();
if (m->pid == shared->replay)
goto next_iteration;
if (startswith(p, "/tmp") ||
hashmap_get(files, p))
/* Not interesting, or
* already read */
snprintf(fn, sizeof(fn), "/proc/self/fd/%i", m->fd);
char_array_0(fn);
if ((k = readlink_malloc(fn, &p)) >= 0) {
if (startswith(p, "/tmp") ||
hashmap_get(files, p))
/* Not interesting, or
* already read */
free(p);
else {
unsigned long ul;
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));
free(p);
else {
unsigned long ul;
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));
free(p);
}
}
}
} else
log_warning("readlink(%s) failed: %s", fn, strerror(-k));
}
} else
log_warning("readlink(%s) failed: %s", fn, strerror(-k));
next_iteration:
if (m->fd)
close_nointr_nofail(m->fd);
}
@ -635,6 +645,12 @@ int main(int argc, char *argv[]) {
return 0;
}
if (!(shared = shared_get()))
return 1;
shared->collect = getpid();
__sync_synchronize();
if (collect(optind < argc ? argv[optind] : "/") < 0)
return 1;

30
src/readahead-common.c
View File

@ -25,6 +25,9 @@
#include <string.h>
#include <sys/sysinfo.h>
#include <sys/inotify.h>
#include <fcntl.h>
#include <sys/mman.h>
#include <unistd.h>
#include "log.h"
#include "readahead-common.h"
@ -137,3 +140,30 @@ int open_inotify(void) {
return fd;
}
ReadaheadShared *shared_get(void) {
int fd;
ReadaheadShared *m = NULL;
if ((fd = open("/dev/.systemd/readahead/shared", O_CREAT|O_RDWR|O_CLOEXEC, 0644)) < 0) {
log_error("Failed to create shared memory segment: %m");
goto finish;
}
if (ftruncate(fd, sizeof(ReadaheadShared)) < 0) {
log_error("Failed to truncate shared memory segment: %m");
goto finish;
}
if ((m = mmap(NULL, sizeof(ReadaheadShared), PROT_WRITE|PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) {
log_error("Failed to mmap shared memory segment: %m");
m = NULL;
goto finish;
}
finish:
if (fd >= 0)
close_nointr_nofail(fd);
return m;
}

10
src/readahead-common.h
View File

@ -23,6 +23,9 @@
***/
#include <sys/stat.h>
#include <sys/types.h>
#include "macro.h"
#define READAHEAD_FILE_SIZE_MAX (128*1024*1024)
@ -34,4 +37,11 @@ bool enough_ram(void);
int open_inotify(void);
typedef struct ReadaheadShared {
pid_t collect;
pid_t replay;
} _packed_ ReadaheadShared;
ReadaheadShared *shared_get(void);
#endif

8
src/readahead-replay.c
View File

@ -44,6 +44,8 @@
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;
@ -338,6 +340,12 @@ int main(int argc, char*argv[]) {
return 0;
}
if (!(shared = shared_get()))
return 1;
shared->replay = getpid();
__sync_synchronize();
if (replay(optind < argc ? argv[optind] : "/") < 0)
return 1;