Patchwork [v4,01/10] QObject API: introduce qdict_to_qstring() function

login
register
mail settings
Submitter Miguel Di Ciurcio Filho
Date May 18, 2010, 5:07 p.m.
Message ID <1274202469-9332-2-git-send-email-miguel.filho@gmail.com>
Download mbox | patch
Permalink /patch/52905/
State New
Headers show

Comments

Miguel Di Ciurcio Filho - May 18, 2010, 5:07 p.m.
This is a helper function that converts a QDict to a QString, using
the format:

key1=value1 SEP key2=value2 SEP key3=value3

Handy for debugging and formating the Monitor output.

Signed-off-by: Miguel Di Ciurcio Filho <miguel.filho@gmail.com>
---
 qdict.c |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 qdict.h |    9 +++++++++
 2 files changed, 64 insertions(+), 0 deletions(-)
Luiz Capitulino - May 27, 2010, 5:50 p.m.
On Tue, 18 May 2010 14:07:40 -0300
Miguel Di Ciurcio Filho <miguel.filho@gmail.com> wrote:

> This is a helper function that converts a QDict to a QString, using
> the format:
> 
> key1=value1 SEP key2=value2 SEP key3=value3
> 
> Handy for debugging and formating the Monitor output.
> 
> Signed-off-by: Miguel Di Ciurcio Filho <miguel.filho@gmail.com>

 It's very better now, some comments below.

> ---
>  qdict.c |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  qdict.h |    9 +++++++++
>  2 files changed, 64 insertions(+), 0 deletions(-)
> 
> diff --git a/qdict.c b/qdict.c
> index 175bc17..19c053f 100644
> --- a/qdict.c
> +++ b/qdict.c
> @@ -267,6 +267,61 @@ const char *qdict_get_str(const QDict *qdict, const char *key)
>      return qstring_get_str(qobject_to_qstring(obj));
>  }
>  
> +static void qdict_to_qstring_iter(const char *key, QObject *obj, void *opaque)
> +{
> +    struct qstring_pack *pack = opaque;
> +    qstring_append(pack->str, key);
> +    qstring_append(pack->str, "=");
> +    switch (qobject_type(obj)) {
> +    case QTYPE_QSTRING:
> +        qstring_append(pack->str, qstring_get_str(qobject_to_qstring(obj)));
> +        break;
> +    case QTYPE_QINT:
> +        qstring_append_int(pack->str, qint_get_int(qobject_to_qint(obj)));
> +        break;
> +    case QTYPE_QBOOL:
> +        qstring_append(pack->str, qbool_get_int(qobject_to_qbool(obj)) ? "true" :
> +        "false" );
> +        break;
> +    default:
> +        qstring_append(pack->str, "NULL");
> +    }
> +
> +    pack->qdict_iter_current_key++;
> +
> +    if (pack->qdict_iter_current_key < pack->qdict_iter_total_keys) {
> +        qstring_append(pack->str, pack->separator);
> +    }
> +}
> +
> +/**
> + * qdict_to_qstring(): Format a string with the keys and values of a QDict.
> + *
> + * Nested lists and dicts are not supported, yet.
> + *
> + * Return a pointer to a QString, with the following format:
> + *    key1=value1 SEP key2=value2 SEP key3=value3
> + */
> +QString *qdict_to_qstring(const QDict *qdict, const char *separator)
> +{
> +    struct qstring_pack *pack;
> +    QString *str;
> +    str = qstring_new();
> +
> +    pack = qemu_malloc(sizeof(*pack));

 You can allocate on the stack.

> +    pack->str = str;
> +    pack->qdict_iter_current_key = 0;
> +    pack->qdict_iter_total_keys = qdict_size(qdict);
> +    pack->separator = separator;
> +
> +    qdict_iter(qdict, qdict_to_qstring_iter, pack);
> +
> +    qemu_free(pack);
> +
> +    return str;
> +}
> +
> +
>  /**
>   * qdict_get_try_int(): Try to get integer mapped by 'key'
>   *
> diff --git a/qdict.h b/qdict.h
> index 5e5902c..8a54733 100644
> --- a/qdict.h
> +++ b/qdict.h
> @@ -15,6 +15,7 @@
>  
>  #include "qobject.h"
>  #include "qlist.h"
> +#include "qstring.h"
>  #include "qemu-queue.h"
>  #include <stdint.h>
>  
> @@ -32,6 +33,13 @@ typedef struct QDict {
>      QLIST_HEAD(,QDictEntry) table[QDICT_HASH_SIZE];
>  } QDict;
>  
> +struct qstring_pack {
> +    QString *str;
> +    size_t qdict_iter_total_keys;
> +    size_t qdict_iter_current_key;
> +    const char *separator;
> +};

 The header file should contain only public interfaces, qstring_pack is
something internal to qdict.c so please move this right above
qdict_to_qstring_iter() also suggest shorter names like 'total_keys'.

> +
>  /* Object API */
>  QDict *qdict_new(void);
>  size_t qdict_size(const QDict *qdict);
> @@ -55,6 +63,7 @@ int qdict_get_bool(const QDict *qdict, const char *key);
>  QList *qdict_get_qlist(const QDict *qdict, const char *key);
>  QDict *qdict_get_qdict(const QDict *qdict, const char *key);
>  const char *qdict_get_str(const QDict *qdict, const char *key);
> +QString *qdict_to_qstring(const QDict *qdict, const char *separator);
>  int64_t qdict_get_try_int(const QDict *qdict, const char *key,
>                            int64_t err_value);
>  const char *qdict_get_try_str(const QDict *qdict, const char *key);

