Move java api to extras/
Change-Id: Ibd5cbbdfb22a235442cddaebc9eae9a3c4e35ec9 Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:

committed by
Dave Barach

parent
a14c166740
commit
cc4a5e8089
99
extras/japi/java/jvpp-common/jvpp_common.c
Normal file
99
extras/japi/java/jvpp-common/jvpp_common.c
Normal file
@ -0,0 +1,99 @@
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
#define _GNU_SOURCE /* for strcasestr(3) */
|
||||
|
||||
#include <vnet/api_errno.h>
|
||||
#include "jvpp_common.h"
|
||||
|
||||
#ifndef JVPP_DEBUG
|
||||
#define JVPP_DEBUG 0
|
||||
#endif
|
||||
|
||||
#if JVPP_DEBUG == 1
|
||||
#define DEBUG_LOG(...) clib_warning(__VA_ARGS__)
|
||||
#else
|
||||
#define DEBUG_LOG(...)
|
||||
#endif
|
||||
|
||||
#define _(error,errorCode,msg) \
|
||||
if (errorCode == code) \
|
||||
message = msg; \
|
||||
else
|
||||
|
||||
#define get_error_message(errno) \
|
||||
int code = errno; \
|
||||
foreach_vnet_api_error \
|
||||
message = "Reason unknown";
|
||||
|
||||
/* shared jvpp main structure */
|
||||
jvpp_main_t jvpp_main __attribute__((aligned (64)));
|
||||
|
||||
void call_on_error(const char* callName, int contextId, int retval,
|
||||
jclass callbackClass, jobject callbackObject,
|
||||
jclass callbackExceptionClass) {
|
||||
DEBUG_LOG("\nCallOnError : callback=%s, retval=%d, context=%d\n", callName,
|
||||
clib_net_to_host_u32(retval), clib_net_to_host_u32(context));
|
||||
JNIEnv *env = jvpp_main.jenv;
|
||||
if (!callbackClass) {
|
||||
DEBUG_LOG("CallOnError : jm->callbackClass is null!\n");
|
||||
return;
|
||||
}
|
||||
jmethodID excConstructor = (*env)->GetMethodID(env, callbackExceptionClass,
|
||||
"<init>", "(Ljava/lang/String;Ljava/lang/String;II)V");
|
||||
if (!excConstructor) {
|
||||
DEBUG_LOG("CallOnError : excConstructor is null!\n");
|
||||
return;
|
||||
}
|
||||
jmethodID callbackExcMethod = (*env)->GetMethodID(env, callbackClass,
|
||||
"onError", "(Lio/fd/vpp/jvpp/VppCallbackException;)V");
|
||||
if (!callbackExcMethod) {
|
||||
DEBUG_LOG("CallOnError : callbackExcMethod is null!\n");
|
||||
return;
|
||||
}
|
||||
|
||||
char *message;
|
||||
get_error_message(clib_net_to_host_u32(retval));
|
||||
jobject excObject = (*env)->NewObject(env, callbackExceptionClass,
|
||||
excConstructor, (*env)->NewStringUTF(env, callName),
|
||||
(*env)->NewStringUTF(env, message),
|
||||
clib_net_to_host_u32(contextId), clib_net_to_host_u32(retval));
|
||||
if (!excObject) {
|
||||
DEBUG_LOG("CallOnError : excObject is null!\n");
|
||||
return;
|
||||
}
|
||||
|
||||
(*env)->CallVoidMethod(env, callbackObject, callbackExcMethod, excObject);
|
||||
DEBUG_LOG("CallOnError : Response sent\n");
|
||||
}
|
||||
#undef _
|
||||
|
||||
u32 get_message_id(JNIEnv *env, const char *key) {
|
||||
uword *p = hash_get(jvpp_main.messages_hash, key);
|
||||
if (!p) {
|
||||
jclass exClass = (*env)->FindClass(env, "java/lang/IllegalStateException");
|
||||
char *msgBuf = clib_mem_alloc(strlen(key) + 70);
|
||||
strcpy(msgBuf, "API mismatch detected: ");
|
||||
strcat(msgBuf, key);
|
||||
strcat(msgBuf, " is missing in global name_crc hash table.");
|
||||
DEBUG_LOG("%s", msgBuf);
|
||||
DEBUG_LOG("Possible reasons:");
|
||||
DEBUG_LOG("1) incompatible VPP version used");
|
||||
DEBUG_LOG("2) message present in JSON file but not in global name_crc table");
|
||||
(*env)->ThrowNew(env, exClass, msgBuf);
|
||||
clib_mem_free(msgBuf);
|
||||
return 0;
|
||||
}
|
||||
return (u32) p[0];
|
||||
}
|
74
extras/japi/java/jvpp-common/jvpp_common.h
Normal file
74
extras/japi/java/jvpp-common/jvpp_common.h
Normal file
@ -0,0 +1,74 @@
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
#ifndef __included_jvpp_common_h__
|
||||
#define __included_jvpp_common_h__
|
||||
//
|
||||
#include <vppinfra/types.h>
|
||||
#include <vlibapi/api.h>
|
||||
#include <vlibmemory/api.h>
|
||||
#include <jni.h>
|
||||
|
||||
typedef struct {
|
||||
/* Unique identifier used for matching replays with requests */
|
||||
volatile u32 context_id;
|
||||
|
||||
/* Spinlock */
|
||||
volatile u32 lock;
|
||||
u32 tag;
|
||||
|
||||
/* JNI Native Method Interface pointer for message handlers */
|
||||
JNIEnv *jenv;
|
||||
|
||||
/* JNI Invoke Interface pointer for attachment of rx thread to java thread */
|
||||
JavaVM *jvm;
|
||||
|
||||
/* Convenience */
|
||||
svm_queue_t * vl_input_queue;
|
||||
u32 my_client_index;
|
||||
uword *messages_hash;
|
||||
} jvpp_main_t;
|
||||
|
||||
extern jvpp_main_t jvpp_main __attribute__((aligned (64)));
|
||||
|
||||
static_always_inline u32 vppjni_get_context_id(jvpp_main_t * jm) {
|
||||
return __sync_add_and_fetch(&jm->context_id, 1);
|
||||
}
|
||||
|
||||
static_always_inline void vppjni_lock(jvpp_main_t * jm, u32 tag) {
|
||||
while (__sync_lock_test_and_set(&jm->lock, 1))
|
||||
;
|
||||
jm->tag = tag;
|
||||
}
|
||||
|
||||
static_always_inline void vppjni_unlock(jvpp_main_t * jm) {
|
||||
jm->tag = 0;
|
||||
CLIB_MEMORY_BARRIER();
|
||||
jm->lock = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Calls onError callback on callbackObject reference. Passes instance of callbackExceptionClass as parameter.
|
||||
*/
|
||||
void call_on_error(const char* callName, int contextId, int retval,
|
||||
jclass callbackClass, jobject callbackObject,
|
||||
jclass callbackExceptionClass);
|
||||
|
||||
/**
|
||||
* Retrieves message id based on message name and crc (key format: name_crc).
|
||||
* Throws java/lang/IllegalStateException on failure.
|
||||
*/
|
||||
u32 get_message_id(JNIEnv *env, const char* key);
|
||||
|
||||
#endif /* __included_jvpp_common_h__ */
|
Reference in New Issue
Block a user