shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

journal: automaticall reset location when the set of matches changes

Browse Source
This commit is contained in:
Lennart Poettering 2011-10-15 02:53:04 +02:00
parent 8725d60ae4
commit 8f9b6cd9eb
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/journal/sd-journal.c
View File

@ -50,6 +50,19 @@ struct sd_journal {
unsigned n_matches;
};
static void reset_location(sd_journal *j) {
Iterator i;
JournalFile *f;
assert(j);
j->current_file = NULL;
j->current_field = 0;
HASHMAP_FOREACH(f, j->files, i)
f->current_offset = 0;
}
int sd_journal_add_match(sd_journal *j, const void *data, size_t size) {
Match *m;
@ -78,6 +91,8 @@ int sd_journal_add_match(sd_journal *j, const void *data, size_t size) {
LIST_PREPEND(Match, matches, j->matches, m);
j->n_matches ++;
reset_location(j);
return 0;
}
@ -93,6 +108,8 @@ void sd_journal_flush_matches(sd_journal *j) {
}
j->n_matches = 0;
reset_location(j);
}
static int compare_order(JournalFile *af, Object *ao, uint64_t ap,
@ -708,25 +725,18 @@ void sd_journal_start_data(sd_journal *j) {
j->current_field = 0;
}
static int real_journal_seek_head(sd_journal *j, direction_t direction) {
Iterator i;
JournalFile *f;
int sd_journal_seek_head(sd_journal *j) {
assert(j);
j->current_file = NULL;
j->current_field = 0;
reset_location(j);
HASHMAP_FOREACH(f, j->files, i)
f->current_offset = 0;
return real_journal_next(j, direction);
}
int sd_journal_seek_head(sd_journal *j) {
return real_journal_seek_head(j, DIRECTION_DOWN);
return real_journal_next(j, DIRECTION_DOWN);
}
int sd_journal_seek_tail(sd_journal *j) {
return real_journal_seek_head(j, DIRECTION_UP);
assert(j);
reset_location(j);
return real_journal_next(j, DIRECTION_UP);
}

2
src/journal/sd-journal.h
View File

@ -76,7 +76,7 @@ enum {
SD_JOURNAL_DROP
};
int sd_journal_process(sd_journal *j);
int sd_journal_process(sd_journal *j); /* missing */
#define SD_JOURNAL_FOREACH_BEGIN(j) \
if (sd_journal_seek_head(j) > 0) do {