diff options
author | Marek Gradzki <mgradzki@cisco.com> | 2018-06-20 13:15:08 +0200 |
---|---|---|
committer | Ole Trøan <otroan@employees.org> | 2018-06-22 07:03:06 +0000 |
commit | 02c88e41791b11e8ed5dd08c76fa7bf5991ba3d7 (patch) | |
tree | eacc82d313de92d1c21ec24b92f5b6dcb7937f3c /src/vpp-api/java/jvpp/gen/jvppgen/jni_type_handlers_gen.py | |
parent | a7564e8004fd6d9a63eb0605f752f27a71403645 (diff) |
jvpp: cleanup JNI generation code (VPP-1153)
Minor cleanup that includes unifying
common Java to C and C to Java translation code.
Change-Id: I14d63dbe06334c3bbfbde75043de04d2c08f3dfd
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'src/vpp-api/java/jvpp/gen/jvppgen/jni_type_handlers_gen.py')
-rwxr-xr-x | src/vpp-api/java/jvpp/gen/jvppgen/jni_type_handlers_gen.py | 73 |
1 files changed, 48 insertions, 25 deletions
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/jni_type_handlers_gen.py b/src/vpp-api/java/jvpp/gen/jvppgen/jni_type_handlers_gen.py index eb6ab235ba5..c32acc1911c 100755 --- a/src/vpp-api/java/jvpp/gen/jvppgen/jni_type_handlers_gen.py +++ b/src/vpp-api/java/jvpp/gen/jvppgen/jni_type_handlers_gen.py @@ -19,39 +19,46 @@ from jni_common_gen import generate_j2c_swap, generate_j2c_identifiers, generate from jvpp_model import Class -def generate_type_handlers(model): +def generate_type_handlers(model, logger): """ - Generates msg handlers for all messages except for dumps and requests (handled by vpp, not client). + Generates host-to-net and net-to-host functions for all custom types defined in the VPP API :param model: meta-model of VPP API used for jVPP generation. + :param logger: jVPP logger """ type_handlers = [] for t in model.types: - if not isinstance(t, Class): - continue - ref_name = t.java_name_lower - jni_identifiers = generate_j2c_identifiers(t, class_ref_name="%sClass" % ref_name, object_ref_name="_host") - type_handlers.append(_TYPE_NET_TO_HOST_TEMPLATE.substitute( - c_name=t.name, - json_filename=model.json_api_files, - json_definition=t.doc, - type_reference_name=ref_name, - class_FQN=t.jni_name, - jni_identifiers=jni_identifiers, - type_swap=generate_j2c_swap(t, struct_ref_name="_net") - )) - - type_handlers.append(_TYPE_HOST_TO_NET_TEMPLATE.substitute( - c_name=t.name, - json_filename=model.json_api_files, - json_definition=t.doc, - type_reference_name=ref_name, - class_FQN=t.jni_name, - jni_identifiers=jni_identifiers, - type_swap=generate_c2j_swap(t, object_ref_name="_host", struct_ref_name="_net") - )) + #TODO(VPP-1186): move the logic to JNI generators + if isinstance(t, Class): + _generate_class(model, t, type_handlers) + else: + logger.debug("Skipping custom JNI type handler generation for %s", t) return "\n".join(type_handlers) + +def _generate_class(model, t, type_handlers): + ref_name = t.java_name_lower + jni_identifiers = generate_j2c_identifiers(t, class_ref_name="%sClass" % ref_name, object_ref_name="_host") + type_handlers.append(_TYPE_NET_TO_HOST_TEMPLATE.substitute( + c_name=t.name, + json_filename=model.json_api_files, + json_definition=t.doc, + type_reference_name=ref_name, + class_FQN=t.jni_name, + jni_identifiers=jni_identifiers, + type_swap=generate_j2c_swap(t, struct_ref_name="_net") + )) + + type_handlers.append(_TYPE_HOST_TO_NET_TEMPLATE.substitute( + c_name=t.name, + json_filename=model.json_api_files, + json_definition=t.doc, + type_reference_name=ref_name, + class_FQN=t.jni_name, + jni_identifiers=jni_identifiers, + type_swap=generate_c2j_swap(t, object_ref_name="_host", struct_ref_name="_net") + )) + _TYPE_NET_TO_HOST_TEMPLATE = Template(""" /** * Host to network byte order conversion for ${c_name} type. @@ -76,3 +83,19 @@ static inline void _net_to_host_${c_name}(JNIEnv * env, vl_api_${c_name}_t * _ne jclass ${type_reference_name}Class = (*env)->FindClass(env, "${class_FQN}"); $type_swap }""") + + +def _generate_scalar_host_to_net_swap(field): + field_type = field.type + if field_type.is_swap_needed: + return field_type.get_host_to_net_function(field.java_name, "*_net") + else: + return "*_net = %s" % field.java_name + + +def _generate_scalar_net_to_host_swap(field): + field_type = field.type + if field_type.is_swap_needed: + return "%s((%s) _net);" % (field_type.net_to_host_function, field_type.name) + else: + return "_net"
\ No newline at end of file |