kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

This should fix mono crash on Linux 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11324 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Giagnocavo 2009-01-20 22:35:15 +00:00
parent 9a9ba4c37e
commit 4963117523
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mod/languages/mod_managed/freeswitch_managed.h
View File

@ -47,6 +47,7 @@ typedef char* (*inputFunction)(void*, switch_input_type_t);
#include <mono/jit/jit.h> #include <mono/jit/jit.h>
#include <mono/metadata/assembly.h> #include <mono/metadata/assembly.h>
#include <mono/metadata/environment.h> #include <mono/metadata/environment.h>
#include <mono/metadata/mono-config.h>
#include <mono/metadata/threads.h> #include <mono/metadata/threads.h>
#include <mono/metadata/debug-helpers.h> #include <mono/metadata/debug-helpers.h>
#endif #endif

10
src/mod/languages/mod_managed/mod_managed.cpp
View File

@ -49,7 +49,7 @@ using namespace System::Runtime::InteropServices;
SWITCH_BEGIN_EXTERN_C SWITCH_BEGIN_EXTERN_C
SWITCH_MODULE_LOAD_FUNCTION(mod_managed_load); SWITCH_MODULE_LOAD_FUNCTION(mod_managed_load);
SWITCH_MODULE_DEFINITION(mod_managed, mod_managed_load, NULL, NULL); SWITCH_MODULE_DEFINITION_EX(mod_managed, mod_managed_load, NULL, NULL, SMODF_GLOBAL_SYMBOLS);
SWITCH_STANDARD_API(managedrun_api_function); /* ExecuteBackground */ SWITCH_STANDARD_API(managedrun_api_function); /* ExecuteBackground */
SWITCH_STANDARD_API(managed_api_function); /* Execute */ SWITCH_STANDARD_API(managed_api_function); /* Execute */
@ -186,6 +186,11 @@ switch_status_t loadRuntime()
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
#ifndef WIN32
// So linux can find the .so
mono_config_parse_memory("<configuration><dllmap dll=\"mod_managed\" target=\"mod_managed.so\"/></configuration>");
#endif
switch_snprintf(filename, 256, "%s%s%s", SWITCH_GLOBAL_dirs.mod_dir, SWITCH_PATH_SEPARATOR, MOD_MANAGED_DLL); switch_snprintf(filename, 256, "%s%s%s", SWITCH_GLOBAL_dirs.mod_dir, SWITCH_PATH_SEPARATOR, MOD_MANAGED_DLL);
globals.domain = mono_jit_init(filename); globals.domain = mono_jit_init(filename);
@ -336,13 +341,12 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_managed_load)
/* Run loader */ /* Run loader */
MonoObject * exception = NULL; MonoObject * exception = NULL;
MonoObject * objResult = mono_runtime_invoke(globals.loadMethod, NULL, NULL, &exception); MonoObject * objResult = mono_runtime_invoke(globals.loadMethod, NULL, NULL, &exception);
success = *(int *) mono_object_unbox(objResult);
if (exception) { if (exception) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Load threw an exception.\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Load threw an exception.\n");
mono_print_unhandled_exception(exception); mono_print_unhandled_exception(exception);
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
success = *(int *) mono_object_unbox(objResult);
#endif #endif
if (success) { if (success) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Load completed successfully.\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Load completed successfully.\n");