[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 12/18] trace: dynamically allocate trace_dstate i
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v3 12/18] trace: dynamically allocate trace_dstate in CPUState |
Date: |
Mon, 19 Sep 2016 15:49:03 +0100 |
The CPUState struct has a bitmap tracking which VCPU
events are currently active. This is indexed based on
the event ID values, and sized according the maximum
TraceEventVCPUID enum value.
When we start dynamically assigning IDs at runtime,
we can't statically declare a bitmap without making
an assumption about the max event count. This problem
can be solved by dynamically allocating the per-CPU
dstate bitmap.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
include/qom/cpu.h | 7 ++++---
qom/cpu.c | 7 ++++++-
trace/control.c | 5 +++++
trace/control.h | 7 +++++++
4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index ce0c406..fa746b1 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -27,7 +27,6 @@
#include "qemu/bitmap.h"
#include "qemu/queue.h"
#include "qemu/thread.h"
-#include "trace/generated-events.h"
typedef int (*WriteCoreDumpFunction)(const void *buf, size_t size,
void *opaque);
@@ -350,8 +349,10 @@ struct CPUState {
struct KVMState *kvm_state;
struct kvm_run *kvm_run;
- /* Used for events with 'vcpu' and *without* the 'disabled' properties */
- DECLARE_BITMAP(trace_dstate, TRACE_VCPU_EVENT_COUNT);
+ /* Used for events with 'vcpu' and *without* the 'disabled' properties
+ * Dynamically allocated based on
BITS_TO_LONGS(trace_get_vcpu_event_count())
+ */
+ unsigned long *trace_dstate;
/* TODO Move common fields from CPUArchState here. */
int cpu_index; /* used by alpha TCG */
diff --git a/qom/cpu.c b/qom/cpu.c
index 2553247..3a125b9 100644
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -29,6 +29,7 @@
#include "qemu/error-report.h"
#include "sysemu/sysemu.h"
#include "hw/qdev-properties.h"
+#include "trace/control.h"
bool cpu_exists(int64_t id)
{
@@ -345,12 +346,16 @@ static void cpu_common_initfn(Object *obj)
qemu_mutex_init(&cpu->work_mutex);
QTAILQ_INIT(&cpu->breakpoints);
QTAILQ_INIT(&cpu->watchpoints);
- bitmap_zero(cpu->trace_dstate, TRACE_VCPU_EVENT_COUNT);
+
+ cpu->trace_dstate = g_new0(unsigned long,
+ BITS_TO_LONGS(trace_get_vcpu_event_count()));
}
static void cpu_common_finalize(Object *obj)
{
+ CPUState *cpu = CPU(obj);
cpu_exec_exit(CPU(obj));
+ g_free(cpu->trace_dstate);
}
static int64_t cpu_common_get_arch_id(CPUState *cpu)
diff --git a/trace/control.c b/trace/control.c
index 2db7196..0633774 100644
--- a/trace/control.c
+++ b/trace/control.c
@@ -319,3 +319,8 @@ void trace_init_vcpu_events(void)
}
}
}
+
+uint32_t trace_get_vcpu_event_count(void)
+{
+ return TRACE_VCPU_EVENT_COUNT;
+}
diff --git a/trace/control.h b/trace/control.h
index 265e387..60905f7 100644
--- a/trace/control.h
+++ b/trace/control.h
@@ -234,6 +234,13 @@ char *trace_opt_parse(const char *optarg);
void trace_init_vcpu_events(void);
+/**
+ * trace_get_vcpu_event_count:
+ *
+ * Return the number of known vcpu-specific events
+ */
+uint32_t trace_get_vcpu_event_count(void);
+
#include "trace/control-internal.h"
#endif /* TRACE__CONTROL_H */
--
2.7.4
- Re: [Qemu-devel] [PATCH v3 03/18] trace: remove some now unused functions, (continued)
- [Qemu-devel] [PATCH v3 05/18] trace: remove duplicate control.h includes in generated-tracers.h, Daniel P. Berrange, 2016/09/19
- [Qemu-devel] [PATCH v3 04/18] trace: remove global 'uint16 dstate[]' array, Daniel P. Berrange, 2016/09/19
- [Qemu-devel] [PATCH v3 06/18] trace: break circular dependancy in event-internal.h, Daniel P. Berrange, 2016/09/19
- [Qemu-devel] [PATCH v3 12/18] trace: dynamically allocate trace_dstate in CPUState,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v3 08/18] trace: remove the TraceEventID and TraceEventVCPUID enums, Daniel P. Berrange, 2016/09/19
- [Qemu-devel] [PATCH v3 09/18] trace: emit name <-> ID mapping in simpletrace header, Daniel P. Berrange, 2016/09/19
- [Qemu-devel] [PATCH v3 15/18] trace: rename _read_events to read_events, Daniel P. Berrange, 2016/09/19
- [Qemu-devel] [PATCH v3 07/18] trace: give each trace event a named TraceEvent struct, Daniel P. Berrange, 2016/09/19
- [Qemu-devel] [PATCH v3 10/18] trace: don't abort qemu if ftrace can't be initialized, Daniel P. Berrange, 2016/09/19