* [Qemu-devel] [PATCH 3/3] memory: Print regions in ascending order
@ 2011-09-27 13:00 Jan Kiszka
2011-10-02 14:06 ` Avi Kivity
0 siblings, 1 reply; 2+ messages in thread
From: Jan Kiszka @ 2011-09-27 13:00 UTC (permalink / raw)
To: Avi Kivity; +Cc: Blue Swirl, qemu-devel
Makes reading the output more user friendly.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
memory.c | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/memory.c b/memory.c
index 24c5abd..6ff78cb 100644
--- a/memory.c
+++ b/memory.c
@@ -1339,12 +1339,13 @@ typedef QTAILQ_HEAD(queue, MemoryRegionList) MemoryRegionListHead;
static void mtree_print_mr(fprintf_function mon_printf, void *f,
const MemoryRegion *mr, unsigned int level,
target_phys_addr_t base,
- MemoryRegionListHead *print_queue)
+ MemoryRegionListHead *alias_print_queue)
{
+ MemoryRegionList *new_ml, *ml, *next_ml;
+ MemoryRegionListHead submr_print_queue;
const MemoryRegion *submr;
unsigned int i;
-
if (!mr) {
return;
}
@@ -1358,7 +1359,7 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
bool found = false;
/* check if the alias is already in the queue */
- QTAILQ_FOREACH(ml, print_queue, queue) {
+ QTAILQ_FOREACH(ml, alias_print_queue, queue) {
if (ml->mr == mr->alias && !ml->printed) {
found = true;
}
@@ -1368,7 +1369,7 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
ml = g_new(MemoryRegionList, 1);
ml->mr = mr->alias;
ml->printed = false;
- QTAILQ_INSERT_TAIL(print_queue, ml, queue);
+ QTAILQ_INSERT_TAIL(alias_print_queue, ml, queue);
}
mon_printf(f, TARGET_FMT_plx "-" TARGET_FMT_plx " (prio %d): alias %s @%s "
TARGET_FMT_plx "-" TARGET_FMT_plx "\n",
@@ -1386,9 +1387,33 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
mr->priority,
mr->name);
}
+
+ QTAILQ_INIT(&submr_print_queue);
+
QTAILQ_FOREACH(submr, &mr->subregions, subregions_link) {
- mtree_print_mr(mon_printf, f, submr, level + 1, base + mr->addr,
- print_queue);
+ new_ml = g_new(MemoryRegionList, 1);
+ new_ml->mr = submr;
+ QTAILQ_FOREACH(ml, &submr_print_queue, queue) {
+ if (new_ml->mr->addr < ml->mr->addr ||
+ (new_ml->mr->addr == ml->mr->addr &&
+ new_ml->mr->priority > ml->mr->priority)) {
+ QTAILQ_INSERT_BEFORE(ml, new_ml, queue);
+ new_ml = NULL;
+ break;
+ }
+ }
+ if (new_ml) {
+ QTAILQ_INSERT_TAIL(&submr_print_queue, new_ml, queue);
+ }
+ }
+
+ QTAILQ_FOREACH(ml, &submr_print_queue, queue) {
+ mtree_print_mr(mon_printf, f, ml->mr, level + 1, base + mr->addr,
+ alias_print_queue);
+ }
+
+ QTAILQ_FOREACH_SAFE(next_ml, &submr_print_queue, queue, ml) {
+ g_free(ml);
}
}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Qemu-devel] [PATCH 3/3] memory: Print regions in ascending order
2011-09-27 13:00 [Qemu-devel] [PATCH 3/3] memory: Print regions in ascending order Jan Kiszka
@ 2011-10-02 14:06 ` Avi Kivity
0 siblings, 0 replies; 2+ messages in thread
From: Avi Kivity @ 2011-10-02 14:06 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Blue Swirl, qemu-devel
On 09/27/2011 04:00 PM, Jan Kiszka wrote:
> Makes reading the output more user friendly.
Thanks, applied all three.
> @@ -1339,12 +1339,13 @@ typedef QTAILQ_HEAD(queue, MemoryRegionList) MemoryRegionListHead;
> static void mtree_print_mr(fprintf_function mon_printf, void *f,
> const MemoryRegion *mr, unsigned int level,
> target_phys_addr_t base,
> - MemoryRegionListHead *print_queue)
> + MemoryRegionListHead *alias_print_queue)
> {
> + MemoryRegionList *new_ml, *ml, *next_ml;
> + MemoryRegionListHead submr_print_queue;
> const MemoryRegion *submr;
> unsigned int i;
>
> -
> if (!mr) {
> return;
> }
> @@ -1358,7 +1359,7 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
> bool found = false;
>
> /* check if the alias is already in the queue */
> - QTAILQ_FOREACH(ml, print_queue, queue) {
> + QTAILQ_FOREACH(ml, alias_print_queue, queue) {
> if (ml->mr == mr->alias&& !ml->printed) {
> found = true;
> }
> @@ -1368,7 +1369,7 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
> ml = g_new(MemoryRegionList, 1);
> ml->mr = mr->alias;
> ml->printed = false;
> - QTAILQ_INSERT_TAIL(print_queue, ml, queue);
> + QTAILQ_INSERT_TAIL(alias_print_queue, ml, queue);
> }
> mon_printf(f, TARGET_FMT_plx "-" TARGET_FMT_plx " (prio %d): alias %s @%s "
> TARGET_FMT_plx "-" TARGET_FMT_plx "\n",
> @@ -1386,9 +1387,33 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
> mr->priority,
> mr->name);
> }
> +
> + QTAILQ_INIT(&submr_print_queue);
> +
> QTAILQ_FOREACH(submr,&mr->subregions, subregions_link) {
> - mtree_print_mr(mon_printf, f, submr, level + 1, base + mr->addr,
> - print_queue);
> + new_ml = g_new(MemoryRegionList, 1);
> + new_ml->mr = submr;
> + QTAILQ_FOREACH(ml,&submr_print_queue, queue) {
> + if (new_ml->mr->addr< ml->mr->addr ||
> + (new_ml->mr->addr == ml->mr->addr&&
> + new_ml->mr->priority> ml->mr->priority)) {
> + QTAILQ_INSERT_BEFORE(ml, new_ml, queue);
> + new_ml = NULL;
> + break;
> + }
> + }
> + if (new_ml) {
> + QTAILQ_INSERT_TAIL(&submr_print_queue, new_ml, queue);
> + }
> + }
> +
> + QTAILQ_FOREACH(ml,&submr_print_queue, queue) {
> + mtree_print_mr(mon_printf, f, ml->mr, level + 1, base + mr->addr,
> + alias_print_queue);
> + }
> +
> + QTAILQ_FOREACH_SAFE(next_ml,&submr_print_queue, queue, ml) {
> + g_free(ml);
> }
> }
>
Yuck, the whole thing would be a one-liner with a capable library
(std::map<> or std::sort())
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-10-02 14:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-27 13:00 [Qemu-devel] [PATCH 3/3] memory: Print regions in ascending order Jan Kiszka
2011-10-02 14:06 ` Avi Kivity
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).