]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
journal: make sure the clock increases strict monotonic 277/head
authorLennart Poettering <lennart@poettering.net>
Wed, 17 Jun 2015 21:04:02 +0000 (23:04 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 17 Jun 2015 21:26:39 +0000 (23:26 +0200)
Let's work around crappy clocks in test-journal-interleaving.c too. This
does the same as 98d2a5341788b49e82d628dfdc2e241af6d70dcd but for
test-journal-interlaving.c rather than test-journal-stream.c.

src/journal/test-journal-interleaving.c

index c2fc123e4207e84b86b8c706c79bb0b65ac33024..adefa1b0265012c1ac0a2eb12a62605edb254727 100644 (file)
@@ -62,10 +62,19 @@ static void test_close(JournalFile *f) {
 static void append_number(JournalFile *f, int n, uint64_t *seqnum) {
         char *p;
         dual_timestamp ts;
+        static dual_timestamp previous_ts = {};
         struct iovec iovec[1];
 
         dual_timestamp_get(&ts);
 
+        if (ts.monotonic <= previous_ts.monotonic)
+                ts.monotonic = previous_ts.monotonic + 1;
+
+        if (ts.realtime <= previous_ts.realtime)
+                ts.realtime = previous_ts.realtime + 1;
+
+        previous_ts = ts;
+
         assert_se(asprintf(&p, "NUMBER=%d", n) >= 0);
         iovec[0].iov_base = p;
         iovec[0].iov_len = strlen(p);