From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v6 07/18] libxl IDL: rename json_fn to json_gen_fn Date: Mon, 9 Jun 2014 13:43:18 +0100 Message-ID: <1402317809-26833-8-git-send-email-wei.liu2@citrix.com> References: <1402317809-26833-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1402317809-26833-1-git-send-email-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Wei Liu , ian.jackson@eu.citrix.com, ian.campbell@citrix.com List-Id: xen-devel@lists.xenproject.org This json_fn is in fact used to generate string representation of a json data structure. We will introduce another json function to parse json data structure in later changeset, so rename json_fn to json_gen_fn to clarify. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/gentest.py | 4 ++-- tools/libxl/gentypes.py | 12 ++++++------ tools/libxl/idl.py | 12 ++++++------ tools/libxl/idl.txt | 4 ++-- tools/libxl/libxl_types.idl | 6 +++--- tools/libxl/libxl_types_internal.idl | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tools/libxl/gentest.py b/tools/libxl/gentest.py index 722b7f4..eb9a21b 100644 --- a/tools/libxl/gentest.py +++ b/tools/libxl/gentest.py @@ -52,7 +52,7 @@ def gen_rand_init(ty, v, indent = " ", parent = None): s += " break;\n" s += "}\n" elif isinstance(ty, idl.Struct) \ - and (parent is None or ty.json_fn is None): + and (parent is None or ty.json_gen_fn is None): for f in [f for f in ty.fields if not f.const]: (nparent,fexpr) = ty.member(v, f, parent is None) s += gen_rand_init(f.type, fexpr, "", nparent) @@ -243,7 +243,7 @@ int main(int argc, char **argv) f.write(" printf(\"Testing TYPE_to_json()\\n\");\n") f.write(" printf(\"----------------------\\n\");\n") f.write(" printf(\"\\n\");\n") - for ty in [t for t in types if t.json_fn is not None]: + for ty in [t for t in types if t.json_gen_fn is not None]: arg = ty.typename + "_val" f.write(" %s_rand_init(%s);\n" % (ty.typename, \ ty.pass_arg(arg, isref=False, passby=idl.PASS_BY_REFERENCE))) diff --git a/tools/libxl/gentypes.py b/tools/libxl/gentypes.py index 917e2c2..61a2b3d 100644 --- a/tools/libxl/gentypes.py +++ b/tools/libxl/gentypes.py @@ -229,7 +229,7 @@ def libxl_C_type_gen_json(ty, v, indent = " ", parent = None): s += " goto out;\n" s += " break;\n" s += "}\n" - elif isinstance(ty, idl.Struct) and (parent is None or ty.json_fn is None): + elif isinstance(ty, idl.Struct) and (parent is None or ty.json_gen_fn is None): s += "s = yajl_gen_map_open(hand);\n" s += "if (s != yajl_gen_status_ok)\n" s += " goto out;\n" @@ -243,8 +243,8 @@ def libxl_C_type_gen_json(ty, v, indent = " ", parent = None): s += "if (s != yajl_gen_status_ok)\n" s += " goto out;\n" else: - if ty.json_fn is not None: - s += "s = %s(hand, %s);\n" % (ty.json_fn, ty.pass_arg(v, parent is None)) + if ty.json_gen_fn is not None: + s += "s = %s(hand, %s);\n" % (ty.json_gen_fn, ty.pass_arg(v, parent is None)) s += "if (s != yajl_gen_status_ok)\n" s += " goto out;\n" @@ -341,7 +341,7 @@ if __name__ == '__main__': f.write("%svoid %s(%s, %s);\n" % (ty.hidden(), ty.init_fn + "_" + ku.keyvar.name, ty.make_arg("p"), ku.keyvar.type.make_arg(ku.keyvar.name))) - if ty.json_fn is not None: + if ty.json_gen_fn is not None: f.write("%schar *%s_to_json(libxl_ctx *ctx, %s);\n" % (ty.hidden(), ty.typename, ty.make_arg("p"))) if isinstance(ty, idl.Enumeration): f.write("%sconst char *%s_to_string(%s);\n" % (ty.hidden(), ty.typename, ty.make_arg("p"))) @@ -369,7 +369,7 @@ if __name__ == '__main__': """ % (header_json_define, header_json_define, " ".join(sys.argv))) - for ty in [ty for ty in types if ty.json_fn is not None]: + for ty in [ty for ty in types if ty.json_gen_fn is not None]: f.write("%syajl_gen_status %s_gen_json(yajl_gen hand, %s);\n" % (ty.hidden(), ty.typename, ty.make_arg("p", passby=idl.PASS_BY_REFERENCE))) f.write("\n") @@ -426,7 +426,7 @@ if __name__ == '__main__': f.write("}\n") f.write("\n") - for ty in [t for t in types if t.json_fn is not None]: + for ty in [t for t in types if t.json_gen_fn is not None]: f.write("yajl_gen_status %s_gen_json(yajl_gen hand, %s)\n" % (ty.typename, ty.make_arg("p", passby=idl.PASS_BY_REFERENCE))) f.write("{\n") f.write(libxl_C_type_gen_json(ty, "p")) diff --git a/tools/libxl/idl.py b/tools/libxl/idl.py index 69e08e1..8b118dd 100644 --- a/tools/libxl/idl.py +++ b/tools/libxl/idl.py @@ -65,9 +65,9 @@ class Type(object): self.autogenerate_init_fn = kwargs.setdefault('autogenerate_init_fn', False) if self.typename is not None and not self.private: - self.json_fn = kwargs.setdefault('json_fn', self.typename + "_gen_json") + self.json_gen_fn = kwargs.setdefault('json_gen_fn', self.typename + "_gen_json") else: - self.json_fn = kwargs.setdefault('json_fn', None) + self.json_gen_fn = kwargs.setdefault('json_gen_fn', None) self.autogenerate_json = kwargs.setdefault('autogenerate_json', True) @@ -118,7 +118,7 @@ class Number(Builtin): kwargs.setdefault('namespace', None) kwargs.setdefault('dispose_fn', None) kwargs.setdefault('signed', False) - kwargs.setdefault('json_fn', "yajl_gen_integer") + kwargs.setdefault('json_gen_fn', "yajl_gen_integer") self.signed = kwargs['signed'] Builtin.__init__(self, ctype, **kwargs) @@ -256,7 +256,7 @@ class KeyedUnion(Aggregate): void = Builtin("void *", namespace = None) bool = Builtin("bool", namespace = None, - json_fn = "yajl_gen_bool", + json_gen_fn = "yajl_gen_bool", autogenerate_json = False) size_t = Number("size_t", namespace = None) @@ -266,10 +266,10 @@ integer = Number("int", namespace = None, signed = True) uint8 = UInt(8) uint16 = UInt(16) uint32 = UInt(32) -uint64 = UInt(64, json_fn = "libxl__uint64_gen_json") +uint64 = UInt(64, json_gen_fn = "libxl__uint64_gen_json") string = Builtin("char *", namespace = None, dispose_fn = "free", - json_fn = "libxl__string_gen_json", + json_gen_fn = "libxl__string_gen_json", autogenerate_json = False) class Array(Type): diff --git a/tools/libxl/idl.txt b/tools/libxl/idl.txt index 439aede..6a53dd8 100644 --- a/tools/libxl/idl.txt +++ b/tools/libxl/idl.txt @@ -60,14 +60,14 @@ Type.autogenerate_init_fn: (default: True if dir in [IN, BOTH]) Indicates if the above named Type.init_fn should be autogenerated. -Type.json_fn: (default: typename + "_gen_json" or None if type == None) +Type.json_gen_fn: (default: typename + "_gen_json" or None if type == None) The name of the C function which will generate a YAJL data structure representing this type. Type.autogenerate_json: (default: True) - Indicates if the above named Type.json_fn should be autogenerated. + Indicates if the above named Type.json_gen_fn should be autogenerated. Other simple type-Classes ------------------------- diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index cbc16ce..95d450f 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -7,8 +7,8 @@ namespace("libxl_") libxl_defbool = Builtin("defbool", passby=PASS_BY_REFERENCE) -libxl_domid = Builtin("domid", json_fn = "yajl_gen_integer", autogenerate_json = False) -libxl_devid = Builtin("devid", json_fn = "yajl_gen_integer", autogenerate_json = False, signed = True, init_val="-1") +libxl_domid = Builtin("domid", json_gen_fn = "yajl_gen_integer", autogenerate_json = False) +libxl_devid = Builtin("devid", json_gen_fn = "yajl_gen_integer", autogenerate_json = False, signed = True, init_val="-1") libxl_uuid = Builtin("uuid", passby=PASS_BY_REFERENCE) libxl_mac = Builtin("mac", passby=PASS_BY_REFERENCE) libxl_bitmap = Builtin("bitmap", dispose_fn="libxl_bitmap_dispose", passby=PASS_BY_REFERENCE) @@ -22,7 +22,7 @@ libxl_hwcap = Builtin("hwcap", passby=PASS_BY_REFERENCE) # Specific integer types # -MemKB = UInt(64, init_val = "LIBXL_MEMKB_DEFAULT", json_fn = "libxl__uint64_gen_json") +MemKB = UInt(64, init_val = "LIBXL_MEMKB_DEFAULT", json_gen_fn = "libxl__uint64_gen_json") # # Constants / Enumerations diff --git a/tools/libxl/libxl_types_internal.idl b/tools/libxl/libxl_types_internal.idl index cb9444f..a964851 100644 --- a/tools/libxl/libxl_types_internal.idl +++ b/tools/libxl/libxl_types_internal.idl @@ -1,7 +1,7 @@ namespace("libxl__") hidden(True) -libxl_domid = Builtin("domid", namespace="libxl_", json_fn = "yajl_gen_integer") +libxl_domid = Builtin("domid", namespace="libxl_", json_gen_fn = "yajl_gen_integer") libxl__qmp_message_type = Enumeration("qmp_message_type", [ (1, "QMP"), -- 1.7.10.4