qdict_flatten() fixes
cover qdict_flatten() fixes
Kevin Wolf (2):
qdict: Fix memory leak in qdict_do_flatten()
qdict: Optimise qdict_do_flatten()
qobject/qdict.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
Signature · 1 line
1.8.1.4
PATCH 1/2 qdict: Fix memory leak in qdict_do_flatten()
--- qobject/qdict.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
qobject/qdict.c +3 -1
@@ -481,7 +481,7 @@ static void qdict_do_flatten(QDict *qdict, QDict *target, const char *prefix) {QObject *value;const QDictEntry *entry, *next; -const char *new_key; +char *new_key;bool delete; entry =qdict_first (qdict);
@@ -506,6 +506,8 @@ static void qdict_do_flatten(QDict *qdict, QDict *target, const char *prefix) delete = true; } +g_free (new_key); +if (delete) {qdict_del (qdict, entry->key);
Signature · 1 line
1.8.1.4
PATCH 2/2 qdict: Optimise qdict_do_flatten()
In reply to Kevin WolfNested QDicts used to be both entered recursively in order to move their entries to the target QDict and also be moved themselves to the target QDict like all other objects. This is harmless because for the top level, qdict_do_flatten() will encounter the (now empty) QDict for a second time and then delete it, but at the same time it's obviously unnecessary overhead. Just delete nested QDicts directly after moving all of their entries.
--- qobject/qdict.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
qobject/qdict.c +7 -3
@@ -494,16 +494,20 @@ static void qdict_do_flatten(QDict *qdict, QDict *target, const char *prefix) delete = false;if (prefix) { -qobject_incref (value); new_key =g_strdup_printf ("%s.%s" , prefix, entry->key); -qdict_put_obj (target, new_key, value); - delete = true; }if (qobject_type (value) ==QTYPE_QDICT ) { +/* Entries of QDicts are processed recursively, the QDict object +* itself disappears. */ qdict_do_flatten (qobject_to_qdict (value), target, new_key ? new_key : entry->key); delete = true; + }else if (prefix) { +/* All other objects are moved to the target unchanged. */ +qobject_incref (value); +qdict_put_obj (target, new_key, value); + delete = true; }g_free (new_key);
Signature · 1 line
1.8.1.4
Quoted 7 lines · Kevin Wolf
Kevin Wolf (2):
qdict: Fix memory leak inqdict_do_flatten()
qdict: Optimiseqdict_do_flatten()qobject/qdict.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
Had to look at my earlier review to page-in this stuff. The series looks good to me.
series
Thanks!
Laszlo
Stefan Hajnoczi
AppliedQuoted 6 lines · Kevin Wolf
Kevin Wolf (2):
qdict: Fix memory leak inqdict_do_flatten()
qdict: Optimiseqdict_do_flatten()qobject/qdict.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
Thanks, applied to my block-next tree:
https://github.com/stefanha/qemu/commits/block-next
Stefan