summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-10-14 05:38:40 +0200
committerLennart Poettering <lennart@poettering.net>2011-10-14 05:38:40 +0200
commit7210bfb3706f8cbb2b35403f916dace1824c516c (patch)
tree1977b24cbc32c94c1ec26ac02d5610e1dc13caf7
parentae2cc8efc1659dcc6219dfcd07287288666aa303 (diff)
journal: move field index from file into journal object
-rw-r--r--src/journal/journal-file.h1
-rw-r--r--src/journal/sd-journal.c42
2 files changed, 34 insertions, 9 deletions
diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
index 92f671a756..0294555cab 100644
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -52,7 +52,6 @@ typedef struct JournalFile {
uint64_t window_size;
uint64_t current_offset;
- uint64_t current_field;
} JournalFile;
int journal_file_open(const char *fname, int flags, mode_t mode, JournalFile *template, JournalFile **ret);
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 35f911f2ba..74abac88af 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -43,6 +43,7 @@ struct sd_journal {
Hashmap *files;
JournalFile *current_file;
+ uint64_t current_field;
LIST_HEAD(Match, matches);
};
@@ -177,7 +178,7 @@ int sd_journal_next(sd_journal *j) {
if (new_current) {
j->current_file = new_current;
j->current_file->current_offset = new_offset;
- j->current_file->current_field = 0;
+ j->current_field = 0;
/* Skip over any identical entries in the other files too */
@@ -201,10 +202,8 @@ int sd_journal_next(sd_journal *j) {
else if (r == 0)
continue;
- if (compare_order(new_current, new_entry, new_offset, f, o, p) == 0) {
+ if (compare_order(new_current, new_entry, new_offset, f, o, p) == 0)
f->current_offset = p;
- f->current_field = 0;
- }
}
return 1;
@@ -249,7 +248,34 @@ int sd_journal_previous(sd_journal *j) {
if (new_current) {
j->current_file = new_current;
j->current_file->current_offset = new_offset;
- j->current_file->current_field = 0;
+ j->current_field = 0;
+
+ /* Skip over any identical entries in the other files too */
+
+ HASHMAP_FOREACH(f, j->files, i) {
+ Object *o;
+ uint64_t p;
+
+ if (j->current_file == f)
+ continue;
+
+ if (f->current_offset > 0) {
+ r = journal_file_move_to_object(f, f->current_offset, OBJECT_ENTRY, &o);
+ if (r < 0)
+ return r;
+ } else
+ o = NULL;
+
+ r = journal_file_prev_entry(f, o, &o, &p);
+ if (r < 0)
+ return r;
+ else if (r == 0)
+ continue;
+
+ if (compare_order(new_current, new_entry, new_offset, f, o, p) == 0)
+ f->current_offset = p;
+ }
+
return 1;
}
@@ -592,10 +618,10 @@ int sd_journal_iterate_fields(sd_journal *j, const void **data, size_t *size) {
return r;
n = journal_file_entry_n_items(o);
- if (f->current_field >= n)
+ if (j->current_field >= n)
return 0;
- p = le64toh(o->entry.items[f->current_field].object_offset);
+ p = le64toh(o->entry.items[j->current_field].object_offset);
r = journal_file_move_to_object(f, p, OBJECT_DATA, &o);
if (r < 0)
return r;
@@ -610,7 +636,7 @@ int sd_journal_iterate_fields(sd_journal *j, const void **data, size_t *size) {
*data = o->data.payload;
*size = t;
- f->current_field ++;
+ j->current_field ++;
return 1;
}