mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
qtest: replace gettimeofday with GTimer
glib provides a convenience helper to measure elapsed time. It isn't subject to wall-clock time changes. Note that this changes the initial OPENED time, which used to print the current time. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Laurent Vivier <laurent@vivier.eu> Message-Id: <20220307070401.171986-3-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
811b4ec7f8
commit
20e4ae117a
|
@ -58,12 +58,12 @@ static FILE *qtest_log_fp;
|
|||
static QTest *qtest;
|
||||
static GString *inbuf;
|
||||
static int irq_levels[MAX_IRQ];
|
||||
static qemu_timeval start_time;
|
||||
static GTimer *timer;
|
||||
static bool qtest_opened;
|
||||
static void (*qtest_server_send)(void*, const char*);
|
||||
static void *qtest_server_send_opaque;
|
||||
|
||||
#define FMT_timeval "%ld.%06ld"
|
||||
#define FMT_timeval "%.06f"
|
||||
|
||||
/**
|
||||
* DOC: QTest Protocol
|
||||
|
@ -264,28 +264,13 @@ static int hex2nib(char ch)
|
|||
}
|
||||
}
|
||||
|
||||
static void qtest_get_time(qemu_timeval *tv)
|
||||
{
|
||||
qemu_gettimeofday(tv);
|
||||
tv->tv_sec -= start_time.tv_sec;
|
||||
tv->tv_usec -= start_time.tv_usec;
|
||||
if (tv->tv_usec < 0) {
|
||||
tv->tv_usec += 1000000;
|
||||
tv->tv_sec -= 1;
|
||||
}
|
||||
}
|
||||
|
||||
static void qtest_send_prefix(CharBackend *chr)
|
||||
{
|
||||
qemu_timeval tv;
|
||||
|
||||
if (!qtest_log_fp || !qtest_opened) {
|
||||
return;
|
||||
}
|
||||
|
||||
qtest_get_time(&tv);
|
||||
fprintf(qtest_log_fp, "[S +" FMT_timeval "] ",
|
||||
(long) tv.tv_sec, (long) tv.tv_usec);
|
||||
fprintf(qtest_log_fp, "[S +" FMT_timeval "] ", g_timer_elapsed(timer, NULL));
|
||||
}
|
||||
|
||||
static void G_GNUC_PRINTF(1, 2) qtest_log_send(const char *fmt, ...)
|
||||
|
@ -386,12 +371,9 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
|
|||
command = words[0];
|
||||
|
||||
if (qtest_log_fp) {
|
||||
qemu_timeval tv;
|
||||
int i;
|
||||
|
||||
qtest_get_time(&tv);
|
||||
fprintf(qtest_log_fp, "[R +" FMT_timeval "]",
|
||||
(long) tv.tv_sec, (long) tv.tv_usec);
|
||||
fprintf(qtest_log_fp, "[R +" FMT_timeval "]", g_timer_elapsed(timer, NULL));
|
||||
for (i = 0; words[i]; i++) {
|
||||
fprintf(qtest_log_fp, " %s", words[i]);
|
||||
}
|
||||
|
@ -846,21 +828,20 @@ static void qtest_event(void *opaque, QEMUChrEvent event)
|
|||
for (i = 0; i < ARRAY_SIZE(irq_levels); i++) {
|
||||
irq_levels[i] = 0;
|
||||
}
|
||||
qemu_gettimeofday(&start_time);
|
||||
|
||||
g_clear_pointer(&timer, g_timer_destroy);
|
||||
timer = g_timer_new();
|
||||
qtest_opened = true;
|
||||
if (qtest_log_fp) {
|
||||
fprintf(qtest_log_fp, "[I " FMT_timeval "] OPENED\n",
|
||||
(long) start_time.tv_sec, (long) start_time.tv_usec);
|
||||
fprintf(qtest_log_fp, "[I " FMT_timeval "] OPENED\n", g_timer_elapsed(timer, NULL));
|
||||
}
|
||||
break;
|
||||
case CHR_EVENT_CLOSED:
|
||||
qtest_opened = false;
|
||||
if (qtest_log_fp) {
|
||||
qemu_timeval tv;
|
||||
qtest_get_time(&tv);
|
||||
fprintf(qtest_log_fp, "[I +" FMT_timeval "] CLOSED\n",
|
||||
(long) tv.tv_sec, (long) tv.tv_usec);
|
||||
fprintf(qtest_log_fp, "[I +" FMT_timeval "] CLOSED\n", g_timer_elapsed(timer, NULL));
|
||||
}
|
||||
g_clear_pointer(&timer, g_timer_destroy);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
|
Loading…
Reference in a new issue