[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/20] separate accelerator part of info profiler
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH 06/20] separate accelerator part of info profiler |
Date: |
Fri, 27 Jun 2008 17:38:09 -0300 |
---
accel.h | 8 ++++++++
kqemu.c | 35 +++++++++++++++++++++++++++++++++++
monitor.c | 27 ++++++---------------------
3 files changed, 49 insertions(+), 21 deletions(-)
diff --git a/accel.h b/accel.h
index f6d53ea..f80b15f 100644
--- a/accel.h
+++ b/accel.h
@@ -4,6 +4,7 @@ typedef struct QEMUAccel {
void (*flush_cache)(CPUState *env, int global);
void (*flush_page)(CPUState *env, target_ulong addr);
int (*info)(CPUState *env, char *buf);
+ int (*profile)(CPUState *env, char *buf);
} QEMUAccel;
extern QEMUAccel *current_accel;
@@ -43,3 +44,10 @@ static inline int accel_info(CPUState *env, char *buf)
return current_accel->info(env, buf);
return 0;
}
+
+static inline int accel_profile(CPUState *env, char *buf)
+{
+ if (current_accel && current_accel->profile)
+ return current_accel->profile(env, buf);
+ return 0;
+}
diff --git a/kqemu.c b/kqemu.c
index ac12e17..bcbe3cc 100644
--- a/kqemu.c
+++ b/kqemu.c
@@ -52,6 +52,10 @@
#include "kqemu.h"
#include "accel.h"
+#ifdef CONFIG_PROFILER
+#include "qemu-timer.h" /* for ticks_per_sec */
+#endif
+
#ifdef _WIN32
#define KQEMU_DEVICE "\\\\.\\kqemu"
#else
@@ -293,12 +297,43 @@ int kqemu_info(CPUState *env, char *buf)
return len;
}
+int64_t kqemu_time;
+int64_t kqemu_exec_count;
+int64_t kqemu_ret_int_count;
+int64_t kqemu_ret_excp_count;
+int64_t kqemu_ret_intr_count;
+extern int64_t qemu_time;
+
+int kqemu_profile(CPUState *env, char *buf)
+{
+ int len = 0;
+#ifdef CONFIG_PROFILER
+ len = sprintf(buf, "kqemu time %" PRId64 " (%0.3f %0.1f%%) count=%" PRId64
+ " int=%" PRId64 " excp=%" PRId64 " intr=%" PRId64 "\n",
+ kqemu_time, kqemu_time / (double)ticks_per_sec,
+ kqemu_time / qemu_time * 100.0,
+ kqemu_exec_count,
+ kqemu_ret_int_count,
+ kqemu_ret_excp_count,
+ kqemu_ret_intr_count);
+
+ kqemu_time = 0;
+ kqemu_exec_count = 0;
+ kqemu_ret_int_count = 0;
+ kqemu_ret_excp_count = 0;
+ kqemu_ret_intr_count = 0;
+ kqemu_record_dump();
+#endif
+ return len;
+}
+
QEMUAccel kqemu_accel = {
.cpu_interrupt = kqemu_cpu_interrupt,
.init_env = kqemu_init_env,
.flush_cache = kqemu_flush,
.flush_page = kqemu_flush_page,
.info = kqemu_info,
+ .profile = kqemu_profile,
};
diff --git a/monitor.c b/monitor.c
index ef189cc..29a747d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1239,17 +1239,14 @@ static void do_info_accelerator(void)
#ifdef CONFIG_PROFILER
-int64_t kqemu_time;
int64_t qemu_time;
-int64_t kqemu_exec_count;
int64_t dev_time;
-int64_t kqemu_ret_int_count;
-int64_t kqemu_ret_excp_count;
-int64_t kqemu_ret_intr_count;
-
static void do_info_profile(void)
{
int64_t total;
+ char buf[MAX_BUF];
+ CPUState *env = mon_get_cpu();
+
total = qemu_time;
if (total == 0)
total = 1;
@@ -1257,24 +1254,12 @@ static void do_info_profile(void)
dev_time, dev_time / (double)ticks_per_sec);
term_printf("qemu time %" PRId64 " (%0.3f)\n",
qemu_time, qemu_time / (double)ticks_per_sec);
- term_printf("kqemu time %" PRId64 " (%0.3f %0.1f%%) count=%" PRId64 "
int=%" PRId64 " excp=%" PRId64 " intr=%" PRId64 "\n",
- kqemu_time, kqemu_time / (double)ticks_per_sec,
- kqemu_time / (double)total * 100.0,
- kqemu_exec_count,
- kqemu_ret_int_count,
- kqemu_ret_excp_count,
- kqemu_ret_intr_count);
+ if (accel_profile(env, buf))
+ term_printf(buf);
qemu_time = 0;
- kqemu_time = 0;
- kqemu_exec_count = 0;
dev_time = 0;
- kqemu_ret_int_count = 0;
- kqemu_ret_excp_count = 0;
- kqemu_ret_intr_count = 0;
-#ifdef USE_KQEMU
- kqemu_record_dump();
-#endif
}
+
#else
static void do_info_profile(void)
{
--
1.5.5.1
- [Qemu-devel] [PATCH 0/20] QEMU Accel patch, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 01/20] split kqemu_init into two, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 02/20] introduce QEMUAccel and fill it with interrupt specific driver, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 03/20] init env made accel driver, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 04/20] wrap cache flushing functions into accel drivers, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 05/20] turn info kqemu into generic info accelerator, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 06/20] separate accelerator part of info profiler,
Glauber Costa <=
- [Qemu-devel] [PATCH 07/20] move kqemu externs to kqemu.h, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 08/20] move disabling code to kqemu.c instead of vl.c, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 09/20] set_notdirty goes through accel wrapper, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 10/20] wrap modify_page through accel calls, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 11/20] remove kqemu reference from hw/pc.c, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 12/20] build list of available accelerators, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 13/20] decorate application name, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 14/20] tsc: kvm will use it, but it is pretty general, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 15/20] shift for masks., Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 16/20] small changes in headers needed to acomodate kvm files as is., Glauber Costa, 2008/06/27