commit 4ab312f793fe9202299966de98d67d9574c572d4
author Jan Kiszka <jan.kiszka@web.de> Mon Jun 15 22:25:34 2009 +0200
committer Anthony Liguori <aliguori@us.ibm.com> Tue Jun 16 15:18:37 2009 -0500
tree 61416ebb849251b3e3b92c92a219c38ed82651b3
parent 2d22959d61fa866d2bbe310b61539da98bb47917

mux-term: Fix timestamp association

So far a new timestamp was generated *after* a full line had been
printed. Fix this.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

qemu-char.c

diff --git a/qemu-char.c b/qemu-char.c
index d82a64f..287e0cd 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -238,6 +238,7 @@
     int prod[MAX_MUX];
     int cons[MAX_MUX];
     int timestamps;
+    int linestart;
     int64_t timestamps_start;
 } MuxDriver;
 
@@ -252,9 +253,8 @@
         int i;
 
         ret = 0;
-        for(i = 0; i < len; i++) {
-            ret += d->drv->chr_write(d->drv, buf+i, 1);
-            if (buf[i] == '\n') {
+        for (i = 0; i < len; i++) {
+            if (d->linestart) {
                 char buf1[64];
                 int64_t ti;
                 int secs;
@@ -271,6 +271,11 @@
                          secs % 60,
                          (int)(ti % 1000));
                 d->drv->chr_write(d->drv, (uint8_t *)buf1, strlen(buf1));
+                d->linestart = 0;
+            }
+            ret += d->drv->chr_write(d->drv, buf+i, 1);
+            if (buf[i] == '\n') {
+                d->linestart = 1;
             }
         }
     }
@@ -360,6 +365,7 @@
         case 't':
             d->timestamps = !d->timestamps;
             d->timestamps_start = -1;
+            d->linestart = 0;
             break;
         }
     } else if (ch == term_escape_char) {