dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

sd-journal: drop unnecessary re-read of object

Browse Source 
This reverts the following commits.
- a1640191b4
- 231741d355

These were done by my misunderstanding of the mmap cache behavior.

Also, this updates the comments added by
df04b9ed86.
This commit is contained in:
Yu Watanabe
2023-09-28 09:05:53 +09:00
committed by Luca Boccassi
parent fdae874cfe
commit 31438511e0
2 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/libsystemd/sd-journal/journal-file.c
View File

@@ -838,9 +838,9 @@ static int journal_file_move_to(
assert(f);
assert(ret);
/* This function may clear, overwrite, or alter previously cached entries. After this function has
* been called, all objects except for one obtained by this function are invalidated and must be
* re-read before use. */
/* This function may clear, overwrite, or alter previously cached entries with the same type. After
* this function has been called, all previously read objects with the same type may be invalidated,
* hence must be re-read before use. */
if (size <= 0)
return -EINVAL;
@@ -1088,9 +1088,9 @@ int journal_file_move_to_object(JournalFile *f, ObjectType type, uint64_t offset
assert(f);
/* Even if this function fails, it may clear, overwrite, or alter previously cached entries. After
* this function has been called, all objects except for one obtained by this function are
* invalidated and must be re-read before use.. */
/* Even if this function fails, it may clear, overwrite, or alter previously cached entries with the
* same type. After this function has been called, all previously read objects with the same type may
* be invalidated, hence must be re-read before use. */
/* Objects may only be located at multiple of 64 bit */
if (!VALID64(offset))
@@ -4341,7 +4341,7 @@ int journal_file_copy_entry(
r = journal_file_data_payload(from, NULL, q, NULL, 0, 0, &data, &l);
if (IN_SET(r, -EADDRNOTAVAIL, -EBADMSG)) {
log_debug_errno(r, "Entry item %"PRIu64" data object is bad, skipping over it: %m", i);
goto next;
continue;
}
if (r < 0)
return r;
@@ -4363,13 +4363,6 @@ int journal_file_copy_entry(
.object_offset = h,
.hash = le64toh(u->data.hash),
};
next:
/* The above journal_file_data_payload() may clear or overwrite cached object. Hence, we need
* to re-read the object from the cache. */
r = journal_file_move_to_object(from, OBJECT_ENTRY, p, &o);
if (r < 0)
return r;
}
if (m == 0)

18
src/libsystemd/sd-journal/sd-journal.c
View File

@@ -2640,10 +2640,10 @@ _public_ int sd_journal_get_data(sd_journal *j, const char *field, const void **
p = journal_file_entry_item_object_offset(f, o, i);
r = journal_file_data_payload(f, NULL, p, field, field_length, j->data_threshold, &d, &l);
if (r == 0)
goto next;
continue;
if (IN_SET(r, -EADDRNOTAVAIL, -EBADMSG)) {
log_debug_errno(r, "Entry item %"PRIu64" data object is bad, skipping over it: %m", i);
goto next;
continue;
}
if (r < 0)
return r;
@@ -2652,12 +2652,6 @@ _public_ int sd_journal_get_data(sd_journal *j, const char *field, const void **
*size = l;
return 0;
next:
/* journal_file_data_payload() may clear or overwrite cached object. */
r = journal_file_move_to_object(f, OBJECT_ENTRY, f->current_offset, &o);
if (r < 0)
return r;
}
return -ENOENT;
@@ -2693,7 +2687,7 @@ _public_ int sd_journal_enumerate_data(sd_journal *j, const void **data, size_t
r = journal_file_data_payload(f, NULL, p, NULL, 0, j->data_threshold, &d, &l);
if (IN_SET(r, -EADDRNOTAVAIL, -EBADMSG)) {
log_debug_errno(r, "Entry item %"PRIu64" data object is bad, skipping over it: %m", j->current_field);
goto next;
continue;
}
if (r < 0)
return r;
@@ -2705,12 +2699,6 @@ _public_ int sd_journal_enumerate_data(sd_journal *j, const void **data, size_t
j->current_field++;
return 1;
next:
/* journal_file_data_payload() may clear or overwrite cached object. */
r = journal_file_move_to_object(f, OBJECT_ENTRY, f->current_offset, &o);
if (r < 0)
return r;
}
return 0;