From: Anthony PERARD <anthony.perard@citrix.com>
To: Xen Devel <xen-devel@lists.xen.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>,
Ian Jackson <Ian.Jackson@eu.citrix.com>,
Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH V2 3/9] libxl_json: Introduce libxl__json_object_to_yajl_gen.
Date: Mon, 17 Sep 2012 19:22:22 +0100 [thread overview]
Message-ID: <1347906148-9606-4-git-send-email-anthony.perard@citrix.com> (raw)
In-Reply-To: <1347906148-9606-1-git-send-email-anthony.perard@citrix.com>
This function converts a libxl__json_object to yajl by calling every yajl_gen_*
function on a preallocated yajl_gen hand.
This helps to integrate a json_object into an already existing yajl_gen tree.
This function is used in a later patch.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
tools/libxl/libxl_internal.h | 3 +++
tools/libxl/libxl_json.c | 63 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 66 insertions(+)
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 3c2dcaa..9c1482d 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1527,6 +1527,9 @@ libxl__json_map_node *libxl__json_map_node_get(const libxl__json_object *o,
_hidden const libxl__json_object *libxl__json_map_get(const char *key,
const libxl__json_object *o,
libxl__json_node_type expected_type);
+_hidden yajl_status libxl__json_object_to_yajl_gen(libxl__gc *gc,
+ yajl_gen hand,
+ libxl__json_object *param);
_hidden void libxl__json_object_free(libxl__gc *gc, libxl__json_object *obj);
_hidden libxl__json_object *libxl__json_parse(libxl__gc *gc, const char *s);
diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c
index 0539865..40818f2 100644
--- a/tools/libxl/libxl_json.c
+++ b/tools/libxl/libxl_json.c
@@ -376,6 +376,69 @@ const libxl__json_object *libxl__json_map_get(const char *key,
return NULL;
}
+yajl_status libxl__json_object_to_yajl_gen(libxl__gc *gc,
+ yajl_gen hand,
+ libxl__json_object *obj)
+{
+ int index = 0;
+ yajl_status rc;
+
+ switch (obj->type) {
+ case JSON_NULL:
+ return yajl_gen_null(hand);
+ case JSON_TRUE:
+ return yajl_gen_bool(hand, true);
+ case JSON_FALSE:
+ return yajl_gen_bool(hand, false);
+ case JSON_INTEGER:
+ return yajl_gen_integer(hand, obj->u.i);
+ case JSON_DOUBLE:
+ return yajl_gen_double(hand, obj->u.d);
+ case JSON_NUMBER:
+ return yajl_gen_number(hand, obj->u.string, strlen(obj->u.string));
+ case JSON_STRING:
+ return libxl__yajl_gen_asciiz(hand, obj->u.string);
+ case JSON_MAP: {
+ libxl__json_map_node *node = NULL;
+
+ rc = yajl_gen_map_open(hand);
+ if (rc != yajl_status_ok)
+ return rc;
+ for (index = 0; index < obj->u.map->count; index++) {
+ if (flexarray_get(obj->u.map, index, (void**)&node) != 0)
+ break;
+
+ rc = libxl__yajl_gen_asciiz(hand, node->map_key);
+ if (rc != yajl_status_ok)
+ return rc;
+ rc = libxl__json_object_to_yajl_gen(gc, hand, node->obj);
+ if (rc != yajl_status_ok)
+ return rc;
+ }
+ return yajl_gen_map_close(hand);
+ }
+ case JSON_ARRAY: {
+ libxl__json_object *node = NULL;
+
+ rc = yajl_gen_array_open(hand);
+ if (rc != yajl_status_ok)
+ return rc;
+ for (index = 0; index < obj->u.array->count; index++) {
+ if (flexarray_get(obj->u.array, index, (void**)&node) != 0)
+ break;
+ rc = libxl__json_object_to_yajl_gen(gc, hand, node);
+ if (rc != yajl_status_ok)
+ return rc;
+ }
+ return yajl_gen_array_close(hand);
+ }
+ case JSON_ERROR:
+ case JSON_ANY:
+ default:
+ return -1;
+ }
+}
+
/*
* JSON callbacks
--
Anthony PERARD
next prev parent reply other threads:[~2012-09-17 18:22 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-17 18:22 [PATCH V2 0/9] Set dirty log on qemu-xen Anthony PERARD
2012-09-17 18:22 ` [PATCH V2 1/9] libxl_json: Use libxl alloc function with NOGC Anthony PERARD
2012-09-25 8:39 ` Ian Campbell
2012-09-25 13:54 ` Anthony PERARD
2012-09-17 18:22 ` [PATCH V2 2/9] libxl_json: Export json_object related function Anthony PERARD
2012-09-25 8:40 ` Ian Campbell
2012-09-17 18:22 ` Anthony PERARD [this message]
2012-09-25 8:44 ` [PATCH V2 3/9] libxl_json: Introduce libxl__json_object_to_yajl_gen Ian Campbell
2012-09-25 14:20 ` Anthony PERARD
2012-09-25 14:32 ` Ian Campbell
2012-09-17 18:22 ` [PATCH V2 4/9] libxl_qmp: Introduces helpers to create an argument list Anthony PERARD
2012-09-25 8:54 ` Ian Campbell
2012-09-25 14:45 ` Anthony PERARD
2012-09-25 9:06 ` Ian Campbell
2012-09-17 18:22 ` [PATCH V2 5/9] libxl_qmp: Use qmp_parameters_* functions for param list of a QMP command Anthony PERARD
2012-09-25 8:56 ` Ian Campbell
2012-09-17 18:22 ` [PATCH V2 6/9] libxl_qmp: Simplify run of single QMP commands Anthony PERARD
2012-09-25 8:57 ` Ian Campbell
2012-09-17 18:22 ` [PATCH V2 7/9] libxl_qmp: Introduce libxl__qmp_set_global_dirty_log Anthony PERARD
2012-09-25 9:06 ` Ian Campbell
2012-09-25 9:10 ` Ian Campbell
2012-09-25 14:51 ` Anthony PERARD
2012-09-17 18:22 ` [PATCH V2 8/9] libxl_dom: Call the right switch logdirty for the right DM Anthony PERARD
2012-09-25 9:22 ` Ian Campbell
2012-09-17 18:22 ` [PATCH V2 9/9] libxl: Allow migration with qemu-xen Anthony PERARD
2012-09-25 9:23 ` Ian Campbell
2012-09-25 14:53 ` Anthony PERARD
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347906148-9606-4-git-send-email-anthony.perard@citrix.com \
--to=anthony.perard@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=ian.campbell@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).