qom: HMP command fixes
Subsystems (4)
cover qom: HMP command fixes
A leak fix (recent regression), a help fix (regression in 5.0), a bit of performance work, and a doc fix. The leak fix looks like a must have for 5.1.
Markus Armbruster (5):
qdev: Fix device_add DRIVER,help to print to monitor
qom: Plug memory leak in "info qom-tree"
qom: Change object_get_canonical_path_component() not to malloc
qom: Document object_get_canonical_path() returns malloced string
qom: Make info qom-tree sort children more efficiently
include/qom/object.h | 7 ++++--- backends/hostmem.c | 2 +- block/throttle-groups.c | 2 +- gdbstub.c | 2 +- hw/arm/xlnx-zynqmp.c | 6 ++---- hw/block/nvme.c | 5 ++--- hw/core/machine-qmp-cmds.c | 2 +- hw/core/machine.c | 5 ++--- hw/mem/nvdimm.c | 5 ++--- hw/mem/pc-dimm.c | 5 ++--- hw/misc/ivshmem.c | 5 ++--- hw/ppc/spapr_drc.c | 3 +-- hw/virtio/virtio-crypto.c | 5 ++--- hw/virtio/virtio-mem.c | 6 ++---- hw/virtio/virtio-pmem.c | 5 ++--- iothread.c | 9 ++++----- net/net.c | 6 ++---- qdev-monitor.c | 2 +- qom/object.c | 7 +++---- qom/qom-hmp-cmds.c | 30 +++++++++++++++--------------- scsi/pr-manager-helper.c | 3 +-- scsi/pr-manager.c | 2 +- softmmu/memory.c | 2 +- hw/ppc/trace-events | 2 +- 24 files changed, 56 insertions(+), 72 deletions(-)
Signature · 1 line
2.26.2
PATCH 1/5 qdev: Fix device_add DRIVER, help to print to monitor
Help on device properties gets printed to stdout instead of the monitor. If you have the monitor anywhere else, no help for you. Broken when commit e1043d674d "qdev: use object_property_help()" accidentally switched from qemu_printf() to printf(). Switch right back.
--- qdev-monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
qdev-monitor.c +1 -1
@@ -300,7 +300,7 @@ int qdev_device_help(QemuOpts *opts) }g_ptr_array_sort (array, (GCompareFunc )qemu_pstrcmp0);for (i =0 ; i < array->len; i++) { -printf ("%s\n" , (char *)array->pdata[i]); +qemu_printf ("%s\n" , (char *)array->pdata[i]); }g_ptr_array_set_free_func (array, g_free);g_ptr_array_free (array, true);
Signature · 1 line
2.26.2
Re: [PATCH for-5.1 1/5] qdev: Fix device_add DRIVER, help to print to monitor
qdev-monitor.c
Quoted 18 lines · Markus Armbruster
Help on device properties gets printed to stdout instead of the monitor. If you have the monitor anywhere else, no help for you. Broken when commit
e1043d674d"qdev: useobject_property_help()" accidentally switched fromqemu_printf()toprintf(). Switch right back.Fixes e1043d674d792ff64aebae1a3eafc08b38a8a085Cc Marc-André Lureau <[email protected]>Signed-off-by Markus Armbruster <[email protected]>--- qdev-monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)qdev-monitor.c +0
-0
#pragma GCC poison printf
#pragma GCC poison fprintf
;)
Quoted 10 lines
qdev-monitor.c +1
-1@@ -300,7 +300,7 @@ int qdev_device_help(QemuOpts *opts) }g_ptr_array_sort (array, (GCompareFunc )qemu_pstrcmp0);for (i =0 ; i < array->len; i++) { -printf ("%s\n" , (char *)array->pdata[i]); +qemu_printf ("%s\n" , (char *)array->pdata[i]); }g_ptr_array_set_free_func (array, g_free);g_ptr_array_free (array, true);
Re: [PATCH for-5.1 1/5] qdev: Fix device_add DRIVER, help to print to monitor
In reply to Markus ArmbrusterQuoted 11 lines · Markus Armbruster <[email protected]> 于2020年7月15日周三 上午12:09写道:
Help on device properties gets printed to stdout instead of the monitor. If you have the monitor anywhere else, no help for you. Broken when commit
e1043d674d"qdev: useobject_property_help()" accidentally switched fromqemu_printf()toprintf(). Switch right back.Fixes e1043d674d792ff64aebae1a3eafc08b38a8a085Cc Marc-André Lureau <[email protected]>Signed-off-by Markus Armbruster <[email protected]>
Quoted 21 lines
--- qdev-monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)qdev-monitor.c +1
-2@@ -300,7 +300,7 @@ int qdev_device_help(QemuOpts *opts) }g_ptr_array_sort (array, (GCompareFunc )qemu_pstrcmp0);for (i =0 ; i < array->len; i++) { -printf ("%s\n" , (char *)array->pdata[i]); +qemu_printf ("%s\n" , (char *)array->pdata[i]); }g_ptr_array_set_free_func (array, g_free);g_ptr_array_free (array, true); --2.26.2
Re: [PATCH for-5.1 1/5] qdev: Fix device_add DRIVER, help to print to monitor
In reply to Markus ArmbrusterQuoted 10 lines · * Markus Armbruster ([email protected]) wrote:
Help on device properties gets printed to stdout instead of the monitor. If you have the monitor anywhere else, no help for you. Broken when commit
e1043d674d"qdev: useobject_property_help()" accidentally switched fromqemu_printf()toprintf(). Switch right back.Fixes e1043d674d792ff64aebae1a3eafc08b38a8a085Cc Marc-André Lureau <[email protected]>Signed-off-by Markus Armbruster <[email protected]>
Quoted 21 lines
--- qdev-monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)qdev-monitor.c +1
-1@@ -300,7 +300,7 @@ int qdev_device_help(QemuOpts *opts) }g_ptr_array_sort (array, (GCompareFunc )qemu_pstrcmp0);for (i =0 ; i < array->len; i++) { -printf ("%s\n" , (char *)array->pdata[i]); +qemu_printf ("%s\n" , (char *)array->pdata[i]); }g_ptr_array_set_free_func (array, g_free);g_ptr_array_free (array, true);Signature · 1 line
2.26.2
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
PATCH 2/5 qom: Plug memory leak in "info qom-tree"
In reply to Markus ArmbrusterCommit e8c9e65816 "qom: Make "info qom-tree" show children sorted" created a memory leak, because I didn't realize object_get_canonical_path_component()'s value needs to be freed.
Reproducer:
$ qemu-system-x86_64 -nodefaults -display none -S -monitor stdio
QEMU 5.0.50 monitor - type 'help' for more information
(qemu) info qom-treeThis leaks some 4500 path components, 12-13 characters on average, i.e. roughly 100kBytes depending on the allocator. A couple of hundred "info qom-tree" here, a couple of hundred there, and soon enough we're talking about real memory.
Plug the leak.
--- qom/qom-hmp-cmds.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
qom/qom-hmp-cmds.c +4 -2
@@ -96,8 +96,10 @@ static void print_qom_composition(Monitor *mon, Object *obj, int indent);static int qom_composition_compare (const void *a,const void *b,void *ignore) { -return g_strcmp0 (a ?object_get_canonical_path_component (a) :NULL , - b ?object_get_canonical_path_component (b) :NULL ); + g_autofree char *ac = object_get_canonical_path_component(a); + g_autofree char *bc = object_get_canonical_path_component(b); + +return g_strcmp0 (ac, bc); }static int insert_qom_composition_child (Object *obj,void *opaque)
Signature · 1 line
2.26.2
Re: [PATCH for-5.1 2/5] qom: Plug memory leak in "info qom-tree"
Quoted 31 lines · Markus Armbruster
Commit
e8c9e65816"qom: Make "info qom-tree" show children sorted" created a memory leak, because I didn't realize object_get_canonical_path_component()'s value needs to be freed.Reproducer:
$ qemu-system-x86_64 -nodefaults -display none -S -monitor stdio QEMU 5.0.50 monitor - type 'help' for more information (qemu) info qom-treeThis leaks some 4500 path components, 12-13 characters on average, i.e. roughly 100kBytes depending on the allocator. A couple of hundred "info qom-tree" here, a couple of hundred there, and soon enough we're talking about real memory.
Plug the leak.
Fixes e8c9e65816f5dbfe18ad3b2be938d0d8192d459aSigned-off-by Markus Armbruster <[email protected]>--- qom/qom-hmp-cmds.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)qom/qom-hmp-cmds.c +0
-0@@ -96,8 +96,10 @@ static void print_qom_composition(Monitor *mon, Object *obj, int indent);static int qom_composition_compare (const void *a,const void *b,void *ignore)
qom/qom-hmp-cmds.c static void print_qom_composition(Monitor *mon, Object *obj, int indent); · line 105
Quoted 10 lines
qom/qom-hmp-cmds.c +4
-2{ -return g_strcmp0 (a ?object_get_canonical_path_component (a) :NULL , - b ?object_get_canonical_path_component (b) :NULL ); + g_autofree char *ac = object_get_canonical_path_component(a); + g_autofree char *bc = object_get_canonical_path_component(b); + +return g_strcmp0 (ac, bc); }static int insert_qom_composition_child (Object *obj,void *opaque)
Re: [PATCH for-5.1 2/5] qom: Plug memory leak in "info qom-tree"
In reply to Markus ArmbrusterQuoted 31 lines · Markus Armbruster
Commit
e8c9e65816"qom: Make "info qom-tree" show children sorted" created a memory leak, because I didn't realize object_get_canonical_path_component()'s value needs to be freed.Reproducer:
$ qemu-system-x86_64 -nodefaults -display none -S -monitor stdio QEMU 5.0.50 monitor - type 'help' for more information (qemu) info qom-treeThis leaks some 4500 path components, 12-13 characters on average, i.e. roughly 100kBytes depending on the allocator. A couple of hundred "info qom-tree" here, a couple of hundred there, and soon enough we're talking about real memory.
Plug the leak.
Fixes e8c9e65816f5dbfe18ad3b2be938d0d8192d459aSigned-off-by Markus Armbruster <[email protected]>--- qom/qom-hmp-cmds.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)qom/qom-hmp-cmds.c +0
-0@@ -96,8 +96,10 @@ static void print_qom_composition(Monitor *mon, Object *obj, int indent);static int qom_composition_compare (const void *a,const void *b,void *ignore)
qom/qom-hmp-cmds.c static void print_qom_composition(Monitor *mon, Object *obj, int indent); · line 105
Quoted 10 lines
qom/qom-hmp-cmds.c +4
-2{ -return g_strcmp0 (a ?object_get_canonical_path_component (a) :NULL , - b ?object_get_canonical_path_component (b) :NULL ); + g_autofree char *ac = object_get_canonical_path_component(a); + g_autofree char *bc = object_get_canonical_path_component(b); + +return g_strcmp0 (ac, bc); }static int insert_qom_composition_child (Object *obj,void *opaque)
Li Qiang set this too:
https://lists.gnu.org/archive/html/qemu-devel/2020-07/msg04732.html
Re: [PATCH for-5.1 2/5] qom: Plug memory leak in "info qom-tree"
In reply to Markus ArmbrusterQuoted 16 lines · Markus Armbruster <[email protected]> 于2020年7月15日周三 上午12:05写道:
Commit
e8c9e65816"qom: Make "info qom-tree" show children sorted" created a memory leak, because I didn't realize object_get_canonical_path_component()'s value needs to be freed.Reproducer:
$ qemu-system-x86_64 -nodefaults -display none -S -monitor stdio QEMU 5.0.50 monitor - type 'help' for more information (qemu) info qom-treeThis leaks some 4500 path components, 12-13 characters on average, i.e. roughly 100kBytes depending on the allocator. A couple of hundred "info qom-tree" here, a couple of hundred there, and soon enough we're talking about real memory.
Quoted 4 lines
Plug the leak.
Fixes e8c9e65816f5dbfe18ad3b2be938d0d8192d459aSigned-off-by Markus Armbruster <[email protected]>
I have also send out this patch.
I hope the maintainer will pick your patch.
Thanks,
Li Qiang
Quoted 25 lines
--- qom/qom-hmp-cmds.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)qom/qom-hmp-cmds.c +4
-3@@ -96,8 +96,10 @@ static void print_qom_composition(Monitor *mon, Object *obj, int indent);static int qom_composition_compare (const void *a,const void *b,void *ignore) { -return g_strcmp0 (a ?object_get_canonical_path_component (a) :NULL , - b ?object_get_canonical_path_component (b) :NULL ); + g_autofree char *ac = object_get_canonical_path_component(a); + g_autofree char *bc = object_get_canonical_path_component(b); + +return g_strcmp0 (ac, bc); }static int insert_qom_composition_child (Object *obj,void *opaque) --2.26.2
Thomas Huth
Tested-byRe: [PATCH for-5.1 2/5] qom: Plug memory leak in "info qom-tree"
Quoted 17 lines · Li Qiang
Quoted 16 lines · Markus Armbruster <[email protected]> 于2020年7月15日周三 上午12:05写道:
Commit
e8c9e65816"qom: Make "info qom-tree" show children sorted" created a memory leak, because I didn't realize object_get_canonical_path_component()'s value needs to be freed.Reproducer:
$ qemu-system-x86_64 -nodefaults -display none -S -monitor stdio QEMU 5.0.50 monitor - type 'help' for more information (qemu) info qom-treeThis leaks some 4500 path components, 12-13 characters on average, i.e. roughly 100kBytes depending on the allocator. A couple of hundred "info qom-tree" here, a couple of hundred there, and soon enough we're talking about real memory.
Quoted 4 lines
Quoted 4 lines
Plug the leak.
Fixes e8c9e65816f5dbfe18ad3b2be938d0d8192d459aSigned-off-by Markus Armbruster <[email protected]>
Quoted 4 lines
Reviewed-by Li Qiang <[email protected]>I have also send out this patch.
I hope the maintainer will pick your patch.
Thanks a lot for your patch, too! Normally, I'd say "first come, first serve" and suggest that we use your patch, but since Markus' patch series has some more patches which would break due to the contextual differences, I think it's slightly better this time to use Markus' version of the patch.
Regards,
Thomas
PATCH 3/5 qom: Change object_get_canonical_path_component() not to malloc
In reply to Markus Armbrusterobject_get_canonical_path_component() returns a malloced copy of a property name on success, null on failure.
19 of its 25 callers immediately free the returned copy.
Change object_get_canonical_path_component() to return the property name directly. Since modifying the name would be wrong, adjust the return type to const char *.
Drop the free from the 19 callers become simpler, add the g_strdup() to the other six.
--- include/qom/object.h | 2 +- backends/hostmem.c | 2 +- block/throttle-groups.c | 2 +- gdbstub.c | 2 +- hw/arm/xlnx-zynqmp.c | 6 ++---- hw/block/nvme.c | 5 ++--- hw/core/machine-qmp-cmds.c | 2 +- hw/core/machine.c | 5 ++--- hw/mem/nvdimm.c | 5 ++--- hw/mem/pc-dimm.c | 5 ++--- hw/misc/ivshmem.c | 5 ++--- hw/ppc/spapr_drc.c | 3 +-- hw/virtio/virtio-crypto.c | 5 ++--- hw/virtio/virtio-mem.c | 6 ++---- hw/virtio/virtio-pmem.c | 5 ++--- iothread.c | 9 ++++----- net/net.c | 6 ++---- qom/object.c | 7 +++---- qom/qom-hmp-cmds.c | 11 ++++------- scsi/pr-manager-helper.c | 3 +-- scsi/pr-manager.c | 2 +- softmmu/memory.c | 2 +- hw/ppc/trace-events | 2 +- 23 files changed, 41 insertions(+), 61 deletions(-)
include/qom/object.h +1 -1
@@ -1462,7 +1462,7 @@ Object *object_get_internal_root(void);* path is the path within the composition tree starting from the root. * %NULL if the object doesn't have a parent (and thus a canonical path). */ -char *object_get_canonical_path_component (const Object *obj); +const char *object_get_canonical_path_component (const Object *obj);/** * object_get_canonical_path:
backends/hostmem.c +1 -1
@@ -33,7 +33,7 @@ char * host_memory_backend_get_name(HostMemoryBackend *backend) {if (!backend->use_canonical_path) { -return object_get_canonical_path_component (OBJECT (backend)); +return g_strdup (object_get_canonical_path_component (OBJECT (backend))); }return object_get_canonical_path (OBJECT (backend));
block/throttle-groups.c +1 -1
@@ -771,7 +771,7 @@ static void throttle_group_obj_complete(UserCreatable *obj, Error **errp)/* set group name to object id if it exists */ if (!tg->name && tg->parent_obj.parent) { - tg->name =object_get_canonical_path_component (OBJECT (obj)); + tg->name =g_strdup (object_get_canonical_path_component (OBJECT (obj))); }/* We must have a group name at this point */ assert (tg->name);
gdbstub.c +1 -1
@@ -2059,7 +2059,7 @@ static void handle_query_thread_extra(GdbCmdContext *gdb_ctx, void *user_ctx)/* Print the CPU model and name in multiprocess mode */ ObjectClass *oc =object_get_class (OBJECT (cpu));const char *cpu_model =object_class_get_name (oc); - g_autofree char *cpu_name = +const char *cpu_name =object_get_canonical_path_component (OBJECT (cpu));g_string_printf (rs,"%s %s [%s]" , cpu_model, cpu_name, cpu->halted ?"halted " :"running" );
hw/arm/xlnx-zynqmp.c +2 -4
@@ -190,7 +190,7 @@ static void xlnx_zynqmp_create_rpu(MachineState *ms, XlnxZynqMPState *s,qdev_prop_set_uint32 (DEVICE (&s->rpu_cluster),"cluster-id" ,1 );for (i =0 ; i < num_rpus; i++) { -char *name; +const char *name; object_initialize_child(OBJECT(&s->rpu_cluster), "rpu-cpu[*]", &s->rpu_cpu[i],
@@ -204,7 +204,6 @@ static void xlnx_zynqmp_create_rpu(MachineState *ms, XlnxZynqMPState *s, }else { s->boot_cpu_ptr = &s->rpu_cpu[i]; } -g_free (name);object_property_set_bool (OBJECT (&s->rpu_cpu[i]),"reset-hivecs" , true, &error_abort);
@@ -341,7 +340,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)/* Realize APUs before realizing the GIC. KVM requires this. */ for (i =0 ; i < num_apus; i++) { -char *name; +const char *name;object_property_set_int (OBJECT (&s->apu_cpu[i]),"psci-conduit" ,QEMU_PSCI_CONDUIT_SMC , &error_abort);
@@ -354,7 +353,6 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) }else { s->boot_cpu_ptr = &s->apu_cpu[i]; } -g_free (name);object_property_set_bool (OBJECT (&s->apu_cpu[i]),"has_el3" , s->secure,NULL );
hw/block/nvme.c +2 -3
@@ -1397,9 +1397,8 @@ static void nvme_check_constraints(NvmeCtrl *n, Error **errp)if (!n->params.cmb_size_mb && n->pmrdev) {if (host_memory_backend_is_mapped (n->pmrdev)) { -char *path =object_get_canonical_path_component (OBJECT (n->pmrdev)); -error_setg (errp,"can't use already busy memdev: %s" , path); -g_free (path); +error_setg (errp,"can't use already busy memdev: %s" , +object_get_canonical_path_component (OBJECT (n->pmrdev)));return ; }
hw/core/machine-qmp-cmds.c +1 -1
@@ -315,7 +315,7 @@ static int query_memdev(Object *obj, void *opaque) m->value =g_malloc0 (sizeof (*m->value)); - m->value->id =object_get_canonical_path_component (obj); + m->value->id =g_strdup (object_get_canonical_path_component (obj)); m->value->has_id = !!m->value->id; m->value->size = object_property_get_uint(obj, "size",
hw/core/machine.c +2 -3
@@ -1073,9 +1073,8 @@ MemoryRegion *machine_consume_memdev(MachineState *machine,MemoryRegion *ret =host_memory_backend_get_memory (backend);if (memory_region_is_mapped (ret)) { -char *path =object_get_canonical_path_component (OBJECT (backend)); -error_report ("memory backend %s can't be used multiple times." , path); -g_free (path); +error_report ("memory backend %s can't be used multiple times." , +object_get_canonical_path_component (OBJECT (backend)));exit (EXIT_FAILURE ); }host_memory_backend_set_mapped (backend, true);
hw/mem/nvdimm.c +2 -3
@@ -137,13 +137,12 @@ static void nvdimm_prepare_memory_region(NVDIMMDevice *nvdimm, Error **errp)if (size <= nvdimm->label_size || !pmem_size) {HostMemoryBackend *hostmem = dimm->hostmem; -char *path =object_get_canonical_path_component (OBJECT (hostmem));error_setg (errp,"the size of memdev %s (0x%" PRIx64") is too " "small to contain nvdimm label (0x%" PRIx64") and " "aligned PMEM (0x%" PRIx64")" , - path,memory_region_size (mr), nvdimm->label_size, align); -g_free (path); +object_get_canonical_path_component (OBJECT (hostmem)), +memory_region_size (mr), nvdimm->label_size, align);return ; }
hw/mem/pc-dimm.c +2 -3
@@ -179,9 +179,8 @@ static void pc_dimm_realize(DeviceState *dev, Error **errp)error_setg (errp,"'" PC_DIMM_MEMDEV_PROP "' property is not set" );return ; }else if (host_memory_backend_is_mapped (dimm->hostmem)) { -char *path =object_get_canonical_path_component (OBJECT (dimm->hostmem)); -error_setg (errp,"can't use already busy memdev: %s" , path); -g_free (path); +error_setg (errp,"can't use already busy memdev: %s" , +object_get_canonical_path_component (OBJECT (dimm->hostmem)));return ; } if (((nb_numa_nodes > 0) && (dimm->node >= nb_numa_nodes)) ||
hw/misc/ivshmem.c +2 -3
@@ -1037,9 +1037,8 @@ static void ivshmem_plain_realize(PCIDevice *dev, Error **errp)error_setg (errp,"You must specify a 'memdev'" );return ; }else if (host_memory_backend_is_mapped (s->hostmem)) { -char *path =object_get_canonical_path_component (OBJECT (s->hostmem)); -error_setg (errp,"can't use already busy memdev: %s" , path); -g_free (path); +error_setg (errp,"can't use already busy memdev: %s" , +object_get_canonical_path_component (OBJECT (s->hostmem)));return ; }
hw/ppc/spapr_drc.c +1 -2
@@ -513,7 +513,7 @@ static void realize(DeviceState *d, Error **errp)SpaprDrc *drc =SPAPR_DR_CONNECTOR (d);Object *root_container;gchar *link_name; -char *child_name; +const char *child_name;trace_spapr_drc_realize (spapr_drc_index (drc));/* NOTE: we do this as part of realize/unrealize due to the fact
@@ -529,7 +529,6 @@ static void realize(DeviceState *d, Error **errp)trace_spapr_drc_realize_child (spapr_drc_index (drc), child_name);object_property_add_alias (root_container, link_name, drc->owner, child_name); -g_free (child_name);g_free (link_name);vmstate_register (VMSTATE_IF (drc),spapr_drc_index (drc), &vmstate_spapr_drc, drc);
hw/virtio/virtio-crypto.c +2 -3
@@ -786,9 +786,8 @@ static void virtio_crypto_device_realize(DeviceState *dev, Error **errp)error_setg (errp,"'cryptodev' parameter expects a valid object" );return ; }else if (cryptodev_backend_is_used (vcrypto->cryptodev)) { -char *path =object_get_canonical_path_component (OBJECT (vcrypto->conf.cryptodev)); -error_setg (errp,"can't use already used cryptodev backend: %s" , path); -g_free (path); +error_setg (errp,"can't use already used cryptodev backend: %s" , +object_get_canonical_path_component (OBJECT (vcrypto->conf.cryptodev)));return ; }
hw/virtio/virtio-mem.c +2 -4
@@ -409,11 +409,9 @@ static void virtio_mem_device_realize(DeviceState *dev, Error **errp)error_setg (errp,"'%s' property is not set" ,VIRTIO_MEM_MEMDEV_PROP );return ; }else if (host_memory_backend_is_mapped (vmem->memdev)) { -char *path =object_get_canonical_path_component (OBJECT (vmem->memdev)); -error_setg (errp,"'%s' property specifies a busy memdev: %s" , -VIRTIO_MEM_MEMDEV_PROP , path); -g_free (path); +VIRTIO_MEM_MEMDEV_PROP , +object_get_canonical_path_component (OBJECT (vmem->memdev)));return ; } else if (!memory_region_is_ram(&vmem->memdev->mr) || memory_region_is_rom(&vmem->memdev->mr) ||
hw/virtio/virtio-pmem.c +2 -3
@@ -112,9 +112,8 @@ static void virtio_pmem_realize(DeviceState *dev, Error **errp) }if (host_memory_backend_is_mapped (pmem->memdev)) { -char *path =object_get_canonical_path_component (OBJECT (pmem->memdev)); -error_setg (errp,"can't use already busy memdev: %s" , path); -g_free (path); +error_setg (errp,"can't use already busy memdev: %s" , +object_get_canonical_path_component (OBJECT (pmem->memdev)));return ; }
iothread.c +4 -5
@@ -165,7 +165,7 @@ static void iothread_complete(UserCreatable *obj, Error **errp) {Error *local_error =NULL ;IOThread *iothread =IOTHREAD (obj); -char *name, *thread_name; +char *thread_name; iothread->stopping = false; iothread->running = true;
@@ -195,12 +195,11 @@ static void iothread_complete(UserCreatable *obj, Error **errp)/* This assumes we are called from a thread with useful CPU affinity for us * to inherit. */ - name =object_get_canonical_path_component (OBJECT (obj)); - thread_name =g_strdup_printf ("IO %s" , name); + thread_name =g_strdup_printf ("IO %s" , +object_get_canonical_path_component (OBJECT (obj)));qemu_thread_create (&iothread->thread, thread_name, iothread_run, iothread,QEMU_THREAD_JOINABLE );g_free (thread_name); -g_free (name);/* Wait for initialization to complete */ while (iothread->thread_id ==-1 ) {
@@ -303,7 +302,7 @@ type_init(iothread_register_types)char *iothread_get_id (IOThread *iothread) { -return object_get_canonical_path_component (OBJECT (iothread)); +return g_strdup (object_get_canonical_path_component (OBJECT (iothread))); }AioContext *iothread_get_aio_context (IOThread *iothread)
net/net.c +2 -4
@@ -1185,12 +1185,10 @@ void print_net_client(Monitor *mon, NetClientState *nc)monitor_printf (mon,"filters:\n" ); } QTAILQ_FOREACH(nf, &nc->filters, next) { -char *path =object_get_canonical_path_component (OBJECT (nf)); - -monitor_printf (mon," - %s: type=%s" , path, +monitor_printf (mon," - %s: type=%s" , +object_get_canonical_path_component (OBJECT (nf)),object_get_typename (OBJECT (nf)));netfilter_print_info (mon, nf); -g_free (path); } }
qom/object.c +3 -4
@@ -1931,7 +1931,7 @@ object_property_add_const_link(Object *obj, const char *name, NULL, OBJ_PROP_LINK_DIRECT); } -char *object_get_canonical_path_component (const Object *obj) +const char *object_get_canonical_path_component (const Object *obj) {ObjectProperty *prop =NULL ;GHashTableIter iter;
@@ -1947,7 +1947,7 @@ char *object_get_canonical_path_component(const Object *obj) }if (prop->opaque == obj) { -return g_strdup (prop->name); +return prop->name; } }
@@ -1966,7 +1966,7 @@ char *object_get_canonical_path(const Object *obj) } do { - char *component = object_get_canonical_path_component(obj); + const char *component = object_get_canonical_path_component(obj); if (!component) { /* A canonical path must be complete, so discard what was
@@ -1978,7 +1978,6 @@ char *object_get_canonical_path(const Object *obj) newpath =g_strdup_printf ("/%s%s" , component, path ? path :"" );g_free (path); -g_free (component); path = newpath; obj = obj->parent; }while (obj != root);
qom/qom-hmp-cmds.c +4 -7
@@ -96,10 +96,8 @@ static void print_qom_composition(Monitor *mon, Object *obj, int indent);static int qom_composition_compare (const void *a,const void *b,void *ignore) { - g_autofree char *ac = object_get_canonical_path_component(a); - g_autofree char *bc = object_get_canonical_path_component(b); - -return g_strcmp0 (ac, bc); +return g_strcmp0 (object_get_canonical_path_component (a), +object_get_canonical_path_component (b)); }static int insert_qom_composition_child (Object *obj,void *opaque)
@@ -112,18 +110,17 @@ static int insert_qom_composition_child(Object *obj, void *opaque)static void print_qom_composition (Monitor *mon,Object *obj,int indent) { -char *name; +const char *name;GQueue children;Object *child;if (obj ==object_get_root ()) { - name =g_strdup ("" ); + name ="" ; }else { name =object_get_canonical_path_component (obj); }monitor_printf (mon,"%*s/%s (%s)\n" , indent,"" , name,object_get_typename (obj)); -g_free (name);g_queue_init (&children);object_child_foreach (obj, insert_qom_composition_child, &children);
scsi/pr-manager-helper.c +1 -2
@@ -42,11 +42,10 @@ typedef struct PRManagerHelper {static void pr_manager_send_status_changed_event (PRManagerHelper *pr_mgr) { -char *id =object_get_canonical_path_component (OBJECT (pr_mgr)); +const char *id =object_get_canonical_path_component (OBJECT (pr_mgr));if (id) {qapi_event_send_pr_manager_status_changed (id, !!pr_mgr->ioc); -g_free (id); } }
scsi/pr-manager.c +1 -1
@@ -128,7 +128,7 @@ static int query_one_pr_manager(Object *object, void *opaque) elem =g_new0 (PRManagerInfoList,1 ); info =g_new0 (PRManagerInfo,1 ); - info->id =object_get_canonical_path_component (object); + info->id =g_strdup (object_get_canonical_path_component (object)); info->connected =pr_manager_is_connected (pr_mgr); elem->value = info; elem->next =NULL ;
softmmu/memory.c +1 -1
@@ -1764,7 +1764,7 @@ const char *memory_region_name(const MemoryRegion *mr) {if (!mr->name) { ((MemoryRegion *)mr)->name = -object_get_canonical_path_component (OBJECT (mr)); +g_strdup (object_get_canonical_path_component (OBJECT (mr))); }return mr->name; }
hw/ppc/trace-events +1 -1
@@ -57,7 +57,7 @@ spapr_drc_detach(uint32_t index) "drc: 0x%"PRIx32 spapr_drc_awaiting_quiesce(uint32_t index) "drc: 0x%"PRIx32 spapr_drc_reset(uint32_t index) "drc: 0x%"PRIx32 spapr_drc_realize(uint32_t index) "drc: 0x%"PRIx32 -spapr_drc_realize_child(uint32_t index, char *childname) "drc: 0x%"PRIx32", child name: %s" +spapr_drc_realize_child(uint32_t index, const char *childname) "drc: 0x%"PRIx32", child name: %s" spapr_drc_realize_complete(uint32_t index) "drc: 0x%"PRIx32 spapr_drc_unrealize(uint32_t index) "drc: 0x%"PRIx32
Signature · 1 line
2.26.2
Re: [PATCH for-5.1 3/5] qom: Change object_get_canonical_path_component() not to malloc
Quoted 8 lines · Markus Armbruster
object_get_canonical_path_component()returns a malloced copy of a property name on success, null on failure.19 of its 25 callers immediately free the returned copy.
Change
object_get_canonical_path_component()to return the property name directly. Since modifying the name would be wrong, adjust the return type to const char *.
Yeah!
Quoted 30 lines
Drop the free from the 19 callers become simpler, add the
g_strdup()to the other six.Signed-off-by Markus Armbruster <[email protected]>--- include/qom/object.h | 2 +- backends/hostmem.c | 2 +- block/throttle-groups.c | 2 +- gdbstub.c | 2 +- hw/arm/xlnx-zynqmp.c | 6 ++---- hw/block/nvme.c | 5 ++--- hw/core/machine-qmp-cmds.c | 2 +- hw/core/machine.c | 5 ++--- hw/mem/nvdimm.c | 5 ++--- hw/mem/pc-dimm.c | 5 ++--- hw/misc/ivshmem.c | 5 ++--- hw/ppc/spapr_drc.c | 3 +-- hw/virtio/virtio-crypto.c | 5 ++--- hw/virtio/virtio-mem.c | 6 ++---- hw/virtio/virtio-pmem.c | 5 ++--- iothread.c | 9 ++++----- net/net.c | 6 ++---- qom/object.c | 7 +++---- qom/qom-hmp-cmds.c | 11 ++++------- scsi/pr-manager-helper.c | 3 +-- scsi/pr-manager.c | 2 +- softmmu/memory.c | 2 +- hw/ppc/trace-events | 2 +- 23 files changed, 41 insertions(+), 61 deletions(-)
...
iothread.c type_init(iothread_register_types) · line 306
Quoted 7 lines
iothread.c +1
-1@@ -303,7 +302,7 @@ type_init(iothread_register_types)char *iothread_get_id (IOThread *iothread) { -return object_get_canonical_path_component (OBJECT (iothread)); +return g_strdup (object_get_canonical_path_component (OBJECT (iothread))); }
(Note for later, this one can return const).
Re: [PATCH for-5.1 3/5] qom: Change object_get_canonical_path_component() not to malloc
In reply to Markus ArmbrusterQuoted 6 lines · Markus Armbruster <[email protected]> 于2020年7月15日周三 上午12:08写道:
object_get_canonical_path_component()returns a malloced copy of a property name on success, null on failure.19 of its 25 callers immediately free the returned copy.
Quoted 8 lines
Change
object_get_canonical_path_component()to return the property name directly. Since modifying the name would be wrong, adjust the return type to const char *.Drop the free from the 19 callers become simpler, add the
g_strdup()to the other six.Signed-off-by Markus Armbruster <[email protected]>
Yes, I have seen more than once memory leak caused by this function.
Quoted 477 lines
--- include/qom/object.h | 2 +- backends/hostmem.c | 2 +- block/throttle-groups.c | 2 +- gdbstub.c | 2 +- hw/arm/xlnx-zynqmp.c | 6 ++---- hw/block/nvme.c | 5 ++--- hw/core/machine-qmp-cmds.c | 2 +- hw/core/machine.c | 5 ++--- hw/mem/nvdimm.c | 5 ++--- hw/mem/pc-dimm.c | 5 ++--- hw/misc/ivshmem.c | 5 ++--- hw/ppc/spapr_drc.c | 3 +-- hw/virtio/virtio-crypto.c | 5 ++--- hw/virtio/virtio-mem.c | 6 ++---- hw/virtio/virtio-pmem.c | 5 ++--- iothread.c | 9 ++++----- net/net.c | 6 ++---- qom/object.c | 7 +++---- qom/qom-hmp-cmds.c | 11 ++++------- scsi/pr-manager-helper.c | 3 +-- scsi/pr-manager.c | 2 +- softmmu/memory.c | 2 +- hw/ppc/trace-events | 2 +- 23 files changed, 41 insertions(+), 61 deletions(-)include/qom/object.h +1
-1@@ -1462,7 +1462,7 @@ Object *object_get_internal_root(void);* path is the path within the composition tree starting from the root. * %NULL if the object doesn't have a parent (and thus a canonical path). */ -char *object_get_canonical_path_component (const Object *obj); +const char *object_get_canonical_path_component (const Object *obj);/** * object_get_canonical_path: backends/hostmem.c +1
-1@@ -33,7 +33,7 @@ char * host_memory_backend_get_name(HostMemoryBackend *backend) {if (!backend->use_canonical_path) { -return object_get_canonical_path_component (OBJECT (backend)); +return g_strdup (object_get_canonical_path_component (OBJECT (backend))); }return object_get_canonical_path (OBJECT (backend));block/throttle-groups.c +1
-1@@ -771,7 +771,7 @@ static void throttle_group_obj_complete(UserCreatable *obj, Error **errp)/* set group name to object id if it exists */ if (!tg->name && tg->parent_obj.parent) { - tg->name =object_get_canonical_path_component (OBJECT (obj)); + tg->name =g_strdup (object_get_canonical_path_component (OBJECT (obj))); }/* We must have a group name at this point */ assert (tg->name);gdbstub.c +1
-1@@ -2059,7 +2059,7 @@ static void handle_query_thread_extra(GdbCmdContext *gdb_ctx, void *user_ctx)/* Print the CPU model and name in multiprocess mode */ ObjectClass *oc =object_get_class (OBJECT (cpu));const char *cpu_model =object_class_get_name (oc); - g_autofree char *cpu_name = +const char *cpu_name =object_get_canonical_path_component (OBJECT (cpu));g_string_printf (rs,"%s %s [%s]" , cpu_model, cpu_name, cpu->halted ?"halted " :"running" );hw/arm/xlnx-zynqmp.c +2
-4@@ -190,7 +190,7 @@ static void xlnx_zynqmp_create_rpu(MachineState *ms, XlnxZynqMPState *s,qdev_prop_set_uint32 (DEVICE (&s->rpu_cluster),"cluster-id" ,1 );for (i =0 ; i < num_rpus; i++) { -char *name; +const char *name; object_initialize_child(OBJECT(&s->rpu_cluster), "rpu-cpu[*]", &s->rpu_cpu[i],@@ -204,7 +204,6 @@ static void xlnx_zynqmp_create_rpu(MachineState *ms, XlnxZynqMPState *s, }else { s->boot_cpu_ptr = &s->rpu_cpu[i]; } -g_free (name);object_property_set_bool (OBJECT (&s->rpu_cpu[i]),"reset-hivecs" , true, &error_abort);@@ -341,7 +340,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)/* Realize APUs before realizing the GIC. KVM requires this. */ for (i =0 ; i < num_apus; i++) { -char *name; +const char *name;object_property_set_int (OBJECT (&s->apu_cpu[i]),"psci-conduit" ,QEMU_PSCI_CONDUIT_SMC , &error_abort);@@ -354,7 +353,6 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) }else { s->boot_cpu_ptr = &s->apu_cpu[i]; } -g_free (name);object_property_set_bool (OBJECT (&s->apu_cpu[i]),"has_el3" , s->secure,NULL );hw/block/nvme.c +2
-3@@ -1397,9 +1397,8 @@ static void nvme_check_constraints(NvmeCtrl *n, Error **errp)if (!n->params.cmb_size_mb && n->pmrdev) {if (host_memory_backend_is_mapped (n->pmrdev)) { -char *path =object_get_canonical_path_component (OBJECT (n->pmrdev)); -error_setg (errp,"can't use already busy memdev: %s" , path); -g_free (path); +error_setg (errp,"can't use already busy memdev: %s" , +object_get_canonical_path_component (OBJECT (n->pmrdev)));return ; }hw/core/machine-qmp-cmds.c +1
-1@@ -315,7 +315,7 @@ static int query_memdev(Object *obj, void *opaque) m->value =g_malloc0 (sizeof (*m->value)); - m->value->id =object_get_canonical_path_component (obj); + m->value->id =g_strdup (object_get_canonical_path_component (obj)); m->value->has_id = !!m->value->id; m->value->size = object_property_get_uint(obj, "size",hw/core/machine.c +2
-3@@ -1073,9 +1073,8 @@ MemoryRegion *machine_consume_memdev(MachineState *machine,MemoryRegion *ret =host_memory_backend_get_memory (backend);if (memory_region_is_mapped (ret)) { -char *path =object_get_canonical_path_component (OBJECT (backend)); -error_report ("memory backend %s can't be used multiple times." , path); -g_free (path); +error_report ("memory backend %s can't be used multiple times." , +object_get_canonical_path_component (OBJECT (backend)));exit (EXIT_FAILURE ); }host_memory_backend_set_mapped (backend, true);hw/mem/nvdimm.c +2
-3@@ -137,13 +137,12 @@ static void nvdimm_prepare_memory_region(NVDIMMDevice *nvdimm, Error **errp)if (size <= nvdimm->label_size || !pmem_size) {HostMemoryBackend *hostmem = dimm->hostmem; -char *path =object_get_canonical_path_component (OBJECT (hostmem));error_setg (errp,"the size of memdev %s (0x%" PRIx64") is too " "small to contain nvdimm label (0x%" PRIx64") and " "aligned PMEM (0x%" PRIx64")" , - path,memory_region_size (mr), nvdimm->label_size, align); -g_free (path); +object_get_canonical_path_component (OBJECT (hostmem)), +memory_region_size (mr), nvdimm->label_size, align);return ; }hw/mem/pc-dimm.c +2
-3@@ -179,9 +179,8 @@ static void pc_dimm_realize(DeviceState *dev, Error **errp)error_setg (errp,"'" PC_DIMM_MEMDEV_PROP "' property is not set" );return ; }else if (host_memory_backend_is_mapped (dimm->hostmem)) { -char *path =object_get_canonical_path_component (OBJECT (dimm->hostmem)); -error_setg (errp,"can't use already busy memdev: %s" , path); -g_free (path); +error_setg (errp,"can't use already busy memdev: %s" , +object_get_canonical_path_component (OBJECT (dimm->hostmem)));return ; } if (((nb_numa_nodes > 0) && (dimm->node >= nb_numa_nodes)) ||hw/misc/ivshmem.c +2
-3@@ -1037,9 +1037,8 @@ static void ivshmem_plain_realize(PCIDevice *dev, Error **errp)error_setg (errp,"You must specify a 'memdev'" );return ; }else if (host_memory_backend_is_mapped (s->hostmem)) { -char *path =object_get_canonical_path_component (OBJECT (s->hostmem)); -error_setg (errp,"can't use already busy memdev: %s" , path); -g_free (path); +error_setg (errp,"can't use already busy memdev: %s" , +object_get_canonical_path_component (OBJECT (s->hostmem)));return ; }hw/ppc/spapr_drc.c +1
-2@@ -513,7 +513,7 @@ static void realize(DeviceState *d, Error **errp)SpaprDrc *drc =SPAPR_DR_CONNECTOR (d);Object *root_container;gchar *link_name; -char *child_name; +const char *child_name;trace_spapr_drc_realize (spapr_drc_index (drc));/* NOTE: we do this as part of realize/unrealize due to the fact @@ -529,7 +529,6 @@ static void realize(DeviceState *d, Error **errp)trace_spapr_drc_realize_child (spapr_drc_index (drc), child_name);object_property_add_alias (root_container, link_name, drc->owner, child_name); -g_free (child_name);g_free (link_name);vmstate_register (VMSTATE_IF (drc),spapr_drc_index (drc), &vmstate_spapr_drc, drc);hw/virtio/virtio-crypto.c +2
-3@@ -786,9 +786,8 @@ static void virtio_crypto_device_realize(DeviceState *dev, Error **errp)error_setg (errp,"'cryptodev' parameter expects a valid object" );return ; }else if (cryptodev_backend_is_used (vcrypto->cryptodev)) { -char *path =object_get_canonical_path_component (OBJECT (vcrypto->conf.cryptodev)); -error_setg (errp,"can't use already used cryptodev backend: %s" , path); -g_free (path); +error_setg (errp,"can't use already used cryptodev backend: %s" , +object_get_canonical_path_component (OBJECT (vcrypto->conf.cryptodev)));return ; }hw/virtio/virtio-mem.c +2
-4@@ -409,11 +409,9 @@ static void virtio_mem_device_realize(DeviceState *dev, Error **errp)error_setg (errp,"'%s' property is not set" ,VIRTIO_MEM_MEMDEV_PROP );return ; }else if (host_memory_backend_is_mapped (vmem->memdev)) { -char *path =object_get_canonical_path_component (OBJECT (vmem->memdev)); -error_setg (errp,"'%s' property specifies a busy memdev: %s" , -VIRTIO_MEM_MEMDEV_PROP , path); -g_free (path); +VIRTIO_MEM_MEMDEV_PROP , +object_get_canonical_path_component (OBJECT (vmem->memdev)));return ; } else if (!memory_region_is_ram(&vmem->memdev->mr) || memory_region_is_rom(&vmem->memdev->mr) ||hw/virtio/virtio-pmem.c +2
-3@@ -112,9 +112,8 @@ static void virtio_pmem_realize(DeviceState *dev, Error **errp) }if (host_memory_backend_is_mapped (pmem->memdev)) { -char *path =object_get_canonical_path_component (OBJECT (pmem->memdev)); -error_setg (errp,"can't use already busy memdev: %s" , path); -g_free (path); +error_setg (errp,"can't use already busy memdev: %s" , +object_get_canonical_path_component (OBJECT (pmem->memdev)));return ; }iothread.c +4
-5@@ -165,7 +165,7 @@ static void iothread_complete(UserCreatable *obj, Error **errp) {Error *local_error =NULL ;IOThread *iothread =IOTHREAD (obj); -char *name, *thread_name; +char *thread_name; iothread->stopping = false; iothread->running = true;@@ -195,12 +195,11 @@ static void iothread_complete(UserCreatable *obj, Error **errp)/* This assumes we are called from a thread with useful CPU affinity for us * to inherit. */ - name =object_get_canonical_path_component (OBJECT (obj)); - thread_name =g_strdup_printf ("IO %s" , name); + thread_name =g_strdup_printf ("IO %s" , +object_get_canonical_path_component (OBJECT (obj)));qemu_thread_create (&iothread->thread, thread_name, iothread_run, iothread,QEMU_THREAD_JOINABLE );g_free (thread_name); -g_free (name);/* Wait for initialization to complete */ while (iothread->thread_id ==-1 ) {@@ -303,7 +302,7 @@ type_init(iothread_register_types)char *iothread_get_id (IOThread *iothread) { -return object_get_canonical_path_component (OBJECT (iothread)); +return g_strdup (object_get_canonical_path_component (OBJECT (iothread))); }AioContext *iothread_get_aio_context (IOThread *iothread)net/net.c +2
-4@@ -1185,12 +1185,10 @@ void print_net_client(Monitor *mon, NetClientState *nc)monitor_printf (mon,"filters:\n" ); } QTAILQ_FOREACH(nf, &nc->filters, next) { -char *path =object_get_canonical_path_component (OBJECT (nf)); - -monitor_printf (mon," - %s: type=%s" , path, +monitor_printf (mon," - %s: type=%s" , +object_get_canonical_path_component (OBJECT (nf)),object_get_typename (OBJECT (nf)));netfilter_print_info (mon, nf); -g_free (path); } }qom/object.c +3
-4@@ -1931,7 +1931,7 @@ object_property_add_const_link(Object *obj, const char *name, NULL, OBJ_PROP_LINK_DIRECT); } -char *object_get_canonical_path_component (const Object *obj) +const char *object_get_canonical_path_component (const Object *obj) {ObjectProperty *prop =NULL ;GHashTableIter iter;@@ -1947,7 +1947,7 @@ char *object_get_canonical_path_component(const Object *obj) }if (prop->opaque == obj) { -return g_strdup (prop->name); +return prop->name; } }@@ -1966,7 +1966,7 @@ char *object_get_canonical_path(const Object *obj) } do { - char *component = object_get_canonical_path_component(obj); + const char *component = object_get_canonical_path_component(obj); if (!component) { /* A canonical path must be complete, so discard what was@@ -1978,7 +1978,6 @@ char *object_get_canonical_path(const Object *obj) newpath =g_strdup_printf ("/%s%s" , component, path ? path :"" );g_free (path); -g_free (component); path = newpath; obj = obj->parent; }while (obj != root);qom/qom-hmp-cmds.c +4
-7@@ -96,10 +96,8 @@ static void print_qom_composition(Monitor *mon, Object *obj, int indent);static int qom_composition_compare (const void *a,const void *b,void *ignore) { - g_autofree char *ac = object_get_canonical_path_component(a); - g_autofree char *bc = object_get_canonical_path_component(b); - -return g_strcmp0 (ac, bc); +return g_strcmp0 (object_get_canonical_path_component (a), +object_get_canonical_path_component (b)); }static int insert_qom_composition_child (Object *obj,void *opaque)@@ -112,18 +110,17 @@ static int insert_qom_composition_child(Object *obj, void *opaque)static void print_qom_composition (Monitor *mon,Object *obj,int indent) { -char *name; +const char *name;GQueue children;Object *child;if (obj ==object_get_root ()) { - name =g_strdup ("" ); + name ="" ; }else { name =object_get_canonical_path_component (obj); }monitor_printf (mon,"%*s/%s (%s)\n" , indent,"" , name,object_get_typename (obj)); -g_free (name);g_queue_init (&children);object_child_foreach (obj, insert_qom_composition_child, &children);scsi/pr-manager-helper.c +1
-2@@ -42,11 +42,10 @@ typedef struct PRManagerHelper {static void pr_manager_send_status_changed_event (PRManagerHelper *pr_mgr) { -char *id =object_get_canonical_path_component (OBJECT (pr_mgr)); +const char *id =object_get_canonical_path_component (OBJECT (pr_mgr));if (id) {qapi_event_send_pr_manager_status_changed (id, !!pr_mgr->ioc); -g_free (id); } }scsi/pr-manager.c +1
-1@@ -128,7 +128,7 @@ static int query_one_pr_manager(Object *object, void *opaque) elem =g_new0 (PRManagerInfoList,1 ); info =g_new0 (PRManagerInfo,1 ); - info->id =object_get_canonical_path_component (object); + info->id =g_strdup (object_get_canonical_path_component (object)); info->connected =pr_manager_is_connected (pr_mgr); elem->value = info; elem->next =NULL ;softmmu/memory.c +1
-1@@ -1764,7 +1764,7 @@ const char *memory_region_name(const MemoryRegion *mr) {if (!mr->name) { ((MemoryRegion *)mr)->name = -object_get_canonical_path_component (OBJECT (mr)); +g_strdup (object_get_canonical_path_component (OBJECT (mr))); }return mr->name; }hw/ppc/trace-events +1
-2@@ -57,7 +57,7 @@ spapr_drc_detach(uint32_t index) "drc: 0x%"PRIx32 spapr_drc_awaiting_quiesce(uint32_t index) "drc: 0x%"PRIx32 spapr_drc_reset(uint32_t index) "drc: 0x%"PRIx32 spapr_drc_realize(uint32_t index) "drc: 0x%"PRIx32 -spapr_drc_realize_child(uint32_t index, char *childname) "drc: 0x%"PRIx32", child name: %s" +spapr_drc_realize_child(uint32_t index, const char *childname) "drc: 0x%"PRIx32", child name: %s" spapr_drc_realize_complete(uint32_t index) "drc: 0x%"PRIx32 spapr_drc_unrealize(uint32_t index) "drc: 0x%"PRIx32 --2.26.2
PATCH 4/5 qom: Document object_get_canonical_path() returns malloced string
In reply to Markus Armbruster--- include/qom/object.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
include/qom/object.h +3 -2
@@ -1467,8 +1467,9 @@ const char *object_get_canonical_path_component(const Object *obj);/** * object_get_canonical_path: * -* Returns: The canonical path for a object. This is the path within the -* composition tree starting from the root. +* Returns: The canonical path for a object, newly allocated. This is +* the path within the composition tree starting from the root. Use +* g_free() to free it. */ char *object_get_canonical_path (const Object *obj);
Signature · 1 line
2.26.2
Re: [PATCH for-5.1 4/5] qom: Document object_get_canonical_path() returns malloced string
Quoted 11 lines · Markus Armbruster
Signed-off-by Markus Armbruster <[email protected]>--- include/qom/object.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)include/qom/object.h +0
-0@@ -1467,8 +1467,9 @@ const char *object_get_canonical_path_component(const Object *obj);/**
include/qom/object.h const char *object_get_canonical_path_component(const Object *obj); · line 1475
Quoted 10 lines
include/qom/object.h +3
-2* object_get_canonical_path: * -* Returns: The canonical path for a object. This is the path within the -* composition tree starting from the root. +* Returns: The canonical path for a object, newly allocated. This is +* the path within the composition tree starting from the root. Use +* g_free() to free it. */ char *object_get_canonical_path (const Object *obj);
PATCH 5/5 qom: Make info qom-tree sort children more efficiently
In reply to Markus ArmbrusterCommit e8c9e65816 "qom: Make "info qom-tree" show children sorted" sorts children the simple, stupid, quadratic way. I thought the number of children would be small enough for this not to matter. I was wrong: there are outliers with several hundred children, e.g ARM machines nuri and smdkc210 each have a node with 513 children.
While n^2 sorting isn't noticeable in normal, human usage even for n=513, it can be quite noticeable in certain automated tests. In particular, the sort made device-introspect-test even slower. Commit 3e7b80f84d "tests: improve performance of device-introspect-test" just fixed that by cutting back its excessive use of "info qom-tree". Sorting more efficiently makes sense regardless, so do it.
--- qom/qom-hmp-cmds.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
qom/qom-hmp-cmds.c +13 -12
@@ -94,25 +94,23 @@ typedef struct QOMCompositionState {static void print_qom_composition (Monitor *mon,Object *obj,int indent); -static int qom_composition_compare (const void *a,const void *b,void *ignore) +static int qom_composition_compare (const void *a,const void *b) { -return g_strcmp0 (object_get_canonical_path_component (a), -object_get_canonical_path_component (b)); +return g_strcmp0 (object_get_canonical_path_component (*(Object **)a), +object_get_canonical_path_component (*(Object **)b)); }static int insert_qom_composition_child (Object *obj,void *opaque) { -GQueue *children = opaque; - -g_queue_insert_sorted (children, obj, qom_composition_compare,NULL ); +g_array_append_val (opaque, obj);return 0 ; }static void print_qom_composition (Monitor *mon,Object *obj,int indent) { +GArray *children =g_array_new (false, false,sizeof (Object *));const char *name; -GQueue children; -Object *child; +int i;if (obj ==object_get_root ()) { name ="" ;
@@ -122,11 +120,14 @@ static void print_qom_composition(Monitor *mon, Object *obj, int indent)monitor_printf (mon,"%*s/%s (%s)\n" , indent,"" , name,object_get_typename (obj)); -g_queue_init (&children); -object_child_foreach (obj, insert_qom_composition_child, &children); -while ((child =g_queue_pop_head (&children))) { -print_qom_composition (mon, child, indent +2 ); +object_child_foreach (obj, insert_qom_composition_child, children); +g_array_sort (children, qom_composition_compare); + +for (i =0 ; i < children->len; i++) { + print_qom_composition(mon, g_array_index(children, Object *, i), + indent +2 ); } +g_array_free (children, TRUE); }void hmp_info_qom_tree (Monitor *mon,const QDict *dict)
Signature · 1 line
2.26.2
Re: [PATCH for-5.1 5/5] qom: Make info qom-tree sort children more efficiently
Quoted 5 lines · * Markus Armbruster ([email protected]) wrote:
Commit
e8c9e65816"qom: Make "info qom-tree" show children sorted" sorts children the simple, stupid, quadratic way. I thought the number of children would be small enough for this not to matter. I was wrong: there are outliers with several hundred children, e.g ARM machines nuri and smdkc210 each have a node with 513 children.
Big Power systems can have thousands.
Quoted 54 lines
While n^2 sorting isn't noticeable in normal, human usage even for n=513, it can be quite noticeable in certain automated tests. In particular, the sort made device-introspect-test even slower. Commit
3e7b80f84d"tests: improve performance of device-introspect-test" just fixed that by cutting back its excessive use of "info qom-tree". Sorting more efficiently makes sense regardless, so do it.Signed-off-by Markus Armbruster <[email protected]>--- qom/qom-hmp-cmds.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)qom/qom-hmp-cmds.c +6
-10@@ -94,25 +94,23 @@ typedef struct QOMCompositionState {static void print_qom_composition (Monitor *mon,Object *obj,int indent); -static int qom_composition_compare (const void *a,const void *b,void *ignore) +static int qom_composition_compare (const void *a,const void *b) { -return g_strcmp0 (object_get_canonical_path_component (a), -object_get_canonical_path_component (b)); +return g_strcmp0 (object_get_canonical_path_component (*(Object **)a), +object_get_canonical_path_component (*(Object **)b)); }static int insert_qom_composition_child (Object *obj,void *opaque) { -GQueue *children = opaque; - -g_queue_insert_sorted (children, obj, qom_composition_compare,NULL ); +g_array_append_val (opaque, obj);return 0 ; }static void print_qom_composition (Monitor *mon,Object *obj,int indent) { +GArray *children =g_array_new (false, false,sizeof (Object *));const char *name; -GQueue children; -Object *child; +int i;if (obj ==object_get_root ()) { name ="" ;@@ -122,11 +120,14 @@ static void print_qom_composition(Monitor *mon, Object *obj, int indent)monitor_printf (mon,"%*s/%s (%s)\n" , indent,"" , name,object_get_typename (obj)); -g_queue_init (&children); -object_child_foreach (obj, insert_qom_composition_child, &children);
qom/qom-hmp-cmds.c static void print_qom_composition(Monitor *mon, Object *obj, int indent) · line 130
Quoted 10 lines
qom/qom-hmp-cmds.c +7
-2-while ((child =g_queue_pop_head (&children))) { -print_qom_composition (mon, child, indent +2 ); +object_child_foreach (obj, insert_qom_composition_child, children); +g_array_sort (children, qom_composition_compare); + +for (i =0 ; i < children->len; i++) { + print_qom_composition(mon, g_array_index(children, Object *, i), + indent +2 ); } +g_array_free (children, TRUE);
So I think that's OK, so :
Can you just convince me that 'TRUE' in the array_free?
Dave
Quoted 7 lines
qom/qom-hmp-cmds.c +0
-0}void hmp_info_qom_tree (Monitor *mon,const QDict *dict)Signature · 1 line
2.26.2
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [PATCH for-5.1 5/5] qom: Make info qom-tree sort children more efficiently
Quoted 76 lines · Dr. David Alan Gilbert
Quoted 5 lines · * Markus Armbruster ([email protected]) wrote:
Commit
e8c9e65816"qom: Make "info qom-tree" show children sorted" sorts children the simple, stupid, quadratic way. I thought the number of children would be small enough for this not to matter. I was wrong: there are outliers with several hundred children, e.g ARM machines nuri and smdkc210 each have a node with 513 children.Big Power systems can have thousands.
Quoted 54 lines
While n^2 sorting isn't noticeable in normal, human usage even for n=513, it can be quite noticeable in certain automated tests. In particular, the sort made device-introspect-test even slower. Commit
3e7b80f84d"tests: improve performance of device-introspect-test" just fixed that by cutting back its excessive use of "info qom-tree". Sorting more efficiently makes sense regardless, so do it.Signed-off-by Markus Armbruster <[email protected]>--- qom/qom-hmp-cmds.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)qom/qom-hmp-cmds.c +6
-10@@ -94,25 +94,23 @@ typedef struct QOMCompositionState {static void print_qom_composition (Monitor *mon,Object *obj,int indent); -static int qom_composition_compare (const void *a,const void *b,void *ignore) +static int qom_composition_compare (const void *a,const void *b) { -return g_strcmp0 (object_get_canonical_path_component (a), -object_get_canonical_path_component (b)); +return g_strcmp0 (object_get_canonical_path_component (*(Object **)a), +object_get_canonical_path_component (*(Object **)b)); }static int insert_qom_composition_child (Object *obj,void *opaque) { -GQueue *children = opaque; - -g_queue_insert_sorted (children, obj, qom_composition_compare,NULL ); +g_array_append_val (opaque, obj);return 0 ; }static void print_qom_composition (Monitor *mon,Object *obj,int indent) { +GArray *children =g_array_new (false, false,sizeof (Object *));const char *name; -GQueue children; -Object *child; +int i;if (obj ==object_get_root ()) { name ="" ;@@ -122,11 +120,14 @@ static void print_qom_composition(Monitor *mon, Object *obj, int indent)monitor_printf (mon,"%*s/%s (%s)\n" , indent,"" , name,object_get_typename (obj)); -g_queue_init (&children); -object_child_foreach (obj, insert_qom_composition_child, &children);qom/qom-hmp-cmds.c static void print_qom_composition(Monitor *mon, Object *obj, int indent) · line 130
Quoted 10 lines
qom/qom-hmp-cmds.c +7
-2-while ((child =g_queue_pop_head (&children))) { -print_qom_composition (mon, child, indent +2 ); +object_child_foreach (obj, insert_qom_composition_child, children); +g_array_sort (children, qom_composition_compare); + +for (i =0 ; i < children->len; i++) { + print_qom_composition(mon, g_array_index(children, Object *, i), + indent +2 ); } +g_array_free (children, TRUE);So I think that's OK, so :
Quoted 3 lines
Reviewed-by Dr. David Alan Gilbert <[email protected]>Can you just convince me that 'TRUE' in the
array_free?
g_array_free(children, TRUE) frees both children and children->data. It returns null. This is what we want here.
g_array_free(children, FALSE) frees only children, and returns children->data. Occasionally useful.
https://developer.gnome.org/glib/2.62/glib-Arrays.html#g-array-free
I definitely would have made this two separate functions.
Thanks!