kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-16 16:58:35 +00:00
Code Issues Projects Releases Wiki Activity

move spidermonkey to use its own env for each instance instead of sharing one, should fix garbage collection tieups

Browse Source
This commit is contained in:
Anthony Minessale 2011-12-02 09:42:57 -06:00
parent 13e19e579a
commit f72af9ffc0
1 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
View File

@ -56,10 +56,13 @@ SWITCH_MODULE_DEFINITION_EX(mod_spidermonkey, mod_spidermonkey_load, mod_spiderm
*rval = BOOLEAN_TO_JSVAL(JS_FALSE); \ *rval = BOOLEAN_TO_JSVAL(JS_FALSE); \
return JS_FALSE; \ return JS_FALSE; \
} \ } \
if (!((switch_channel_test_flag(channel, CF_ANSWERED) || switch_channel_test_flag(channel, CF_EARLY_MEDIA)))) { \ if (!((switch_channel_test_flag(channel, CF_ANSWERED) || switch_channel_test_flag(channel, CF_EARLY_MEDIA)))) { \
eval_some_js("~throw new Error(\"Session is not answered!\");", cx, obj, rval); \ switch_channel_pre_answer(channel); \
*rval = BOOLEAN_TO_JSVAL(JS_FALSE); \ if (!((switch_channel_test_flag(channel, CF_ANSWERED) || switch_channel_test_flag(channel, CF_EARLY_MEDIA)))) { \
return JS_FALSE; \ eval_some_js("~throw new Error(\"Session is not answered!\");", cx, obj, rval); \
*rval = BOOLEAN_TO_JSVAL(JS_FALSE); \
return JS_FALSE; \
} \
} \ } \
} while (foo == 1) } while (foo == 1)
@ -86,7 +89,7 @@ static JSBool session_set_callerdata(JSContext * cx, JSObject * obj, uintN argc,
static switch_api_interface_t *js_run_interface = NULL; static switch_api_interface_t *js_run_interface = NULL;
static switch_api_interface_t *jsapi_interface = NULL; static switch_api_interface_t *jsapi_interface = NULL;
static struct { struct js_env {
size_t gStackChunkSize; size_t gStackChunkSize;
jsuword gStackBase; jsuword gStackBase;
int gExitCode; int gExitCode;
@ -95,7 +98,7 @@ static struct {
FILE *gOutFile; FILE *gOutFile;
int stackDummy; int stackDummy;
JSRuntime *rt; JSRuntime *rt;
} globals; };
static JSClass global_class = { static JSClass global_class = {
"Global", JSCLASS_HAS_PRIVATE, "Global", JSCLASS_HAS_PRIVATE,
@ -948,7 +951,7 @@ static switch_status_t sm_load_file(char *filename)
switch_core_hash_insert(module_manager.load_hash, (char *) mp->name, (void *) mp); switch_core_hash_insert(module_manager.load_hash, (char *) mp->name, (void *) mp);
} }
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Successfully Loaded [%s]\n", module->filename); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Successfully Loaded [%s]\n", module->filename);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
@ -1036,22 +1039,19 @@ static switch_status_t load_modules(void)
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
static switch_status_t init_js(void) static switch_status_t init_js(struct js_env *env)
{ {
memset(&globals, 0, sizeof(globals));
globals.gQuitting = JS_FALSE;
globals.gErrFile = NULL;
globals.gOutFile = NULL;
globals.gStackChunkSize = 8192;
globals.gStackBase = (jsuword) & globals.stackDummy;
globals.gErrFile = stderr;
globals.gOutFile = stdout;
if (!(globals.rt = JS_NewRuntime(64L * 1024L * 1024L))) { memset(env, 0, sizeof(*env));
return SWITCH_STATUS_FALSE; env->gQuitting = JS_FALSE;
} env->gErrFile = NULL;
env->gOutFile = NULL;
env->gStackChunkSize = 8192;
env->gStackBase = (jsuword) & env->stackDummy;
env->gErrFile = stderr;
env->gOutFile = stdout;
if (load_modules() != SWITCH_STATUS_SUCCESS) { if (!(env->rt = JS_NewRuntime(64L * 1024L * 1024L))) {
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
@ -3638,12 +3638,15 @@ static void js_parse_and_execute(switch_core_session_t *session, const char *inp
struct js_session *jss = NULL; struct js_session *jss = NULL;
JSContext *cx = NULL; JSContext *cx = NULL;
jsval rval; jsval rval;
struct js_env env = { 0 };
if (zstr(input_code)) { if (zstr(input_code)) {
return; return;
} }
if ((cx = JS_NewContext(globals.rt, globals.gStackChunkSize))) { init_js(&env);
if ((cx = JS_NewContext(env.rt, env.gStackChunkSize))) {
JS_BeginRequest(cx); JS_BeginRequest(cx);
JS_SetErrorReporter(cx, js_error); JS_SetErrorReporter(cx, js_error);
javascript_global_object = JS_NewObject(cx, &global_class, NULL, NULL); javascript_global_object = JS_NewObject(cx, &global_class, NULL, NULL);
@ -3693,6 +3696,9 @@ static void js_parse_and_execute(switch_core_session_t *session, const char *inp
JS_DestroyContext(cx); JS_DestroyContext(cx);
} }
JS_DestroyRuntime(env.rt);
return; return;
} }
@ -3789,10 +3795,14 @@ SWITCH_STANDARD_API(launch_async)
SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load) SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load)
{ {
switch_application_interface_t *app_interface; switch_application_interface_t *app_interface;
switch_status_t status; //switch_status_t status;
if ((status = init_js()) != SWITCH_STATUS_SUCCESS) { //if ((status = init_js()) != SWITCH_STATUS_SUCCESS) {
return status; // return status;
//}
if (load_modules() != SWITCH_STATUS_SUCCESS) {
return SWITCH_STATUS_FALSE;
} }
/* connect my internal structure to the blank pointer passed to me */ /* connect my internal structure to the blank pointer passed to me */
@ -3808,11 +3818,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load)
SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_spidermonkey_shutdown) SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_spidermonkey_shutdown)
{ {
// this causes a crash
//JS_DestroyRuntime(globals.rt);
switch_curl_destroy();
switch_core_hash_destroy(&module_manager.mod_hash); switch_core_hash_destroy(&module_manager.mod_hash);
switch_core_hash_destroy(&module_manager.load_hash); switch_core_hash_destroy(&module_manager.load_hash);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;