X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fsd-journal.c;h=86ac267de406550074dd5065269586f19ea86dfc;hb=e7bf07b3d444dddf67503df56acfbdbbe3e5261a;hp=38e58f57328261d91d520f505da07b0aa9dec3c3;hpb=dc1ecd78e9f046880d10ddb45cf9b06df1084b10;p=elogind.git

diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 38e58f573..86ac267de 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -66,7 +66,7 @@ static void init_location(Location *l, JournalFile *f, Object *o) {
         l->seqnum_id = f->header->seqnum_id;
         l->realtime = le64toh(o->entry.realtime);
         l->monotonic = le64toh(o->entry.monotonic);
-        l->boot_id = le64toh(o->entry.boot_id);
+        l->boot_id = o->entry.boot_id;
         l->xor_hash = le64toh(o->entry.xor_hash);
 
         l->seqnum_set = l->realtime_set = l->monotonic_set = l->xor_hash_set = true;
@@ -106,17 +106,17 @@ static int same_field(const void *_a, size_t s, const void *_b, size_t t) {
         return -EINVAL;
 }
 
-int sd_journal_add_match(sd_journal *j, const void *data, size_t size) {
+_public_ int sd_journal_add_match(sd_journal *j, const void *data, size_t size) {
         Match *m, *after = NULL;
         uint64_t le_hash;
 
-        assert(j);
-
+        if (!j)
+                return -EINVAL;
+        if (!data)
+                return -EINVAL;
         if (size <= 0)
                 return -EINVAL;
 
-        assert(data);
-
         le_hash = htole64(hash64(data, size));
 
         LIST_FOREACH(matches, m, j->matches) {
@@ -159,8 +159,9 @@ int sd_journal_add_match(sd_journal *j, const void *data, size_t size) {
         return 0;
 }
 
-void sd_journal_flush_matches(sd_journal *j) {
-        assert(j);
+_public_ void sd_journal_flush_matches(sd_journal *j) {
+        if (!j)
+                return;
 
         while (j->matches) {
                 Match *m = j->matches;
@@ -348,7 +349,7 @@ static int find_location(sd_journal *j, JournalFile *f, direction_t direction, O
 
                         r = journal_file_move_to_entry_by_monotonic(f, j->current_location.boot_id, j->current_location.monotonic, direction, &o, &p);
                         if (r <= 0)
-                                return r;
+                                return r == -ENOENT ? 0 : r;
                 }
 
                 LIST_FOREACH(matches, m, j->matches) {
@@ -371,6 +372,9 @@ static int find_location(sd_journal *j, JournalFile *f, direction_t direction, O
                         else
                                 r = journal_file_next_entry_for_data(f, NULL, 0, dp, direction, &c, &cp);
 
+                        if (r < 0)
+                                return r;
+
                         if (!term_match) {
                                 term_match = m;
 
@@ -484,7 +488,7 @@ static int next_with_matches(sd_journal *j, JournalFile *f, direction_t directio
 
                 /* Make sure we don't match the entry we are starting
                  * from. */
-                found = cp > *offset;
+                found = cp != *offset;
 
                 np = 0;
                 LIST_FOREACH(matches, m, j->matches) {
@@ -523,6 +527,12 @@ static int next_with_matches(sd_journal *j, JournalFile *f, direction_t directio
                          * matches are not OK */
 
                         r = journal_file_next_entry_for_data(f, c, cp, le64toh(c->entry.items[k].object_offset), direction, &qo, &q);
+                        /* This pointer is invalidated if the window was
+                         * remapped. May need to re-fetch it later */
+                        c = NULL;
+                        if (r < 0)
+                                return r;
+
                         if (r > 0) {
 
                                 if (direction == DIRECTION_DOWN) {
@@ -545,8 +555,15 @@ static int next_with_matches(sd_journal *j, JournalFile *f, direction_t directio
 
                 /* Did this entry match against all matches? */
                 if (found) {
-                        if (ret)
+                        if (ret) {
+                                if (c == NULL) {
+                                        /* Re-fetch the entry */
+                                        r = journal_file_move_to_object(f, OBJECT_ENTRY, cp, &c);
+                                        if (r < 0)
+                                                return r;
+                                }
                                 *ret = c;
+                        }
                         if (offset)
                                 *offset = cp;
                         return 1;
@@ -626,7 +643,8 @@ static int real_journal_next(sd_journal *j, direction_t direction) {
         uint64_t new_offset = 0;
         Object *new_entry = NULL;
 
-        assert(j);
+        if (!j)
+                return -EINVAL;
 
         HASHMAP_FOREACH(f, j->files, i) {
                 Object *o;
@@ -667,21 +685,31 @@ static int real_journal_next(sd_journal *j, direction_t direction) {
         return 1;
 }
 
-int sd_journal_next(sd_journal *j) {
+_public_ int sd_journal_next(sd_journal *j) {
         return real_journal_next(j, DIRECTION_DOWN);
 }
 
-int sd_journal_previous(sd_journal *j) {
+_public_ int sd_journal_previous(sd_journal *j) {
         return real_journal_next(j, DIRECTION_UP);
 }
 
-int sd_journal_next_skip(sd_journal *j, uint64_t skip) {
+static int real_journal_next_skip(sd_journal *j, direction_t direction, uint64_t skip) {
         int c = 0, r;
 
-        assert(j);
+        if (!j)
+                return -EINVAL;
 
-        while (skip > 0) {
-                r = sd_journal_next(j);
+        if (skip == 0) {
+                /* If this is not a discrete skip, then at least
+                 * resolve the current location */
+                if (j->current_location.type != LOCATION_DISCRETE)
+                        return real_journal_next(j, direction);
+
+                return 0;
+        }
+
+        do {
+                r = real_journal_next(j, direction);
                 if (r < 0)
                         return r;
 
@@ -690,38 +718,28 @@ int sd_journal_next_skip(sd_journal *j, uint64_t skip) {
 
                 skip--;
                 c++;
-        }
+        } while (skip > 0);
 
         return c;
 }
 
-int sd_journal_previous_skip(sd_journal *j, uint64_t skip) {
-        int c = 0, r;
-
-        assert(j);
-
-        while (skip > 0) {
-                r = sd_journal_previous(j);
-                if (r < 0)
-                        return r;
-
-                if (r == 0)
-                        return c;
-
-                skip--;
-                c++;
-        }
+_public_ int sd_journal_next_skip(sd_journal *j, uint64_t skip) {
+        return real_journal_next_skip(j, DIRECTION_DOWN, skip);
+}
 
-        return 1;
+_public_ int sd_journal_previous_skip(sd_journal *j, uint64_t skip) {
+        return real_journal_next_skip(j, DIRECTION_UP, skip);
 }
 
-int sd_journal_get_cursor(sd_journal *j, char **cursor) {
+_public_ int sd_journal_get_cursor(sd_journal *j, char **cursor) {
         Object *o;
         int r;
         char bid[33], sid[33];
 
-        assert(j);
-        assert(cursor);
+        if (!j)
+                return -EINVAL;
+        if (!cursor)
+                return -EINVAL;
 
         if (!j->current_file || j->current_file->current_offset <= 0)
                 return -EADDRNOTAVAIL;
@@ -745,7 +763,7 @@ int sd_journal_get_cursor(sd_journal *j, char **cursor) {
         return 1;
 }
 
-int sd_journal_seek_cursor(sd_journal *j, const char *cursor) {
+_public_ int sd_journal_seek_cursor(sd_journal *j, const char *cursor) {
         char *w;
         size_t l;
         char *state;
@@ -759,8 +777,10 @@ int sd_journal_seek_cursor(sd_journal *j, const char *cursor) {
                 xor_hash_set = false;
         sd_id128_t seqnum_id, boot_id;
 
-        assert(j);
-        assert(cursor);
+        if (!j)
+                return -EINVAL;
+        if (!cursor)
+                return -EINVAL;
 
         FOREACH_WORD_SEPARATOR(w, l, cursor, ";", state) {
                 char *item;
@@ -850,8 +870,9 @@ int sd_journal_seek_cursor(sd_journal *j, const char *cursor) {
         return 0;
 }
 
-int sd_journal_seek_monotonic_usec(sd_journal *j, sd_id128_t boot_id, uint64_t usec) {
-        assert(j);
+_public_ int sd_journal_seek_monotonic_usec(sd_journal *j, sd_id128_t boot_id, uint64_t usec) {
+        if (!j)
+                return -EINVAL;
 
         reset_location(j);
         j->current_location.type = LOCATION_DISCRETE;
@@ -862,8 +883,9 @@ int sd_journal_seek_monotonic_usec(sd_journal *j, sd_id128_t boot_id, uint64_t u
         return 0;
 }
 
-int sd_journal_seek_realtime_usec(sd_journal *j, uint64_t usec) {
-        assert(j);
+_public_ int sd_journal_seek_realtime_usec(sd_journal *j, uint64_t usec) {
+        if (!j)
+                return -EINVAL;
 
         reset_location(j);
         j->current_location.type = LOCATION_DISCRETE;
@@ -873,8 +895,9 @@ int sd_journal_seek_realtime_usec(sd_journal *j, uint64_t usec) {
         return 0;
 }
 
-int sd_journal_seek_head(sd_journal *j) {
-        assert(j);
+_public_ int sd_journal_seek_head(sd_journal *j) {
+        if (!j)
+                return -EINVAL;
 
         reset_location(j);
         j->current_location.type = LOCATION_HEAD;
@@ -882,8 +905,9 @@ int sd_journal_seek_head(sd_journal *j) {
         return 0;
 }
 
-int sd_journal_seek_tail(sd_journal *j) {
-        assert(j);
+_public_ int sd_journal_seek_tail(sd_journal *j) {
+        if (!j)
+                return -EINVAL;
 
         reset_location(j);
         j->current_location.type = LOCATION_TAIL;
@@ -1095,7 +1119,7 @@ static void remove_root_wd(sd_journal *j, int wd) {
         }
 }
 
-int sd_journal_open(sd_journal **ret, int flags) {
+_public_ int sd_journal_open(sd_journal **ret, int flags) {
         sd_journal *j;
         const char *p;
         const char search_paths[] =
@@ -1103,7 +1127,13 @@ int sd_journal_open(sd_journal **ret, int flags) {
                 "/var/log/journal\0";
         int r;
 
-        assert(ret);
+        if (!ret)
+                return -EINVAL;
+
+        if (flags & ~(SD_JOURNAL_LOCAL_ONLY|
+                      SD_JOURNAL_RUNTIME_ONLY|
+                      SD_JOURNAL_SYSTEM_ONLY))
+                return -EINVAL;
 
         j = new0(sd_journal, 1);
         if (!j)
@@ -1184,8 +1214,9 @@ fail:
         return r;
 };
 
-void sd_journal_close(sd_journal *j) {
-        assert(j);
+_public_ void sd_journal_close(sd_journal *j) {
+        if (!j)
+                return;
 
         if (j->inotify_wd_dirs) {
                 void *k;
@@ -1222,13 +1253,15 @@ void sd_journal_close(sd_journal *j) {
         free(j);
 }
 
-int sd_journal_get_realtime_usec(sd_journal *j, uint64_t *ret) {
+_public_ int sd_journal_get_realtime_usec(sd_journal *j, uint64_t *ret) {
         Object *o;
         JournalFile *f;
         int r;
 
-        assert(j);
-        assert(ret);
+        if (!j)
+                return -EINVAL;
+        if (!ret)
+                return -EINVAL;
 
         f = j->current_file;
         if (!f)
@@ -1245,14 +1278,16 @@ int sd_journal_get_realtime_usec(sd_journal *j, uint64_t *ret) {
         return 0;
 }
 
-int sd_journal_get_monotonic_usec(sd_journal *j, uint64_t *ret, sd_id128_t *ret_boot_id) {
+_public_ int sd_journal_get_monotonic_usec(sd_journal *j, uint64_t *ret, sd_id128_t *ret_boot_id) {
         Object *o;
         JournalFile *f;
         int r;
         sd_id128_t id;
 
-        assert(j);
-        assert(ret);
+        if (!j)
+                return -EINVAL;
+        if (!ret)
+                return -EINVAL;
 
         f = j->current_file;
         if (!f)
@@ -1273,24 +1308,28 @@ int sd_journal_get_monotonic_usec(sd_journal *j, uint64_t *ret, sd_id128_t *ret_
                         return r;
 
                 if (!sd_id128_equal(id, o->entry.boot_id))
-                        return -ENOENT;
+                        return -ESTALE;
         }
 
         *ret = le64toh(o->entry.monotonic);
         return 0;
 }
 
-int sd_journal_get_data(sd_journal *j, const char *field, const void **data, size_t *size) {
+_public_ int sd_journal_get_data(sd_journal *j, const char *field, const void **data, size_t *size) {
         JournalFile *f;
         uint64_t i, n;
         size_t field_length;
         int r;
         Object *o;
 
-        assert(j);
-        assert(field);
-        assert(data);
-        assert(size);
+        if (!j)
+                return -EINVAL;
+        if (!field)
+                return -EINVAL;
+        if (!data)
+                return -EINVAL;
+        if (!size)
+                return -EINVAL;
 
         if (isempty(field) || strchr(field, '='))
                 return -EINVAL;
@@ -1369,16 +1408,19 @@ int sd_journal_get_data(sd_journal *j, const char *field, const void **data, siz
         return -ENOENT;
 }
 
-int sd_journal_enumerate_data(sd_journal *j, const void **data, size_t *size) {
+_public_ int sd_journal_enumerate_data(sd_journal *j, const void **data, size_t *size) {
         JournalFile *f;
         uint64_t p, l, n, le_hash;
         int r;
         Object *o;
         size_t t;
 
-        assert(j);
-        assert(data);
-        assert(size);
+        if (!j)
+                return -EINVAL;
+        if (!data)
+                return -EINVAL;
+        if (!size)
+                return -EINVAL;
 
         f = j->current_file;
         if (!f)
@@ -1433,14 +1475,16 @@ int sd_journal_enumerate_data(sd_journal *j, const void **data, size_t *size) {
         return 1;
 }
 
-void sd_journal_restart_data(sd_journal *j) {
-        assert(j);
+_public_ void sd_journal_restart_data(sd_journal *j) {
+        if (!j)
+                return;
 
         j->current_field = 0;
 }
 
-int sd_journal_get_fd(sd_journal *j) {
-        assert(j);
+_public_ int sd_journal_get_fd(sd_journal *j) {
+        if (!j)
+                return -EINVAL;
 
         return j->inotify_fd;
 }
@@ -1523,10 +1567,11 @@ static void process_inotify_event(sd_journal *j, struct inotify_event *e) {
         log_warning("Unknown inotify event.");
 }
 
-int sd_journal_process(sd_journal *j) {
+_public_ int sd_journal_process(sd_journal *j) {
         uint8_t buffer[sizeof(struct inotify_event) + FILENAME_MAX];
 
-        assert(j);
+        if (!j)
+                return -EINVAL;
 
         for (;;) {
                 struct inotify_event *e;
@@ -1555,19 +1600,27 @@ int sd_journal_process(sd_journal *j) {
         }
 }
 
-int sd_journal_query_unique(sd_journal *j, const char *field) {
-        assert(j);
-        assert(field);
-
-        return -ENOTSUP;
-}
-
-int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_t *l) {
-        assert(j);
-
-        return -ENOTSUP;
-}
-
-void sd_journal_restart_unique(sd_journal *j) {
-        assert(j);
-}
+/* _public_ int sd_journal_query_unique(sd_journal *j, const char *field) { */
+/*         if (!j) */
+/*                 return -EINVAL; */
+/*         if (!field) */
+/*                 return -EINVAL; */
+
+/*         return -ENOTSUP; */
+/* } */
+
+/* _public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_t *l) { */
+/*         if (!j) */
+/*                 return -EINVAL; */
+/*         if (!data) */
+/*                 return -EINVAL; */
+/*         if (!l) */
+/*                 return -EINVAL; */
+
+/*         return -ENOTSUP; */
+/* } */
+
+/* _public_ void sd_journal_restart_unique(sd_journal *j) { */
+/*         if (!j) */
+/*                 return; */
+/* } */