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

whatever 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5102 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-05-08 15:44:44 +00:00
parent 83f848768b
commit cb09b09f82
3 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod/languages/mod_python/Makefile
View File

@ -3,8 +3,8 @@
# and define these variables to impact your build # and define these variables to impact your build
LOCAL_CFLAGS=-I$(PREFIX)/include/python2.4/ LOCAL_CFLAGS=-I$(PREFIX)/include/python2.5/
LOCAL_LDFLAGS=-lpython2.4 -L$(PREFIX)/lib/python2.4/config/ -lutil -lstdc++ LOCAL_LDFLAGS=-lpython2.5 -L$(PREFIX)/lib/python2.5/config/ -lutil -lstdc++
LOCAL_OBJS=freeswitch_python.o mod_python_wrap.o LOCAL_OBJS=freeswitch_python.o mod_python_wrap.o
include ../../../../build/modmake.rules include ../../../../build/modmake.rules
@ -14,7 +14,7 @@ SWIGCFILE=../../../switch_swig.c
SWIGIFILE=../../../switch_swig.i SWIGIFILE=../../../switch_swig.i
local_depend: local_depend:
MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install Python-2.4.3.tgz --prefix=$(PREFIX) --enable-threads CFLAGSFORSHARED="-fPIC" MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install Python-2.5.1.tgz --prefix=$(PREFIX) --enable-threads CFLAGSFORSHARED="-fPIC"
reswig: reswig:
swig -python -shadow -c++ -o mod_python_wrap.cpp mod_python.i swig -python -shadow -c++ -o mod_python_wrap.cpp mod_python.i
@ -26,5 +26,5 @@ switch_swig.o: $(SWIGCFILE) Makefile
$(CC) -w $(CFLAGS) -c $< -o $@ $(CC) -w $(CFLAGS) -c $< -o $@
local_install: local_install:
cp -f freeswitch.py $(PREFIX)/lib/python2.4/site-packages/ cp -f freeswitch.py $(PREFIX)/lib/python2.5/site-packages/

38
src/mod/languages/mod_python/mod_python.c
View File

@ -57,7 +57,7 @@ static void eval_some_python(char *uuid, char *args)
char *argv[128] = {0}; char *argv[128] = {0};
int argc; int argc;
int lead = 0; int lead = 0;
char *script = NULL; char *script = NULL, *script_path = NULL, *path = NULL;
if (args) { if (args) {
dupargs = strdup(args); dupargs = strdup(args);
@ -80,13 +80,30 @@ static void eval_some_python(char *uuid, char *args)
lead = 1; lead = 1;
} }
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "running %s\n", script);
if (switch_is_file_path(script)) {
script_path = script;
if ((script = strrchr(script_path, *SWITCH_PATH_SEPARATOR))) {
script++;
} else {
script = script_path;
}
} else if ((path = switch_mprintf("%s%s%s", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR, script))) {
script_path = path;
}
if (script_path) {
if (!switch_file_exists(script_path, NULL) == SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Open File: %s\n", script_path);
goto done;
}
}
if ((pythonfile = fopen(script, "r"))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "running %s\n", script_path);
PyEval_AcquireLock();
if ((pythonfile = fopen(script_path, "r"))) {
tstate = Py_NewInterpreter(); tstate = Py_NewInterpreter();
PyEval_ReleaseLock();
if (!tstate) { if (!tstate) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error acquiring tstate\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error acquiring tstate\n");
@ -94,13 +111,16 @@ static void eval_some_python(char *uuid, char *args)
} }
PyThreadState_Clear(tstate);
init_freeswitch(); init_freeswitch();
PyRun_SimpleString("from freeswitch import *");
PySys_SetArgv(argc - lead, &argv[lead]); PySys_SetArgv(argc - lead, &argv[lead]);
PyRun_SimpleFile(pythonfile, ""); PyRun_SimpleFile(pythonfile, script);
Py_EndInterpreter(tstate); Py_EndInterpreter(tstate);
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error running %s\n", script); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error running %s\n", script_path);
} }
@ -111,6 +131,7 @@ static void eval_some_python(char *uuid, char *args)
} }
switch_safe_free(dupargs); switch_safe_free(dupargs);
switch_safe_free(path);
} }
static void python_function(switch_core_session_t *session, char *data) static void python_function(switch_core_session_t *session, char *data)
@ -214,6 +235,9 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_mod
PyEval_ReleaseLock(); PyEval_ReleaseLock();
eval_some_python(NULL, "init_python.py");
PyThreadState_Swap(NULL);
/* indicate that the module should continue to be loaded */ /* indicate that the module should continue to be loaded */
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }

2
src/mod/languages/mod_spidermonkey/mod_spidermonkey.h
View File

@ -85,7 +85,7 @@ int eval_some_js(char *code, JSContext * cx, JSObject * obj, jsval * rval)
cptr = code + 1; cptr = code + 1;
script = JS_CompileScript(cx, obj, cptr, strlen(cptr), "inline", 1); script = JS_CompileScript(cx, obj, cptr, strlen(cptr), "inline", 1);
} else { } else {
if (*code == '/') { if (switch_is_file_path(code)) {
script_name = code; script_name = code;
} else if ((path = switch_mprintf("%s%s%s", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR, code))) { } else if ((path = switch_mprintf("%s%s%s", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR, code))) {
script_name = path; script_name = path;