kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-02 19:40:08 +00:00
Code Issues Projects Releases Wiki Activity

indent

Browse Source
This commit is contained in:
Michael Jerris 2010-05-31 10:14:59 -04:00
parent 988147a70b
commit e4450044d7
1 changed files with 189 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
src/mod/languages/mod_java/modjava.c
View File

@ -45,7 +45,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_java_shutdown);
SWITCH_MODULE_DEFINITION(mod_java, mod_java_load, mod_java_shutdown, NULL);
static void launch_java(switch_core_session_t *session, const char *data, JNIEnv * env)
static void launch_java(switch_core_session_t *session, const char *data, JNIEnv *env)
{
jclass Launcher = NULL;
jmethodID launch = NULL;
@ -53,25 +53,29 @@ static void launch_java(switch_core_session_t *session, const char *data, JNIEnv
jstring args = NULL;
Launcher = (*env)->FindClass(env, "org/freeswitch/Launcher");
if (Launcher == NULL) {
if (Launcher == NULL)
{
(*env)->ExceptionDescribe(env);
goto done;
}
launch = (*env)->GetStaticMethodID(env, Launcher, "launch", "(Ljava/lang/String;Ljava/lang/String;)V");
if (launch == NULL) {
if (launch == NULL)
{
(*env)->ExceptionDescribe(env);
goto done;
}
uuid = (*env)->NewStringUTF(env, switch_core_session_get_uuid(session));
if (uuid == NULL) {
if (uuid == NULL)
{
(*env)->ExceptionDescribe(env);
goto done;
}
args = (*env)->NewStringUTF(env, data);
if (args == NULL) {
if (args == NULL)
{
(*env)->ExceptionDescribe(env);
goto done;
}
@ -80,7 +84,7 @@ static void launch_java(switch_core_session_t *session, const char *data, JNIEnv
if ((*env)->ExceptionOccurred(env))
(*env)->ExceptionDescribe(env);
done:
done:
if (args != NULL)
(*env)->DeleteLocalRef(env, args);
if (uuid != NULL)
@ -97,64 +101,78 @@ SWITCH_STANDARD_APP(java_function)
if (javaVM == NULL)
return;
res = (*javaVM)->AttachCurrentThread(javaVM, (void *) &env, NULL);
if (res == JNI_OK) {
res = (*javaVM)->AttachCurrentThread(javaVM, (void*) &env, NULL);
if (res == JNI_OK)
{
launch_java(session, data, env);
(*javaVM)->DetachCurrentThread(javaVM);
} else
}
else
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error attaching thread to Java VM!\n");
}
static switch_status_t load_config(JavaVMOption ** javaOptions, int *optionCount)
static switch_status_t load_config(JavaVMOption **javaOptions, int *optionCount)
{
switch_xml_t cfg, xml;
switch_status_t status;
xml = switch_xml_open_cfg("java.conf", &cfg, NULL);
if (xml) {
if (xml)
{
switch_xml_t javavm;
switch_xml_t options;
javavm = switch_xml_child(cfg, "javavm");
if (javavm != NULL) {
if (javavm != NULL)
{
const char *path = switch_xml_attr_soft(javavm, "path");
if (path != NULL) {
if (path != NULL)
{
status = switch_dso_load(&javaVMHandle, path, memoryPool);
if (status != SWITCH_STATUS_SUCCESS)
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error loading %s\n", path);
} else {
}
else
{
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Java VM path specified in java.conf.xml\n");
status = SWITCH_STATUS_FALSE;
}
} else {
}
else
{
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Java VM specified in java.conf.xml\n");
status = SWITCH_STATUS_FALSE;
goto close;
}
options = switch_xml_child(cfg, "options");
if (options != NULL) {
if (options != NULL)
{
switch_xml_t option;
int i = 0;
*optionCount = 0;
for (option = switch_xml_child(options, "option"); option; option = option->next) {
for (option = switch_xml_child(options, "option"); option; option = option->next)
{
const char *value = switch_xml_attr_soft(option, "value");
if (value != NULL)
++ * optionCount;
++*optionCount;
}
*optionCount += 1;
*javaOptions = switch_core_alloc(memoryPool, (switch_size_t) (*optionCount * sizeof(JavaVMOption)));
if (*javaOptions == NULL) {
*javaOptions = switch_core_alloc(memoryPool, (switch_size_t)(*optionCount * sizeof(JavaVMOption)));
if (*javaOptions == NULL)
{
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Out of memory!\n");
status = SWITCH_STATUS_FALSE;
goto close;
}
for (option = switch_xml_child(options, "option"); option; option = option->next) {
for (option = switch_xml_child(options, "option"); option; option = option->next)
{
const char *value = switch_xml_attr_soft(option, "value");
if (value == NULL)
continue;
(*javaOptions)[i].optionString = switch_core_strdup(memoryPool, value);
if ((*javaOptions)[i].optionString == NULL) {
if ((*javaOptions)[i].optionString == NULL)
{
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Out of memory!\n");
status = SWITCH_STATUS_FALSE;
goto close;
@ -166,20 +184,23 @@ static switch_status_t load_config(JavaVMOption ** javaOptions, int *optionCount
close:
switch_xml_free(xml);
} else {
}
else
{
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening java.conf.xml\n");
status = SWITCH_STATUS_FALSE;
}
return status;
}
static switch_status_t create_java_vm(JavaVMOption * options, int optionCount)
static switch_status_t create_java_vm(JavaVMOption *options, int optionCount)
{
jint(JNICALL * pJNI_CreateJavaVM) (JavaVM **, void **, void *);
jint (JNICALL *pJNI_CreateJavaVM)(JavaVM**,void**,void*);
switch_status_t status;
status = switch_dso_sym((void *) &pJNI_CreateJavaVM, javaVMHandle, "JNI_CreateJavaVM");
if (status == SWITCH_STATUS_SUCCESS) {
status = switch_dso_sym((void*) &pJNI_CreateJavaVM, javaVMHandle, "JNI_CreateJavaVM");
if (status == SWITCH_STATUS_SUCCESS)
{
JNIEnv *env;
JavaVMInitArgs initArgs;
jint res;
@ -190,15 +211,20 @@ static switch_status_t create_java_vm(JavaVMOption * options, int optionCount)
initArgs.options = options;
initArgs.ignoreUnrecognized = JNI_TRUE;
res = pJNI_CreateJavaVM(&javaVM, (void *) &env, &initArgs);
if (res == JNI_OK) {
res = pJNI_CreateJavaVM(&javaVM, (void*) &env, &initArgs);
if (res == JNI_OK)
{
(*javaVM)->DetachCurrentThread(javaVM);
status = SWITCH_STATUS_SUCCESS;
} else {
}
else
{
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating Java VM!\n");
status = SWITCH_STATUS_FALSE;
}
} else {
}
else
{
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Specified Java VM doesn't have JNI_CreateJavaVM\n");
status = SWITCH_STATUS_FALSE;
}
@ -221,16 +247,19 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_java_load)
return SWITCH_STATUS_SUCCESS;
status = switch_core_new_memory_pool(&memoryPool);
if (status == SWITCH_STATUS_SUCCESS) {
if (status == SWITCH_STATUS_SUCCESS)
{
status = load_config(&options, &optionCount);
if (status == SWITCH_STATUS_SUCCESS) {
if (status == SWITCH_STATUS_SUCCESS)
{
status = create_java_vm(options, optionCount);
if (status == SWITCH_STATUS_SUCCESS)
return SWITCH_STATUS_SUCCESS;
switch_dso_unload(javaVMHandle);
}
switch_core_destroy_memory_pool(&memoryPool);
} else
}
else
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating memory pool\n");
return status == SWITCH_STATUS_SUCCESS ? SWITCH_STATUS_NOUNLOAD : status;
@ -247,3 +276,5 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_java_shutdown)
switch_core_destroy_memory_pool(&memoryPool);
return SWITCH_STATUS_SUCCESS;
}