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: keep per-JournalFile location info during iteration
[elogind.git]
/
src
/
journal
/
sd-journal.c
diff --git
a/src/journal/sd-journal.c
b/src/journal/sd-journal.c
index 390e5831e18bcbca2dde050d3c5eded11a32573e..71b056c234fa827ec3e8d41f60dd22d433523e42 100644
(file)
--- a/
src/journal/sd-journal.c
+++ b/
src/journal/sd-journal.c
@@
-87,7
+87,7
@@
static void detach_location(sd_journal *j) {
j->current_field = 0;
ORDERED_HASHMAP_FOREACH(f, j->files, i)
j->current_field = 0;
ORDERED_HASHMAP_FOREACH(f, j->files, i)
-
f->current_offset = 0
;
+
journal_file_reset_location(f)
;
}
static void reset_location(sd_journal *j) {
}
static void reset_location(sd_journal *j) {
@@
-128,6
+128,10
@@
static void set_location(sd_journal *j, LocationType type, JournalFile *f, Objec
f->last_direction = direction;
f->current_offset = offset;
f->last_direction = direction;
f->current_offset = offset;
+
+ /* Let f know its candidate entry was picked. */
+ assert(f->location_type == LOCATION_SEEK);
+ f->location_type = LOCATION_DISCRETE;
}
static int match_is_valid(const void *data, size_t size) {
}
static int match_is_valid(const void *data, size_t size) {
@@
-855,6
+859,8
@@
static int next_beyond_location(sd_journal *j, JournalFile *f, direction_t direc
found = true;
if (found) {
found = true;
if (found) {
+ journal_file_save_location(f, direction, c, cp);
+
if (ret)
*ret = c;
if (offset)
if (ret)
*ret = c;
if (offset)
@@
-884,11
+890,13
@@
static int real_journal_next(sd_journal *j, direction_t direction) {
r = next_beyond_location(j, f, direction, &o, &p);
if (r < 0) {
r = next_beyond_location(j, f, direction, &o, &p);
if (r < 0) {
- log_debug_errno(
-
r, "Can't iterate through %s, ignoring: %m", f->path);
+ log_debug_errno(r, "Can't iterate through %s, ignoring: %m", f->path);
remove_file_real(j, f);
continue;
remove_file_real(j, f);
continue;
- } else if (r == 0)
+ } else if (r == 0) {
+ f->location_type = LOCATION_TAIL;
continue;
continue;
+ }
if (!new_file)
found = true;
if (!new_file)
found = true;
@@
-1410,7
+1418,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
+1464,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
+1474,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
+1554,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
+1564,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
+1575,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_errno(
-
r, "Failed to add directory %s/%s: %m", m->path, de->d_name);
+ log_debug_errno(r, "Failed to add directory %s/%s: %m", m->path, de->d_name);
}
}
}
}
@@
-1810,7
+1818,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_errno(
-
r, "Failed to open %s: %m", *path);
+ log_error_errno(r, "Failed to open %s: %m", *path);
goto fail;
}
}
goto fail;
}
}
@@
-2218,8
+2226,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
+2235,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_errno(
-
r, "Failed to remove file %s/%s: %m", d->path, e->name);
+ 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
+2245,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_errno(
-
r, "Failed to remove directory %s: %m", d->path);
+ log_debug_errno(r, "Failed to remove directory %s: %m", d->path);
}
}
@@
-2248,7
+2256,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_errno(
-
r, "Failed to add directory %s/%s: %m", d->path, e->name);
+ log_debug_errno(r, "Failed to add directory %s/%s: %m", d->path, e->name);
}
}
}
}
@@
-2273,7
+2281,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
+2289,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
+2303,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;
- }
}
}
}
}
@@
-2526,7
+2524,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) {
@@
-2552,10
+2549,10
@@
_public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
continue;
}
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
+2564,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;
@@
-2615,10
+2608,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;