Patch

diff --git a/qdict.c b/qdict.c
index 175bc17..19c053f 100644
--- a/qdict.c
+++ b/qdict.c
@@ -267,6 +267,61 @@  const char *qdict_get_str(const QDict *qdict, const char *key)
     return qstring_get_str(qobject_to_qstring(obj));
 }
 
+static void qdict_to_qstring_iter(const char *key, QObject *obj, void *opaque)
+{
+    struct qstring_pack *pack = opaque;
+    qstring_append(pack->str, key);
+    qstring_append(pack->str, "=");
+    switch (qobject_type(obj)) {
+    case QTYPE_QSTRING:
+        qstring_append(pack->str, qstring_get_str(qobject_to_qstring(obj)));
+        break;
+    case QTYPE_QINT:
+        qstring_append_int(pack->str, qint_get_int(qobject_to_qint(obj)));
+        break;
+    case QTYPE_QBOOL:
+        qstring_append(pack->str, qbool_get_int(qobject_to_qbool(obj)) ? "true" :
+        "false" );
+        break;
+    default:
+        qstring_append(pack->str, "NULL");
+    }
+
+    pack->qdict_iter_current_key++;
+
+    if (pack->qdict_iter_current_key < pack->qdict_iter_total_keys) {
+        qstring_append(pack->str, pack->separator);
+    }
+}
+
+/**
+ * qdict_to_qstring(): Format a string with the keys and values of a QDict.
+ *
+ * Nested lists and dicts are not supported, yet.
+ *
+ * Return a pointer to a QString, with the following format:
+ *    key1=value1 SEP key2=value2 SEP key3=value3
+ */
+QString *qdict_to_qstring(const QDict *qdict, const char *separator)
+{
+    struct qstring_pack *pack;
+    QString *str;
+    str = qstring_new();
+
+    pack = qemu_malloc(sizeof(*pack));
+    pack->str = str;
+    pack->qdict_iter_current_key = 0;
+    pack->qdict_iter_total_keys = qdict_size(qdict);
+    pack->separator = separator;
+
+    qdict_iter(qdict, qdict_to_qstring_iter, pack);
+
+    qemu_free(pack);
+
+    return str;
+}
+
+
 /**
  * qdict_get_try_int(): Try to get integer mapped by 'key'
  *
diff --git a/qdict.h b/qdict.h
index 5e5902c..8a54733 100644
--- a/qdict.h
+++ b/qdict.h
@@ -15,6 +15,7 @@ 
 
 #include "qobject.h"
 #include "qlist.h"
+#include "qstring.h"
 #include "qemu-queue.h"
 #include <stdint.h>
 
@@ -32,6 +33,13 @@  typedef struct QDict {
     QLIST_HEAD(,QDictEntry) table[QDICT_HASH_SIZE];
 } QDict;
 
+struct qstring_pack {
+    QString *str;
+    size_t qdict_iter_total_keys;
+    size_t qdict_iter_current_key;
+    const char *separator;
+};
+
 /* Object API */
 QDict *qdict_new(void);
 size_t qdict_size(const QDict *qdict);
@@ -55,6 +63,7 @@  int qdict_get_bool(const QDict *qdict, const char *key);
 QList *qdict_get_qlist(const QDict *qdict, const char *key);
 QDict *qdict_get_qdict(const QDict *qdict, const char *key);
 const char *qdict_get_str(const QDict *qdict, const char *key);
+QString *qdict_to_qstring(const QDict *qdict, const char *separator);
 int64_t qdict_get_try_int(const QDict *qdict, const char *key,
                           int64_t err_value);
 const char *qdict_get_try_str(const QDict *qdict, const char *key);