chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove dead lines in various places
[elogind.git]
/
src
/
journal
/
sd-journal.c
diff --git
a/src/journal/sd-journal.c
b/src/journal/sd-journal.c
index b55cf37e50d93c609b0726e065d5bab4d7a990c2..ef455e901da9a3ee62328e2510a18554f5e60e18 100644
(file)
--- a/
src/journal/sd-journal.c
+++ b/
src/journal/sd-journal.c
@@
-464,7
+464,7
@@
static int compare_entry_order(JournalFile *af, Object *_ao,
if (sd_id128_equal(ao->entry.boot_id, bo->entry.boot_id)) {
if (sd_id128_equal(ao->entry.boot_id, bo->entry.boot_id)) {
- /* If the boot id matches compare monotonic time */
+ /* If the boot id matches
,
compare monotonic time */
a = le64toh(ao->entry.monotonic);
b = le64toh(bo->entry.monotonic);
a = le64toh(ao->entry.monotonic);
b = le64toh(bo->entry.monotonic);
@@
-474,7
+474,7
@@
static int compare_entry_order(JournalFile *af, Object *_ao,
return 1;
}
return 1;
}
- /* Otherwise compare UTC time */
+ /* Otherwise
,
compare UTC time */
a = le64toh(ao->entry.realtime);
b = le64toh(bo->entry.realtime);
a = le64toh(ao->entry.realtime);
b = le64toh(bo->entry.realtime);
@@
-871,9
+871,9
@@
static int next_beyond_location(sd_journal *j, JournalFile *f, direction_t direc
static int real_journal_next(sd_journal *j, direction_t direction) {
JournalFile *f, *new_file = NULL;
uint64_t new_offset = 0;
static int real_journal_next(sd_journal *j, direction_t direction) {
JournalFile *f, *new_file = NULL;
uint64_t new_offset = 0;
- Object *o;
- uint64_t p;
+ uint64_t p = 0;
Iterator i;
Iterator i;
+ Object *o;
int r;
assert_return(j, -EINVAL);
int r;
assert_return(j, -EINVAL);
@@
-1281,7
+1281,7
@@
static bool file_type_wanted(int flags, const char *filename) {
}
static int add_any_file(sd_journal *j, const char *path) {
}
static int add_any_file(sd_journal *j, const char *path) {
- JournalFile *f;
+ JournalFile *f
= NULL
;
int r;
assert(j);
int r;
assert(j);
@@
-1442,10
+1442,16
@@
static int add_directory(sd_journal *j, const char *prefix, const char *dirname)
for (;;) {
struct dirent *de;
for (;;) {
struct dirent *de;
- union dirent_storage buf;
- r = readdir_r(d, &buf.de, &de);
- if (r != 0 || !de)
+ errno = 0;
+ de = readdir(d);
+ if (!de && errno != 0) {
+ r = -errno;
+ log_debug("Failed to read directory %s: %s",
+ m->path, strerror(errno));
+ return r;
+ }
+ if (!de)
break;
if (dirent_is_file_with_suffix(de, ".journal") ||
break;
if (dirent_is_file_with_suffix(de, ".journal") ||
@@
-1466,7
+1472,7
@@
static int add_directory(sd_journal *j, const char *prefix, const char *dirname)
return 0;
}
return 0;
}
-static int add_root_directory(sd_journal *j, const char *p
, const char *prefix
) {
+static int add_root_directory(sd_journal *j, const char *p) {
_cleanup_closedir_ DIR *d = NULL;
Directory *m;
int r;
_cleanup_closedir_ DIR *d = NULL;
Directory *m;
int r;
@@
-1478,8
+1484,8
@@
static int add_root_directory(sd_journal *j, const char *p, const char *prefix)
!path_startswith(p, "/run"))
return -EINVAL;
!path_startswith(p, "/run"))
return -EINVAL;
- if (prefix)
- p = strappenda(prefix, p);
+ if (
j->
prefix)
+ p = strappenda(
j->
prefix, p);
d = opendir(p);
if (!d)
d = opendir(p);
if (!d)
@@
-1526,11
+1532,17
@@
static int add_root_directory(sd_journal *j, const char *p, const char *prefix)
for (;;) {
struct dirent *de;
for (;;) {
struct dirent *de;
- union dirent_storage buf;
sd_id128_t id;
sd_id128_t id;
- r = readdir_r(d, &buf.de, &de);
- if (r != 0 || !de)
+ errno = 0;
+ de = readdir(d);
+ if (!de && errno != 0) {
+ r = -errno;
+ log_debug("Failed to read directory %s: %s",
+ m->path, strerror(errno));
+ return r;
+ }
+ if (!de)
break;
if (dirent_is_file_with_suffix(de, ".journal") ||
break;
if (dirent_is_file_with_suffix(de, ".journal") ||
@@
-1580,7
+1592,7
@@
static int remove_directory(sd_journal *j, Directory *d) {
return 0;
}
return 0;
}
-static int add_search_paths(sd_journal *j
, const char *prefix
) {
+static int add_search_paths(sd_journal *j) {
int r;
const char search_paths[] =
"/run/log/journal\0"
int r;
const char search_paths[] =
"/run/log/journal\0"
@@
-1593,7
+1605,7
@@
static int add_search_paths(sd_journal *j, const char *prefix) {
* what's actually accessible, and ignore the rest. */
NULSTR_FOREACH(p, search_paths) {
* what's actually accessible, and ignore the rest. */
NULSTR_FOREACH(p, search_paths) {
- r = add_root_directory(j, p
, prefix
);
+ r = add_root_directory(j, p);
if (r < 0 && r != -ENOENT) {
r = set_put_error(j, r);
if (r < 0)
if (r < 0 && r != -ENOENT) {
r = set_put_error(j, r);
if (r < 0)
@@
-1616,14
+1628,14
@@
static int add_current_paths(sd_journal *j) {
* treat them as fatal. */
HASHMAP_FOREACH(f, j->files, i) {
* treat them as fatal. */
HASHMAP_FOREACH(f, j->files, i) {
- int r;
_cleanup_free_ char *dir;
_cleanup_free_ char *dir;
+ int r;
dir = dirname_malloc(f->path);
if (!dir)
return -ENOMEM;
dir = dirname_malloc(f->path);
if (!dir)
return -ENOMEM;
- r = add_root_directory(j, dir
, NULL
);
+ r = add_root_directory(j, dir);
if (r < 0) {
set_put_error(j, r);
return r;
if (r < 0) {
set_put_error(j, r);
return r;
@@
-1694,7
+1706,7
@@
_public_ int sd_journal_open(sd_journal **ret, int flags) {
if (!j)
return -ENOMEM;
if (!j)
return -ENOMEM;
- r = add_search_paths(j
, NULL
);
+ r = add_search_paths(j);
if (r < 0)
goto fail;
if (r < 0)
goto fail;
@@
-1734,7
+1746,10
@@
_public_ int sd_journal_open_container(sd_journal **ret, const char *machine, in
if (!j)
return -ENOMEM;
if (!j)
return -ENOMEM;
- r = add_search_paths(j, root);
+ j->prefix = root;
+ root = NULL;
+
+ r = add_search_paths(j);
if (r < 0)
goto fail;
if (r < 0)
goto fail;
@@
-1758,7
+1773,7
@@
_public_ int sd_journal_open_directory(sd_journal **ret, const char *path, int f
if (!j)
return -ENOMEM;
if (!j)
return -ENOMEM;
- r = add_root_directory(j, path
, NULL
);
+ r = add_root_directory(j, path);
if (r < 0) {
set_put_error(j, r);
goto fail;
if (r < 0) {
set_put_error(j, r);
goto fail;
@@
-1836,6
+1851,7
@@
_public_ void sd_journal_close(sd_journal *j) {
}
free(j->path);
}
free(j->path);
+ free(j->prefix);
free(j->unique_field);
set_free(j->errors);
free(j);
free(j->unique_field);
set_free(j->errors);
free(j);
@@
-2121,9
+2137,9
@@
_public_ int sd_journal_get_fd(sd_journal *j) {
if (j->no_new_files)
r = add_current_paths(j);
else if (j->path)
if (j->no_new_files)
r = add_current_paths(j);
else if (j->path)
- r = add_root_directory(j, j->path
, NULL
);
+ r = add_root_directory(j, j->path);
else
else
- r = add_search_paths(j
, NULL
);
+ r = add_search_paths(j);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-2277,8
+2293,6
@@
_public_ int sd_journal_process(sd_journal *j) {
l -= step;
}
}
l -= step;
}
}
-
- return determine_change(j);
}
_public_ int sd_journal_wait(sd_journal *j, uint64_t timeout_usec) {
}
_public_ int sd_journal_wait(sd_journal *j, uint64_t timeout_usec) {
@@
-2331,6
+2345,7
@@
_public_ int sd_journal_get_cutoff_realtime_usec(sd_journal *j, uint64_t *from,
Iterator i;
JournalFile *f;
bool first = true;
Iterator i;
JournalFile *f;
bool first = true;
+ uint64_t fmin = 0, tmax = 0;
int r;
assert_return(j, -EINVAL);
int r;
assert_return(j, -EINVAL);
@@
-2350,19
+2365,20
@@
_public_ int sd_journal_get_cutoff_realtime_usec(sd_journal *j, uint64_t *from,
continue;
if (first) {
continue;
if (first) {
- if (from)
- *from = fr;
- if (to)
- *to = t;
+ fmin = fr;
+ tmax = t;
first = false;
} else {
first = false;
} else {
- if (from)
- *from = MIN(fr, *from);
- if (to)
- *to = MAX(t, *to);
+ fmin = MIN(fr, fmin);
+ tmax = MAX(t, tmax);
}
}
}
}
+ if (from)
+ *from = fmin;
+ if (to)
+ *to = tmax;
+
return first ? 0 : 1;
}
return first ? 0 : 1;
}
@@
-2465,9
+2481,7
@@
_public_ int sd_journal_query_unique(sd_journal *j, const char *field) {
}
_public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_t *l) {
}
_public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_t *l) {
- Object *o;
size_t k;
size_t k;
- int r;
assert_return(j, -EINVAL);
assert_return(!journal_pid_changed(j), -ECHILD);
assert_return(j, -EINVAL);
assert_return(!journal_pid_changed(j), -ECHILD);
@@
-2487,9
+2501,11
@@
_public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
for (;;) {
JournalFile *of;
Iterator i;
for (;;) {
JournalFile *of;
Iterator i;
+ Object *o;
const void *odata;
size_t ol;
bool found;
const void *odata;
size_t ol;
bool found;
+ int r;
/* Proceed to next data object in the field's linked list */
if (j->unique_offset == 0) {
/* Proceed to next data object in the field's linked list */
if (j->unique_offset == 0) {
@@
-2526,8
+2542,16
@@
_public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
return r;
/* Let's do the type check by hand, since we used 0 context above. */
return r;
/* Let's do the type check by hand, since we used 0 context above. */
- if (o->object.type != OBJECT_DATA)
+ if (o->object.type != OBJECT_DATA) {
+ log_error("%s:offset " OFSfmt ": object has type %d, expected %d",
+ j->unique_file->path, j->unique_offset,
+ o->object.type, OBJECT_DATA);
return -EBADMSG;
return -EBADMSG;
+ }
+
+ r = journal_file_object_keep(j->unique_file, o, j->unique_offset);
+ if (r < 0)
+ return r;
r = return_data(j, j->unique_file, o, &odata, &ol);
if (r < 0)
r = return_data(j, j->unique_file, o, &odata, &ol);
if (r < 0)
@@
-2561,6
+2585,10
@@
_public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
if (found)
continue;
if (found)
continue;
+ r = journal_file_object_release(j->unique_file, o, j->unique_offset);
+ if (r < 0)
+ return r;
+
r = return_data(j, j->unique_file, o, data, l);
if (r < 0)
return r;
r = return_data(j, j->unique_file, o, data, l);
if (r < 0)
return r;