|
 |
923a60 |
From 1466d84c159c1a9d1839c1b346906b722e6311a3 Mon Sep 17 00:00:00 2001
|
|
|
923a60 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
923a60 |
Date: Fri, 24 Jul 2015 01:40:44 +0200
|
|
|
923a60 |
Subject: [PATCH] journal-verify: don't hit SIGFPE when determining progress
|
|
|
923a60 |
|
|
|
923a60 |
If we determine the progress based on a number of objects available,
|
|
|
923a60 |
don't blindly devide by the number of objects, given that it might be 0.
|
|
|
923a60 |
|
|
|
923a60 |
Cherry-picked from: 45c047b227d96e98e7076c15ae774ff6390dc403
|
|
|
923a60 |
Related: #1350232
|
|
|
923a60 |
---
|
|
|
923a60 |
src/journal/journal-verify.c | 16 +++++++++++++---
|
|
|
923a60 |
1 file changed, 13 insertions(+), 3 deletions(-)
|
|
|
923a60 |
|
|
|
923a60 |
diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
|
|
|
923a60 |
index b03335ef31..983217c1bc 100644
|
|
|
923a60 |
--- a/src/journal/journal-verify.c
|
|
|
923a60 |
+++ b/src/journal/journal-verify.c
|
|
|
923a60 |
@@ -69,6 +69,16 @@ static void draw_progress(uint64_t p, usec_t *last_usec) {
|
|
|
923a60 |
fflush(stdout);
|
|
|
923a60 |
}
|
|
|
923a60 |
|
|
|
923a60 |
+static uint64_t scale_progress(uint64_t scale, uint64_t p, uint64_t m) {
|
|
|
923a60 |
+
|
|
|
923a60 |
+ /* Calculates scale * p / m, but handles m == 0 safely, and saturates */
|
|
|
923a60 |
+
|
|
|
923a60 |
+ if (p >= m || m == 0)
|
|
|
923a60 |
+ return scale;
|
|
|
923a60 |
+
|
|
|
923a60 |
+ return scale * p / m;
|
|
|
923a60 |
+}
|
|
|
923a60 |
+
|
|
|
923a60 |
static void flush_progress(void) {
|
|
|
923a60 |
unsigned n, i;
|
|
|
923a60 |
|
|
|
923a60 |
@@ -584,7 +594,7 @@ static int verify_hash_table(
|
|
|
923a60 |
uint64_t last = 0, p;
|
|
|
923a60 |
|
|
|
923a60 |
if (show_progress)
|
|
|
923a60 |
- draw_progress(0xC000 + (0x3FFF * i / n), last_usec);
|
|
|
923a60 |
+ draw_progress(0xC000 + scale_progress(0x3FFF, i, n), last_usec);
|
|
|
923a60 |
|
|
|
923a60 |
p = le64toh(f->data_hash_table[i].head_hash_offset);
|
|
|
923a60 |
while (p != 0) {
|
|
|
923a60 |
@@ -726,7 +736,7 @@ static int verify_entry_array(
|
|
|
923a60 |
Object *o;
|
|
|
923a60 |
|
|
|
923a60 |
if (show_progress)
|
|
|
923a60 |
- draw_progress(0x8000 + (0x3FFF * i / n), last_usec);
|
|
|
923a60 |
+ draw_progress(0x8000 + scale_progress(0x3FFF, i, n), last_usec);
|
|
|
923a60 |
|
|
|
923a60 |
if (a == 0) {
|
|
|
923a60 |
error(a, "array chain too short at %"PRIu64" of %"PRIu64, i, n);
|
|
|
923a60 |
@@ -863,7 +873,7 @@ int journal_file_verify(
|
|
|
923a60 |
p = le64toh(f->header->header_size);
|
|
|
923a60 |
while (p != 0) {
|
|
|
923a60 |
if (show_progress)
|
|
|
923a60 |
- draw_progress(0x7FFF * p / le64toh(f->header->tail_object_offset), &last_usec);
|
|
|
923a60 |
+ draw_progress(scale_progress(0x7FFF, p, le64toh(f->header->tail_object_offset)), &last_usec);
|
|
|
923a60 |
|
|
|
923a60 |
r = journal_file_move_to_object(f, OBJECT_UNUSED, p, &o);
|
|
|
923a60 |
if (r < 0) {
|