diff options
author | Ed Warnicke <eaw@cisco.com> | 2016-07-06 15:23:34 -0700 |
---|---|---|
committer | Ed Warnicke <eaw@cisco.com> | 2016-09-07 13:27:27 -0700 |
commit | 237944f38b6b08b83dff9dafbf0f7ee3ce9a3752 (patch) | |
tree | 03358b48c1fcb6a1ab1b25da5f55e42fd0a14a8e /nsh-plugin/java/jvpp/jvpp_nsh.c | |
parent | c8291ef9611e465efd5ada0ff77b1018640b9690 (diff) |
jvpp support for nsh
Augment APIs with entry_index for reply, dump and details
Squashes:
https://gerrit.fd.io/r/#/c/2538/
https://gerrit.fd.io/r/#/c/2118/
https://gerrit.fd.io/r/#/c/1884/
Change-Id: Ibbdc53e2db8ffa5499380f6ce70356c4a401315e
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Diffstat (limited to 'nsh-plugin/java/jvpp/jvpp_nsh.c')
-rw-r--r-- | nsh-plugin/java/jvpp/jvpp_nsh.c | 114 |
1 files changed, 114 insertions, 0 deletions
diff --git a/nsh-plugin/java/jvpp/jvpp_nsh.c b/nsh-plugin/java/jvpp/jvpp_nsh.c new file mode 100644 index 0000000..a84e02e --- /dev/null +++ b/nsh-plugin/java/jvpp/jvpp_nsh.c @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2016 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <vnet/vnet.h> + +#include <vpp-api/nsh_msg_enum.h> +#define vl_typedefs /* define message structures */ +#include <vpp-api/nsh_all_api_h.h> +#undef vl_typedefs + +#define vl_endianfun +#include <vpp-api/nsh_all_api_h.h> +#undef vl_endianfun + +#define vl_print(handle, ...) +#define vl_printfun +#include <vpp-api/nsh_all_api_h.h> +#undef vl_printfun + +/* Get the API version number */ +#define vl_api_version(n,v) static u32 api_version=(v); +#include <vpp-api/nsh_all_api_h.h> +#undef vl_api_version + +#include <vnet/api_errno.h> +#include <vlibapi/api.h> +#include <vlibmemory/api.h> + +#include <jvpp-common/jvpp_common.h> + +// FIXME use less fragile path +#include "../build/java/jvpp/org_openvpp_jvpp_nsh_JVppNshImpl.h" +#include "jvpp_nsh.h" +#include "./build/java/jvpp/jvpp_nsh_gen.h" + +/* + * Class: org_openvpp_jvpp_nsh_JVppNshImpl + * Method: init0 + * Signature: (JI)V + */ +JNIEXPORT void JNICALL Java_org_openvpp_jvpp_nsh_JVppNshImpl_init0 + (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) { + nsh_main_t * plugin_main = &nsh_main; + u8 * name; + clib_warning ("Java_org_openvpp_jvpp_nsh_JVppNshImpl_init0"); + + plugin_main->my_client_index = my_client_index; + plugin_main->vl_input_queue = (unix_shared_memory_queue_t *)queue_address; + + name = format (0, "nsh_%08x%c", api_version, 0); + plugin_main->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name); + + plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback); + plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback)); + + #define _(N,n) \ + vl_msg_api_set_handlers(VL_API_##N + plugin_main->msg_id_base, #n, \ + vl_api_##n##_t_handler, \ + vl_noop_handler, \ + vl_api_##n##_t_endian, \ + vl_api_##n##_t_print, \ + sizeof(vl_api_##n##_t), 1); + foreach_api_reply_handler; + #undef _ +} + +JNIEXPORT void JNICALL Java_org_openvpp_jvpp_nsh_JVppNshImpl_close0 +(JNIEnv *env, jclass clazz) { + nsh_main_t * plugin_main = &nsh_main; + + // cleanup: + (*env)->DeleteGlobalRef(env, plugin_main->callbackClass); + (*env)->DeleteGlobalRef(env, plugin_main->callbackObject); + + plugin_main->callbackClass = NULL; + plugin_main->callbackObject = NULL; +} + +jint JNI_OnLoad(JavaVM *vm, void *reserved) { + JNIEnv* env; + + if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) { + return JNI_EVERSION; + } + + if (cache_class_references(env) != 0) { + clib_warning ("Failed to cache class references\n"); + return JNI_ERR; + } + + return JNI_VERSION_1_8; +} + +void JNI_OnUnload(JavaVM *vm, void *reserved) { + JNIEnv* env; + if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) { + return; + } + delete_class_references(env); +} + + |