chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: abstract the resetting of JournalFile's location
[elogind.git]
/
src
/
journal
/
sd-journal.c
diff --git
a/src/journal/sd-journal.c
b/src/journal/sd-journal.c
index ac57f4f6f8942f28d6ff9469f6d132e97487da16..adaf402f46ced2781f32b590444dd80f390b6c27 100644
(file)
--- a/
src/journal/sd-journal.c
+++ b/
src/journal/sd-journal.c
@@
-86,8
+86,8
@@
static void detach_location(sd_journal *j) {
j->current_file = NULL;
j->current_field = 0;
j->current_file = NULL;
j->current_field = 0;
- HASHMAP_FOREACH(f, j->files, i)
-
f->current_offset = 0
;
+
ORDERED_
HASHMAP_FOREACH(f, j->files, i)
+
journal_file_reset_location(f)
;
}
static void reset_location(sd_journal *j) {
}
static void reset_location(sd_journal *j) {
@@
-879,12
+879,12
@@
static int real_journal_next(sd_journal *j, direction_t direction) {
assert_return(j, -EINVAL);
assert_return(!journal_pid_changed(j), -ECHILD);
assert_return(j, -EINVAL);
assert_return(!journal_pid_changed(j), -ECHILD);
- HASHMAP_FOREACH(f, j->files, i) {
+
ORDERED_
HASHMAP_FOREACH(f, j->files, i) {
bool found;
r = next_beyond_location(j, f, direction, &o, &p);
if (r < 0) {
bool found;
r = next_beyond_location(j, f, direction, &o, &p);
if (r < 0) {
- log_debug
("Can't iterate through %s, ignoring: %s", f->path, strerror(-r)
);
+ log_debug
_errno(r, "Can't iterate through %s, ignoring: %m", f->path
);
remove_file_real(j, f);
continue;
} else if (r == 0)
remove_file_real(j, f);
continue;
} else if (r == 0)
@@
-1288,10
+1288,10
@@
static int add_any_file(sd_journal *j, const char *path) {
assert(j);
assert(path);
assert(j);
assert(path);
- if (hashmap_get(j->files, path))
+ if (
ordered_
hashmap_get(j->files, path))
return 0;
return 0;
- if (hashmap_size(j->files) >= JOURNAL_FILES_MAX) {
+ if (
ordered_
hashmap_size(j->files) >= JOURNAL_FILES_MAX) {
log_warning("Too many open journal files, not adding %s.", path);
return set_put_error(j, -ETOOMANYREFS);
}
log_warning("Too many open journal files, not adding %s.", path);
return set_put_error(j, -ETOOMANYREFS);
}
@@
-1302,7
+1302,7
@@
static int add_any_file(sd_journal *j, const char *path) {
/* journal_file_dump(f); */
/* journal_file_dump(f); */
- r = hashmap_put(j->files, f->path, f);
+ r =
ordered_
hashmap_put(j->files, f->path, f);
if (r < 0) {
journal_file_close(f);
return r;
if (r < 0) {
journal_file_close(f);
return r;
@@
-1351,7
+1351,7
@@
static int remove_file(sd_journal *j, const char *prefix, const char *filename)
if (!path)
return -ENOMEM;
if (!path)
return -ENOMEM;
- f = hashmap_get(j->files, path);
+ f =
ordered_
hashmap_get(j->files, path);
if (!f)
return 0;
if (!f)
return 0;
@@
-1363,7
+1363,7
@@
static void remove_file_real(sd_journal *j, JournalFile *f) {
assert(j);
assert(f);
assert(j);
assert(f);
- hashmap_remove(j->files, f->path);
+
ordered_
hashmap_remove(j->files, f->path);
log_debug("File %s removed.", f->path);
log_debug("File %s removed.", f->path);
@@
-1374,7
+1374,7
@@
static void remove_file_real(sd_journal *j, JournalFile *f) {
if (j->unique_file == f) {
/* Jump to the next unique_file or NULL if that one was last */
if (j->unique_file == f) {
/* Jump to the next unique_file or NULL if that one was last */
- j->unique_file = hashmap_next(j->files, j->unique_file->path);
+ j->unique_file =
ordered_
hashmap_next(j->files, j->unique_file->path);
j->unique_offset = 0;
if (!j->unique_file)
j->unique_file_lost = true;
j->unique_offset = 0;
if (!j->unique_file)
j->unique_file_lost = true;
@@
-1410,7
+1410,7
@@
static int add_directory(sd_journal *j, const char *prefix, const char *dirname)
d = opendir(path);
if (!d) {
d = opendir(path);
if (!d) {
- log_debug
(
"Failed to open %s: %m", path);
+ log_debug
_errno(errno,
"Failed to open %s: %m", path);
if (errno == ENOENT)
return 0;
return -errno;
if (errno == ENOENT)
return 0;
return -errno;
@@
-1456,7
+1456,7
@@
static int add_directory(sd_journal *j, const char *prefix, const char *dirname)
de = readdir(d);
if (!de && errno != 0) {
r = -errno;
de = readdir(d);
if (!de && errno != 0) {
r = -errno;
- log_debug
(
"Failed to read directory %s: %m", m->path);
+ log_debug
_errno(errno,
"Failed to read directory %s: %m", m->path);
return r;
}
if (!de)
return r;
}
if (!de)
@@
-1466,8
+1466,8
@@
static int add_directory(sd_journal *j, const char *prefix, const char *dirname)
dirent_is_file_with_suffix(de, ".journal~")) {
r = add_file(j, m->path, de->d_name);
if (r < 0) {
dirent_is_file_with_suffix(de, ".journal~")) {
r = add_file(j, m->path, de->d_name);
if (r < 0) {
- log_debug
("Failed to add file %s/%s: %s
",
-
m->path, de->d_name, strerror(-r)
);
+ log_debug
_errno(r, "Failed to add file %s/%s: %m
",
+
m->path, de->d_name
);
r = set_put_error(j, r);
if (r < 0)
return r;
r = set_put_error(j, r);
if (r < 0)
return r;
@@
-1546,7
+1546,7
@@
static int add_root_directory(sd_journal *j, const char *p) {
de = readdir(d);
if (!de && errno != 0) {
r = -errno;
de = readdir(d);
if (!de && errno != 0) {
r = -errno;
- log_debug
(
"Failed to read directory %s: %m", m->path);
+ log_debug
_errno(errno,
"Failed to read directory %s: %m", m->path);
return r;
}
if (!de)
return r;
}
if (!de)
@@
-1556,8
+1556,8
@@
static int add_root_directory(sd_journal *j, const char *p) {
dirent_is_file_with_suffix(de, ".journal~")) {
r = add_file(j, m->path, de->d_name);
if (r < 0) {
dirent_is_file_with_suffix(de, ".journal~")) {
r = add_file(j, m->path, de->d_name);
if (r < 0) {
- log_debug
("Failed to add file %s/%s: %s
",
-
m->path, de->d_name, strerror(-r)
);
+ log_debug
_errno(r, "Failed to add file %s/%s: %m
",
+
m->path, de->d_name
);
r = set_put_error(j, r);
if (r < 0)
return r;
r = set_put_error(j, r);
if (r < 0)
return r;
@@
-1567,7
+1567,7
@@
static int add_root_directory(sd_journal *j, const char *p) {
r = add_directory(j, m->path, de->d_name);
if (r < 0)
r = add_directory(j, m->path, de->d_name);
if (r < 0)
- log_debug
("Failed to add directory %s/%s: %s", m->path, de->d_name, strerror(-r)
);
+ log_debug
_errno(r, "Failed to add directory %s/%s: %m", m->path, de->d_name
);
}
}
}
}
@@
-1634,7
+1634,7
@@
static int add_current_paths(sd_journal *j) {
* "root" directories. We don't expect errors here, so we
* treat them as fatal. */
* "root" directories. We don't expect errors here, so we
* treat them as fatal. */
- HASHMAP_FOREACH(f, j->files, i) {
+
ORDERED_
HASHMAP_FOREACH(f, j->files, i) {
_cleanup_free_ char *dir;
int r;
_cleanup_free_ char *dir;
int r;
@@
-1689,7
+1689,7
@@
static sd_journal *journal_new(int flags, const char *path) {
goto fail;
}
goto fail;
}
- j->files = hashmap_new(&string_hash_ops);
+ j->files =
ordered_
hashmap_new(&string_hash_ops);
j->directories_by_path = hashmap_new(&string_hash_ops);
j->mmap = mmap_cache_new();
if (!j->files || !j->directories_by_path || !j->mmap)
j->directories_by_path = hashmap_new(&string_hash_ops);
j->mmap = mmap_cache_new();
if (!j->files || !j->directories_by_path || !j->mmap)
@@
-1810,7
+1810,7
@@
_public_ int sd_journal_open_files(sd_journal **ret, const char **paths, int fla
STRV_FOREACH(path, paths) {
r = add_any_file(j, *path);
if (r < 0) {
STRV_FOREACH(path, paths) {
r = add_any_file(j, *path);
if (r < 0) {
- log_error
("Failed to open %s: %s", *path, strerror(-r)
);
+ log_error
_errno(r, "Failed to open %s: %m", *path
);
goto fail;
}
}
goto fail;
}
}
@@
-1835,10
+1835,10
@@
_public_ void sd_journal_close(sd_journal *j) {
sd_journal_flush_matches(j);
sd_journal_flush_matches(j);
- while ((f = hashmap_steal_first(j->files)))
+ while ((f =
ordered_
hashmap_steal_first(j->files)))
journal_file_close(f);
journal_file_close(f);
- hashmap_free(j->files);
+
ordered_
hashmap_free(j->files);
while ((d = hashmap_first(j->directories_by_path)))
remove_directory(j, d);
while ((d = hashmap_first(j->directories_by_path)))
remove_directory(j, d);
@@
-2218,8
+2218,8
@@
static void process_inotify_event(sd_journal *j, struct inotify_event *e) {
if (e->mask & (IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB)) {
r = add_file(j, d->path, e->name);
if (r < 0) {
if (e->mask & (IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB)) {
r = add_file(j, d->path, e->name);
if (r < 0) {
- log_debug
("Failed to add file %s/%s: %s
",
-
d->path, e->name, strerror(-r)
);
+ log_debug
_errno(r, "Failed to add file %s/%s: %m
",
+
d->path, e->name
);
set_put_error(j, r);
}
set_put_error(j, r);
}
@@
-2227,7
+2227,7
@@
static void process_inotify_event(sd_journal *j, struct inotify_event *e) {
r = remove_file(j, d->path, e->name);
if (r < 0)
r = remove_file(j, d->path, e->name);
if (r < 0)
- log_debug
("Failed to remove file %s/%s: %s", d->path, e->name, strerror(-r)
);
+ log_debug
_errno(r, "Failed to remove file %s/%s: %m", d->path, e->name
);
}
} else if (!d->is_root && e->len == 0) {
}
} else if (!d->is_root && e->len == 0) {
@@
-2237,7
+2237,7
@@
static void process_inotify_event(sd_journal *j, struct inotify_event *e) {
if (e->mask & (IN_DELETE_SELF|IN_MOVE_SELF|IN_UNMOUNT)) {
r = remove_directory(j, d);
if (r < 0)
if (e->mask & (IN_DELETE_SELF|IN_MOVE_SELF|IN_UNMOUNT)) {
r = remove_directory(j, d);
if (r < 0)
- log_debug
("Failed to remove directory %s: %s", d->path, strerror(-r)
);
+ log_debug
_errno(r, "Failed to remove directory %s: %m", d->path
);
}
}
@@
-2248,7
+2248,7
@@
static void process_inotify_event(sd_journal *j, struct inotify_event *e) {
if (e->mask & (IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB)) {
r = add_directory(j, d->path, e->name);
if (r < 0)
if (e->mask & (IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB)) {
r = add_directory(j, d->path, e->name);
if (r < 0)
- log_debug
("Failed to add directory %s/%s: %s", d->path, e->name, strerror(-r)
);
+ log_debug
_errno(r, "Failed to add directory %s/%s: %m", d->path, e->name
);
}
}
}
}
@@
-2273,7
+2273,6
@@
static int determine_change(sd_journal *j) {
}
_public_ int sd_journal_process(sd_journal *j) {
}
_public_ int sd_journal_process(sd_journal *j) {
- uint8_t buffer[sizeof(struct inotify_event) + FILENAME_MAX] _alignas_(struct inotify_event);
bool got_something = false;
assert_return(j, -EINVAL);
bool got_something = false;
assert_return(j, -EINVAL);
@@
-2282,6
+2281,7
@@
_public_ int sd_journal_process(sd_journal *j) {
j->last_process_usec = now(CLOCK_MONOTONIC);
for (;;) {
j->last_process_usec = now(CLOCK_MONOTONIC);
for (;;) {
+ uint8_t buffer[INOTIFY_EVENT_MAX] _alignas_(struct inotify_event);
struct inotify_event *e;
ssize_t l;
struct inotify_event *e;
ssize_t l;
@@
-2295,18
+2295,8
@@
_public_ int sd_journal_process(sd_journal *j) {
got_something = true;
got_something = true;
- e = (struct inotify_event*) buffer;
- while (l > 0) {
- size_t step;
-
+ FOREACH_INOTIFY_EVENT(e, buffer, l)
process_inotify_event(j, e);
process_inotify_event(j, e);
-
- step = sizeof(struct inotify_event) + e->len;
- assert(step <= (size_t) l);
-
- e = (struct inotify_event*) ((uint8_t*) e + step);
- l -= step;
- }
}
}
}
}
@@
-2368,7
+2358,7
@@
_public_ int sd_journal_get_cutoff_realtime_usec(sd_journal *j, uint64_t *from,
assert_return(from || to, -EINVAL);
assert_return(from != to, -EINVAL);
assert_return(from || to, -EINVAL);
assert_return(from != to, -EINVAL);
- HASHMAP_FOREACH(f, j->files, i) {
+
ORDERED_
HASHMAP_FOREACH(f, j->files, i) {
usec_t fr, t;
r = journal_file_get_cutoff_realtime_usec(f, &fr, &t);
usec_t fr, t;
r = journal_file_get_cutoff_realtime_usec(f, &fr, &t);
@@
-2408,7
+2398,7
@@
_public_ int sd_journal_get_cutoff_monotonic_usec(sd_journal *j, sd_id128_t boot
assert_return(from || to, -EINVAL);
assert_return(from != to, -EINVAL);
assert_return(from || to, -EINVAL);
assert_return(from != to, -EINVAL);
- HASHMAP_FOREACH(f, j->files, i) {
+
ORDERED_
HASHMAP_FOREACH(f, j->files, i) {
usec_t fr, t;
r = journal_file_get_cutoff_monotonic_usec(f, boot_id, &fr, &t);
usec_t fr, t;
r = journal_file_get_cutoff_monotonic_usec(f, boot_id, &fr, &t);
@@
-2443,7
+2433,7
@@
void journal_print_header(sd_journal *j) {
assert(j);
assert(j);
- HASHMAP_FOREACH(f, j->files, i) {
+
ORDERED_
HASHMAP_FOREACH(f, j->files, i) {
if (newline)
putchar('\n');
else
if (newline)
putchar('\n');
else
@@
-2462,7
+2452,7
@@
_public_ int sd_journal_get_usage(sd_journal *j, uint64_t *bytes) {
assert_return(!journal_pid_changed(j), -ECHILD);
assert_return(bytes, -EINVAL);
assert_return(!journal_pid_changed(j), -ECHILD);
assert_return(bytes, -EINVAL);
- HASHMAP_FOREACH(f, j->files, i) {
+
ORDERED_
HASHMAP_FOREACH(f, j->files, i) {
struct stat st;
if (fstat(f->fd, &st) < 0)
struct stat st;
if (fstat(f->fd, &st) < 0)
@@
-2511,7
+2501,7
@@
_public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
if (j->unique_file_lost)
return 0;
if (j->unique_file_lost)
return 0;
- j->unique_file = hashmap_first(j->files);
+ j->unique_file =
ordered_
hashmap_first(j->files);
if (!j->unique_file)
return 0;
if (!j->unique_file)
return 0;
@@
-2526,7
+2516,6
@@
_public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
size_t ol;
bool found;
int r;
size_t ol;
bool found;
int r;
- void *release_cookie;
/* Proceed to next data object in the field's linked list */
if (j->unique_offset == 0) {
/* Proceed to next data object in the field's linked list */
if (j->unique_offset == 0) {
@@
-2545,17
+2534,17
@@
_public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
/* We reached the end of the list? Then start again, with the next file */
if (j->unique_offset == 0) {
/* We reached the end of the list? Then start again, with the next file */
if (j->unique_offset == 0) {
- j->unique_file = hashmap_next(j->files, j->unique_file->path);
+ j->unique_file =
ordered_
hashmap_next(j->files, j->unique_file->path);
if (!j->unique_file)
return 0;
continue;
}
if (!j->unique_file)
return 0;
continue;
}
- /* We do not use
the type context here, but 0 instead,
- * so that we can look at this data object at the same
+ /* We do not use
OBJECT_DATA context here, but OBJECT_UNUSED
+ *
instead,
so that we can look at this data object at the same
* time as one on another file */
* time as one on another file */
- r = journal_file_move_to_object(j->unique_file,
0
, j->unique_offset, &o);
+ r = journal_file_move_to_object(j->unique_file,
OBJECT_UNUSED
, j->unique_offset, &o);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-2567,10
+2556,6
@@
_public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
return -EBADMSG;
}
return -EBADMSG;
}
- r = journal_file_object_keep(j->unique_file, o, j->unique_offset, &release_cookie);
- if (r < 0)
- return r;
-
r = return_data(j, j->unique_file, o, &odata, &ol);
if (r < 0)
return r;
r = return_data(j, j->unique_file, o, &odata, &ol);
if (r < 0)
return r;
@@
-2594,7
+2579,7
@@
_public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
* object by checking if it exists in the earlier
* traversed files. */
found = false;
* object by checking if it exists in the earlier
* traversed files. */
found = false;
- HASHMAP_FOREACH(of, j->files, i) {
+
ORDERED_
HASHMAP_FOREACH(of, j->files, i) {
Object *oo;
uint64_t op;
Object *oo;
uint64_t op;
@@
-2615,10
+2600,6
@@
_public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
found = true;
}
found = true;
}
- r = journal_file_object_release(j->unique_file, release_cookie);
- if (r < 0)
- return r;
-
if (found)
continue;
if (found)
continue;