Addition of u16[] to JVPP generator

[vpp.git] / vpp-api / java / jvpp / gen / jvpp_c_gen.py

diff --git a/vpp-api/java/jvpp/gen/jvpp_c_gen.py b/vpp-api/java/jvpp/gen/jvpp_c_gen.py
index c006c34..592c362 100644 (file)
--- a/vpp-api/java/jvpp/gen/jvpp_c_gen.py
+++ b/vpp-api/java/jvpp/gen/jvpp_c_gen.py
@@ -129,6 +129,20 @@ u32_array_struct_setter_template = Template("""
     (*env)->ReleaseIntArrayElements (env, ${java_name}, ${java_name}ArrayElements, 0);
     """)
 
+u16_array_struct_setter_template = Template("""
+    jint * ${java_name}ArrayElements = (*env)->GetIntArrayElements(env, ${java_name}, NULL);
+    {
+        size_t _i;
+        jsize cnt = (*env)->GetArrayLength (env, ${java_name});
+        size_t max_size = ${field_length};
+        if (max_size != 0 && cnt > max_size) cnt = max_size;
+        for (_i = 0; _i < cnt; _i++) {
+            mp->${c_name}[_i] = clib_host_to_net_u16(${java_name}ArrayElements[_i]);
+        }
+    }
+    (*env)->ReleaseIntArrayElements (env, ${java_name}, ${java_name}ArrayElements, 0);
+    """)
+
 vl_api_ip4_fib_counter_t_array_struct_setter_template = Template("""
     // vl_api_ip4_fib_counter_t_array_field_setter_template FIXME""")
 
@@ -141,6 +155,7 @@ struct_setter_templates = {'u8': u8_struct_setter_template,
                           'i32': u32_struct_setter_template,
                           'u64': u64_struct_setter_template,
                           'u8[]': u8_array_struct_setter_template,
+                          'u16[]': u16_array_struct_setter_template,
                           'u32[]': u32_array_struct_setter_template,
                           'vl_api_ip4_fib_counter_t[]': vl_api_ip4_fib_counter_t_array_struct_setter_template,
                           'vl_api_ip6_fib_counter_t[]': vl_api_ip6_fib_counter_t_array_struct_setter_template
@@ -210,7 +225,12 @@ def generate_jni_impl(func_list, inputfile):
             for t in zip(f['c_types'], f['args'], f['lengths']):
                 c_type = t[0]
                 c_name = t[1]
-                field_length = t[2]
+                field_length = t[2][0]
+
+                # check if we are processing variable length array:
+                if t[2][1]:
+                    field_length = util.underscore_to_camelcase(t[2][0])
+
                 java_field_name = util.underscore_to_camelcase(c_name)
 
                 struct_setter_template = struct_setter_templates[c_type]
@@ -241,6 +261,9 @@ default_dto_field_setter_template = Template("""
     (*env)->Set${jni_setter}(env, dto, ${java_name}FieldId, mp->${c_name});
 """)
 
+variable_length_array_value_template = Template("""mp->${length_var_name}""")
+variable_length_array_template = Template("""clib_net_to_host_${length_field_type}(${value})""")
+
 u16_dto_field_setter_template = Template("""
     (*env)->Set${jni_setter}(env, dto, ${java_name}FieldId, clib_net_to_host_u16(mp->${c_name}));
 """)
@@ -267,6 +290,8 @@ u32_array_dto_field_setter_template = Template("""
         for (_i = 0; _i < ${field_length}; _i++) {
             ${java_name}ArrayElements[_i] = clib_net_to_host_u32(mp->${c_name}[_i]);
         }
+
+        (*env)->ReleaseIntArrayElements(env,  ${java_name}, ${java_name}ArrayElements, 0);
         (*env)->SetObjectField(env, dto, ${java_name}FieldId, ${java_name});
     }
 """)
@@ -281,6 +306,8 @@ u64_array_dto_field_setter_template = Template("""
         for (_i = 0; _i < ${field_length}; _i++) {
             ${java_name}ArrayElements[_i] = clib_net_to_host_u64(mp->${c_name}[_i]);
         }
+
+        (*env)->ReleaseLongArrayElements(env,  ${java_name}, ${java_name}ArrayElements, 0);
         (*env)->SetObjectField(env, dto, ${java_name}FieldId, ${java_name});
     }
 """)
@@ -353,7 +380,16 @@ def generate_msg_handlers(func_list, inputfile):
             c_type = t[0]
             jni_type = t[1]
             c_name = t[2]
-            field_length = t[3]
+            field_length = t[3][0]
+
+            # check if we are processing variable length array
+            if t[3][1]:
+                length_var_name = t[3][0]
+                length_field_type = f['c_types'][f['args'].index(length_var_name)]
+                field_length = variable_length_array_value_template.substitute(length_var_name=length_var_name)
+                if length_field_type != 'u8':  # we need net to host conversion:
+                    field_length = variable_length_array_template.substitute(
+                        length_field_type=length_field_type, value=field_length)
 
             # for retval don't generate setters and generate retval check
             if util.is_retval_field(c_name):