[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/2] mux-term: Fix timestamp association
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH 2/2] mux-term: Fix timestamp association |
Date: |
Mon, 15 Jun 2009 22:25:34 +0200 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 |
So far a new timestamp was generated *after* a full line had been
printed. Fix this.
Signed-off-by: Jan Kiszka <address@hidden>
---
qemu-char.c | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
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 @@ typedef struct {
int prod[MAX_MUX];
int cons[MAX_MUX];
int timestamps;
+ int linestart;
int64_t timestamps_start;
} MuxDriver;
@@ -252,9 +253,8 @@ static int mux_chr_write(CharDriverState *chr, const
uint8_t *buf, int len)
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 @@ static int mux_chr_write(CharDriverState *chr, const
uint8_t *buf, int len)
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 @@ static int mux_proc_byte(CharDriverState *chr, MuxDriver
*d, int ch)
case 't':
d->timestamps = !d->timestamps;
d->timestamps_start = -1;
+ d->linestart = 0;
break;
}
} else if (ch == term_escape_char) {
signature.asc
Description: OpenPGP digital signature
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [PATCH 2/2] mux-term: Fix timestamp association,
Jan Kiszka <=