chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
localectl: fix localectl set-x11-keymap syntax description
[elogind.git]
/
src
/
journal
/
sd-journal.c
diff --git
a/src/journal/sd-journal.c
b/src/journal/sd-journal.c
index 479444c8dff94b8a4c22234a120d347cb5f3842f..cf21c4d899891e28b03697b22b13736a462147f9 100644
(file)
--- a/
src/journal/sd-journal.c
+++ b/
src/journal/sd-journal.c
@@
-86,7
+86,7
@@
static void detach_location(sd_journal *j) {
j->current_file = NULL;
j->current_field = 0;
j->current_file = NULL;
j->current_field = 0;
- HASHMAP_FOREACH(f, j->files, i)
+
ORDERED_
HASHMAP_FOREACH(f, j->files, i)
f->current_offset = 0;
}
f->current_offset = 0;
}
@@
-849,10
+849,8
@@
static int next_beyond_location(sd_journal *j, JournalFile *f, direction_t direc
int k;
k = compare_with_location(f, c, &j->current_location);
int k;
k = compare_with_location(f, c, &j->current_location);
- if (direction == DIRECTION_DOWN)
- found = k > 0;
- else
- found = k < 0;
+
+ found = direction == DIRECTION_DOWN ? k > 0 : k < 0;
} else
found = true;
} else
found = true;
@@
-881,7
+879,7
@@
static int real_journal_next(sd_journal *j, direction_t direction) {
assert_return(j, -EINVAL);
assert_return(!journal_pid_changed(j), -ECHILD);
assert_return(j, -EINVAL);
assert_return(!journal_pid_changed(j), -ECHILD);
- HASHMAP_FOREACH(f, j->files, i) {
+
ORDERED_
HASHMAP_FOREACH(f, j->files, i) {
bool found;
r = next_beyond_location(j, f, direction, &o, &p);
bool found;
r = next_beyond_location(j, f, direction, &o, &p);
@@
-1290,10
+1288,10
@@
static int add_any_file(sd_journal *j, const char *path) {
assert(j);
assert(path);
assert(j);
assert(path);
- if (hashmap_get(j->files, path))
+ if (
ordered_
hashmap_get(j->files, path))
return 0;
return 0;
- if (hashmap_size(j->files) >= JOURNAL_FILES_MAX) {
+ if (
ordered_
hashmap_size(j->files) >= JOURNAL_FILES_MAX) {
log_warning("Too many open journal files, not adding %s.", path);
return set_put_error(j, -ETOOMANYREFS);
}
log_warning("Too many open journal files, not adding %s.", path);
return set_put_error(j, -ETOOMANYREFS);
}
@@
-1304,7
+1302,7
@@
static int add_any_file(sd_journal *j, const char *path) {
/* journal_file_dump(f); */
/* journal_file_dump(f); */
- r = hashmap_put(j->files, f->path, f);
+ r =
ordered_
hashmap_put(j->files, f->path, f);
if (r < 0) {
journal_file_close(f);
return r;
if (r < 0) {
journal_file_close(f);
return r;
@@
-1353,7
+1351,7
@@
static int remove_file(sd_journal *j, const char *prefix, const char *filename)
if (!path)
return -ENOMEM;
if (!path)
return -ENOMEM;
- f = hashmap_get(j->files, path);
+ f =
ordered_
hashmap_get(j->files, path);
if (!f)
return 0;
if (!f)
return 0;
@@
-1365,7
+1363,7
@@
static void remove_file_real(sd_journal *j, JournalFile *f) {
assert(j);
assert(f);
assert(j);
assert(f);
- hashmap_remove(j->files, f->path);
+
ordered_
hashmap_remove(j->files, f->path);
log_debug("File %s removed.", f->path);
log_debug("File %s removed.", f->path);
@@
-1376,7
+1374,7
@@
static void remove_file_real(sd_journal *j, JournalFile *f) {
if (j->unique_file == f) {
/* Jump to the next unique_file or NULL if that one was last */
if (j->unique_file == f) {
/* Jump to the next unique_file or NULL if that one was last */
- j->unique_file = hashmap_next(j->files, j->unique_file->path);
+ j->unique_file =
ordered_
hashmap_next(j->files, j->unique_file->path);
j->unique_offset = 0;
if (!j->unique_file)
j->unique_file_lost = true;
j->unique_offset = 0;
if (!j->unique_file)
j->unique_file_lost = true;
@@
-1636,7
+1634,7
@@
static int add_current_paths(sd_journal *j) {
* "root" directories. We don't expect errors here, so we
* treat them as fatal. */
* "root" directories. We don't expect errors here, so we
* treat them as fatal. */
- HASHMAP_FOREACH(f, j->files, i) {
+
ORDERED_
HASHMAP_FOREACH(f, j->files, i) {
_cleanup_free_ char *dir;
int r;
_cleanup_free_ char *dir;
int r;
@@
-1691,7
+1689,7
@@
static sd_journal *journal_new(int flags, const char *path) {
goto fail;
}
goto fail;
}
- j->files = hashmap_new(&string_hash_ops);
+ j->files =
ordered_
hashmap_new(&string_hash_ops);
j->directories_by_path = hashmap_new(&string_hash_ops);
j->mmap = mmap_cache_new();
if (!j->files || !j->directories_by_path || !j->mmap)
j->directories_by_path = hashmap_new(&string_hash_ops);
j->mmap = mmap_cache_new();
if (!j->files || !j->directories_by_path || !j->mmap)
@@
-1737,7
+1735,7
@@
_public_ int sd_journal_open_container(sd_journal **ret, const char *machine, in
assert_return(machine, -EINVAL);
assert_return(ret, -EINVAL);
assert_return((flags & ~(SD_JOURNAL_LOCAL_ONLY|SD_JOURNAL_SYSTEM)) == 0, -EINVAL);
assert_return(machine, -EINVAL);
assert_return(ret, -EINVAL);
assert_return((flags & ~(SD_JOURNAL_LOCAL_ONLY|SD_JOURNAL_SYSTEM)) == 0, -EINVAL);
- assert_return(
filename_is_safe
(machine), -EINVAL);
+ assert_return(
machine_name_is_valid
(machine), -EINVAL);
p = strappenda("/run/systemd/machines/", machine);
r = parse_env_file(p, NEWLINE, "ROOT", &root, "CLASS", &class, NULL);
p = strappenda("/run/systemd/machines/", machine);
r = parse_env_file(p, NEWLINE, "ROOT", &root, "CLASS", &class, NULL);
@@
-1837,10
+1835,10
@@
_public_ void sd_journal_close(sd_journal *j) {
sd_journal_flush_matches(j);
sd_journal_flush_matches(j);
- while ((f = hashmap_steal_first(j->files)))
+ while ((f =
ordered_
hashmap_steal_first(j->files)))
journal_file_close(f);
journal_file_close(f);
- hashmap_free(j->files);
+
ordered_
hashmap_free(j->files);
while ((d = hashmap_first(j->directories_by_path)))
remove_directory(j, d);
while ((d = hashmap_first(j->directories_by_path)))
remove_directory(j, d);
@@
-2370,7
+2368,7
@@
_public_ int sd_journal_get_cutoff_realtime_usec(sd_journal *j, uint64_t *from,
assert_return(from || to, -EINVAL);
assert_return(from != to, -EINVAL);
assert_return(from || to, -EINVAL);
assert_return(from != to, -EINVAL);
- HASHMAP_FOREACH(f, j->files, i) {
+
ORDERED_
HASHMAP_FOREACH(f, j->files, i) {
usec_t fr, t;
r = journal_file_get_cutoff_realtime_usec(f, &fr, &t);
usec_t fr, t;
r = journal_file_get_cutoff_realtime_usec(f, &fr, &t);
@@
-2410,7
+2408,7
@@
_public_ int sd_journal_get_cutoff_monotonic_usec(sd_journal *j, sd_id128_t boot
assert_return(from || to, -EINVAL);
assert_return(from != to, -EINVAL);
assert_return(from || to, -EINVAL);
assert_return(from != to, -EINVAL);
- HASHMAP_FOREACH(f, j->files, i) {
+
ORDERED_
HASHMAP_FOREACH(f, j->files, i) {
usec_t fr, t;
r = journal_file_get_cutoff_monotonic_usec(f, boot_id, &fr, &t);
usec_t fr, t;
r = journal_file_get_cutoff_monotonic_usec(f, boot_id, &fr, &t);
@@
-2445,7
+2443,7
@@
void journal_print_header(sd_journal *j) {
assert(j);
assert(j);
- HASHMAP_FOREACH(f, j->files, i) {
+
ORDERED_
HASHMAP_FOREACH(f, j->files, i) {
if (newline)
putchar('\n');
else
if (newline)
putchar('\n');
else
@@
-2464,7
+2462,7
@@
_public_ int sd_journal_get_usage(sd_journal *j, uint64_t *bytes) {
assert_return(!journal_pid_changed(j), -ECHILD);
assert_return(bytes, -EINVAL);
assert_return(!journal_pid_changed(j), -ECHILD);
assert_return(bytes, -EINVAL);
- HASHMAP_FOREACH(f, j->files, i) {
+
ORDERED_
HASHMAP_FOREACH(f, j->files, i) {
struct stat st;
if (fstat(f->fd, &st) < 0)
struct stat st;
if (fstat(f->fd, &st) < 0)
@@
-2513,7
+2511,7
@@
_public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
if (j->unique_file_lost)
return 0;
if (j->unique_file_lost)
return 0;
- j->unique_file = hashmap_first(j->files);
+ j->unique_file =
ordered_
hashmap_first(j->files);
if (!j->unique_file)
return 0;
if (!j->unique_file)
return 0;
@@
-2547,7
+2545,7
@@
_public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
/* We reached the end of the list? Then start again, with the next file */
if (j->unique_offset == 0) {
/* We reached the end of the list? Then start again, with the next file */
if (j->unique_offset == 0) {
- j->unique_file = hashmap_next(j->files, j->unique_file->path);
+ j->unique_file =
ordered_
hashmap_next(j->files, j->unique_file->path);
if (!j->unique_file)
return 0;
if (!j->unique_file)
return 0;
@@
-2596,7
+2594,7
@@
_public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
* object by checking if it exists in the earlier
* traversed files. */
found = false;
* object by checking if it exists in the earlier
* traversed files. */
found = false;
- HASHMAP_FOREACH(of, j->files, i) {
+
ORDERED_
HASHMAP_FOREACH(of, j->files, i) {
Object *oo;
uint64_t op;
Object *oo;
uint64_t op;