journal: correct list link up on hash collisions

[elogind.git] / src / journal / journal-file.c

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 5d540a7d407da1be3babba109f7fdf210f08db6b..9cec140f58032a158bffa76cb3468efd15a73e33 100644 (file)
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -6,16 +6,16 @@
   Copyright 2011 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
   Copyright 2011 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it

-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or

   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

-  General Public License for more details.
+  Lesser General Public License for more details.

 
 

-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License

   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 


@@ -35,7 +35,7 @@
 #define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*16ULL)
 #define DEFAULT_FIELD_HASH_TABLE_SIZE (2047ULL*16ULL)
 
 #define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*16ULL)
 #define DEFAULT_FIELD_HASH_TABLE_SIZE (2047ULL*16ULL)
 

-#define DEFAULT_WINDOW_SIZE (128ULL*1024ULL*1024ULL)
+#define DEFAULT_WINDOW_SIZE (8ULL*1024ULL*1024ULL)

 
 #define COMPRESSION_SIZE_THRESHOLD (512ULL)
 
 
 #define COMPRESSION_SIZE_THRESHOLD (512ULL)
 


@@ -67,9 +67,12 @@ void journal_file_close(JournalFile *f) {
 
         assert(f);
 
 
         assert(f);
 

-        if (f->header && f->writable)
-                f->header->state = STATE_OFFLINE;
+        if (f->header) {
+                if (f->writable)
+                        f->header->state = STATE_OFFLINE;

 
 

+                munmap(f->header, PAGE_ALIGN(sizeof(Header)));
+        }

 
         for (t = 0; t < _WINDOW_MAX; t++)
                 if (f->windows[t].ptr)
 
         for (t = 0; t < _WINDOW_MAX; t++)
                 if (f->windows[t].ptr)


@@ -96,7 +99,7 @@ static int journal_file_init_header(JournalFile *f, JournalFile *template) {
 
         zero(h);
         memcpy(h.signature, signature, 8);
 
         zero(h);
         memcpy(h.signature, signature, 8);

-        h.arena_offset = htole64(ALIGN64(sizeof(h)));
+        h.header_size = htole64(ALIGN64(sizeof(h)));

 
         r = sd_id128_randomize(&h.file_id);
         if (r < 0)
 
         r = sd_id128_randomize(&h.file_id);
         if (r < 0)


@@ -158,7 +161,10 @@ static int journal_file_verify_header(JournalFile *f) {
                 return -EPROTONOSUPPORT;
 #endif
 
                 return -EPROTONOSUPPORT;
 #endif
 

-        if ((uint64_t) f->last_stat.st_size < (le64toh(f->header->arena_offset) + le64toh(f->header->arena_size)))
+        if (f->header->header_size != htole64(ALIGN64(sizeof(*(f->header)))))
+                return -EBADMSG;
+
+        if ((uint64_t) f->last_stat.st_size < (le64toh(f->header->header_size) + le64toh(f->header->arena_size)))

                 return -ENODATA;
 
         if (f->writable) {
                 return -ENODATA;
 
         if (f->writable) {


@@ -188,6 +194,7 @@ static int journal_file_verify_header(JournalFile *f) {
 
 static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) {
         uint64_t old_size, new_size;
 
 static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) {
         uint64_t old_size, new_size;

+        int r;

 
         assert(f);
 
 
         assert(f);
 


@@ -196,12 +203,12 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size)
          * ourselves */
 
         old_size =
          * ourselves */
 
         old_size =

-                le64toh(f->header->arena_offset) +
+                le64toh(f->header->header_size) +

                 le64toh(f->header->arena_size);
 
         new_size = PAGE_ALIGN(offset + size);
                 le64toh(f->header->arena_size);
 
         new_size = PAGE_ALIGN(offset + size);

-        if (new_size < le64toh(f->header->arena_offset))
-                new_size = le64toh(f->header->arena_offset);
+        if (new_size < le64toh(f->header->header_size))
+                new_size = le64toh(f->header->header_size);

 
         if (new_size <= old_size)
                 return 0;
 
         if (new_size <= old_size)
                 return 0;


@@ -232,13 +239,14 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size)
         /* Note that the glibc fallocate() fallback is very
            inefficient, hence we try to minimize the allocation area
            as we can. */
         /* Note that the glibc fallocate() fallback is very
            inefficient, hence we try to minimize the allocation area
            as we can. */

-        if (posix_fallocate(f->fd, old_size, new_size - old_size) < 0)
-                return -errno;
+        r = posix_fallocate(f->fd, old_size, new_size - old_size);
+        if (r != 0)
+                return -r;

 
         if (fstat(f->fd, &f->last_stat) < 0)
                 return -errno;
 
 
         if (fstat(f->fd, &f->last_stat) < 0)
                 return -errno;
 

-        f->header->arena_size = htole64(new_size - le64toh(f->header->arena_offset));
+        f->header->arena_size = htole64(new_size - le64toh(f->header->header_size));

 
         return 0;
 }
 
         return 0;
 }


@@ -452,7 +460,7 @@ static int journal_file_append_object(JournalFile *f, int type, uint64_t size, O
 
         p = le64toh(f->header->tail_object_offset);
         if (p == 0)
 
         p = le64toh(f->header->tail_object_offset);
         if (p == 0)

-                p = le64toh(f->header->arena_offset);
+                p = le64toh(f->header->header_size);

         else {
                 r = journal_file_move_to_object(f, -1, p, &tail);
                 if (r < 0)
         else {
                 r = journal_file_move_to_object(f, -1, p, &tail);
                 if (r < 0)


@@ -588,7 +596,7 @@ static int journal_file_link_data(JournalFile *f, Object *o, uint64_t offset, ui
         o->data.n_entries = 0;
 
         h = hash % (le64toh(f->header->data_hash_table_size) / sizeof(HashItem));
         o->data.n_entries = 0;
 
         h = hash % (le64toh(f->header->data_hash_table_size) / sizeof(HashItem));

-        p = le64toh(f->data_hash_table[h].head_hash_offset);
+        p = le64toh(f->data_hash_table[h].tail_hash_offset);

         if (p == 0) {
                 /* Only entry in the hash table is easy */
                 f->data_hash_table[h].head_hash_offset = htole64(offset);
         if (p == 0) {
                 /* Only entry in the hash table is easy */
                 f->data_hash_table[h].head_hash_offset = htole64(offset);


@@ -793,8 +801,8 @@ static uint64_t journal_file_entry_array_n_items(Object *o) {
 }
 
 static int link_entry_into_array(JournalFile *f,
 }
 
 static int link_entry_into_array(JournalFile *f,

-                                 uint64_t *first,
-                                 uint64_t *idx,
+                                 le64_t *first,
+                                 le64_t *idx,

                                  uint64_t p) {
         int r;
         uint64_t n = 0, ap = 0, q, i, a, hidx;
                                  uint64_t p) {
         int r;
         uint64_t n = 0, ap = 0, q, i, a, hidx;


@@ -857,9 +865,9 @@ static int link_entry_into_array(JournalFile *f,
 }
 
 static int link_entry_into_array_plus_one(JournalFile *f,
 }
 
 static int link_entry_into_array_plus_one(JournalFile *f,

-                                          uint64_t *extra,
-                                          uint64_t *first,
-                                          uint64_t *idx,
+                                          le64_t *extra,
+                                          le64_t *first,
+                                          le64_t *idx,

                                           uint64_t p) {
 
         int r;
                                           uint64_t p) {
 
         int r;


@@ -873,7 +881,7 @@ static int link_entry_into_array_plus_one(JournalFile *f,
         if (*idx == 0)
                 *extra = htole64(p);
         else {
         if (*idx == 0)
                 *extra = htole64(p);
         else {

-                uint64_t i;
+                le64_t i;

 
                 i = htole64(le64toh(*idx) - 1);
                 r = link_entry_into_array(f, first, &i, p);
 
                 i = htole64(le64toh(*idx) - 1);
                 r = link_entry_into_array(f, first, &i, p);


@@ -1660,7 +1668,7 @@ void journal_file_dump(JournalFile *f) {
                (unsigned long) le64toh(f->header->n_objects),
                (unsigned long) le64toh(f->header->n_entries));
 
                (unsigned long) le64toh(f->header->n_objects),
                (unsigned long) le64toh(f->header->n_entries));
 

-        p = le64toh(f->header->arena_offset);
+        p = le64toh(f->header->header_size);

         while (p != 0) {
                 r = journal_file_move_to_object(f, -1, p, &o);
                 if (r < 0)
         while (p != 0) {
                 r = journal_file_move_to_object(f, -1, p, &o);
                 if (r < 0)


@@ -1694,6 +1702,10 @@ void journal_file_dump(JournalFile *f) {
                 case OBJECT_ENTRY_ARRAY:
                         printf("Type: OBJECT_ENTRY_ARRAY\n");
                         break;
                 case OBJECT_ENTRY_ARRAY:
                         printf("Type: OBJECT_ENTRY_ARRAY\n");
                         break;

+
+                case OBJECT_SIGNATURE:
+                        printf("Type: OBJECT_SIGNATURE\n");
+                        break;

                 }
 
                 if (o->object.flags & OBJECT_COMPRESSED)
                 }
 
                 if (o->object.flags & OBJECT_COMPRESSED)


@@ -1977,7 +1989,7 @@ int journal_directory_vacuum(const char *directory, uint64_t max_use, uint64_t m
                 size_t q;
                 struct stat st;
                 char *p;
                 size_t q;
                 struct stat st;
                 char *p;

-                unsigned long long seqnum, realtime;
+                unsigned long long seqnum = 0, realtime;

                 sd_id128_t seqnum_id;
                 bool have_seqnum;
 
                 sd_id128_t seqnum_id;
                 bool have_seqnum;
 


@@ -2144,7 +2156,8 @@ int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint6
         items = alloca(sizeof(EntryItem) * n);
 
         for (i = 0; i < n; i++) {
         items = alloca(sizeof(EntryItem) * n);
 
         for (i = 0; i < n; i++) {

-                uint64_t le_hash, l, h;
+                uint64_t l, h;
+                le64_t le_hash;

                 size_t t;
                 void *data;
                 Object *u;
                 size_t t;
                 void *data;
                 Object *u;