FS-11259: [mod_perl] mod_perl tweaks #resolve

diff --git a/src/mod/languages/mod_perl/freeswitch_perl.cpp b/src/mod/languages/mod_perl/freeswitch_perl.cpp
index 220a16054fd55487f356b7b794b8d99b4235dbd7..642ea1d5877b85afd3be5f7eda2d2fe3c2044791 100644 (file)
--- a/src/mod/languages/mod_perl/freeswitch_perl.cpp
+++ b/src/mod/languages/mod_perl/freeswitch_perl.cpp
@@ -16,6 +16,8 @@ Session::Session():CoreSession()
 Session::Session(char *uuid, CoreSession *a_leg):CoreSession(uuid, a_leg)
 {
        init_me();
+       switch_mutex_init(&callback_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
+       
        if (session && allocated) {
                suuid = switch_core_session_sprintf(session, "main::uuid_%s\n", switch_core_session_get_uuid(session));
                for (char *p = suuid; p && *p; p++) {
@@ -32,6 +34,8 @@ Session::Session(char *uuid, CoreSession *a_leg):CoreSession(uuid, a_leg)
 Session::Session(switch_core_session_t *new_session):CoreSession(new_session)
 {
        init_me();
+       switch_mutex_init(&callback_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
+
        if (session) {
                suuid = switch_core_session_sprintf(session, "main::uuid_%s\n", switch_core_session_get_uuid(session));
                for (char *p = suuid; p && *p; p++) {
@@ -52,6 +56,10 @@ void Session::destroy(void)
                return;
        }
 
+       switch_mutex_lock(callback_mutex);
+       destroying = 1;
+       switch_mutex_unlock(callback_mutex);
+
        if (session) {
                if (!channel) {
                        channel = switch_core_session_get_channel(session);
@@ -216,71 +224,79 @@ void Session::setInputCallback(char *cbfunc, char *funcargs)
 
 switch_status_t Session::run_dtmf_callback(void *input, switch_input_type_t itype)
 {
+       switch_status_t status = SWITCH_STATUS_SUCCESS;
+       
        if (!getPERL()) {
                return SWITCH_STATUS_FALSE;;
        }
 
-       switch (itype) {
-       case SWITCH_INPUT_TYPE_DTMF:
-               {
-                       switch_dtmf_t *dtmf = (switch_dtmf_t *) input;
-                       char str[32] = "";
-                       int arg_count = 2;
-                       HV *hash;
-                       SV *this_sv;
-                       char *code;
-
-                       if (!(hash = get_hv("__dtmf", TRUE))) {
-                               abort();
-                       }
+       switch_mutex_lock(callback_mutex);
+
+       if (!destroying) {
+               switch (itype) {
+               case SWITCH_INPUT_TYPE_DTMF:
+                       {
+                               switch_dtmf_t *dtmf = (switch_dtmf_t *) input;
+                               char str[32] = "";
+                               int arg_count = 2;
+                               HV *hash;
+                               SV *this_sv;
+                               char *code;
+
+                               if (!(hash = get_hv("__dtmf", TRUE))) {
+                                       abort();
+                               }
 
-                       str[0] = dtmf->digit;
-                       this_sv = newSV(strlen(str) + 1);
-                       sv_setpv(this_sv, str);
-                       hv_store(hash, "digit", 5, this_sv, 0);
+                               str[0] = dtmf->digit;
+                               this_sv = newSV(strlen(str) + 1);
+                               sv_setpv(this_sv, str);
+                               hv_store(hash, "digit", 5, this_sv, 0);
 
-                       switch_snprintf(str, sizeof(str), "%d", dtmf->duration);
-                       this_sv = newSV(strlen(str) + 1);
-                       sv_setpv(this_sv, str);
-                       hv_store(hash, "duration", 8, this_sv, 0);
+                               switch_snprintf(str, sizeof(str), "%d", dtmf->duration);
+                               this_sv = newSV(strlen(str) + 1);
+                               sv_setpv(this_sv, str);
+                               hv_store(hash, "duration", 8, this_sv, 0);
 
-                       code = switch_mprintf("eval { $__RV = &%s($%s, 'dtmf', \\%%__dtmf, %s);};", cb_function, suuid, switch_str_nil(cb_arg));
-                       Perl_eval_pv(my_perl, code, FALSE);
-                       free(code);
+                               code = switch_mprintf("eval { $__RV = &%s($%s, 'dtmf', \\%%__dtmf, %s);};", cb_function, suuid, switch_str_nil(cb_arg));
+                               Perl_eval_pv(my_perl, code, FALSE);
+                               free(code);
 
-                       return process_callback_result(SvPV(get_sv("__RV", TRUE), n_a));
-               }
-               break;
-       case SWITCH_INPUT_TYPE_EVENT:
-               {
-                       switch_event_t *event = (switch_event_t *) input;
-                       int arg_count = 2;
-                       char *code;
-                       switch_uuid_t uuid;
-                       char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
-                       char var_name[SWITCH_UUID_FORMATTED_LENGTH + 25];
-                       char *p;
-
-                       switch_uuid_get(&uuid);
-                       switch_uuid_format(uuid_str, &uuid);
-
-                       switch_snprintf(var_name, sizeof(var_name), "main::__event_%s", uuid_str);
-                       for(p = var_name; p && *p; p++) {
-                               if (*p == '-') {
-                                       *p = '_';
-                               }
+                               status = process_callback_result(SvPV(get_sv("__RV", TRUE), n_a));
                        }
+                       break;
+               case SWITCH_INPUT_TYPE_EVENT:
+                       {
+                               switch_event_t *event = (switch_event_t *) input;
+                               int arg_count = 2;
+                               char *code;
+                               switch_uuid_t uuid;
+                               char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1] = "";
+                               char var_name[SWITCH_UUID_FORMATTED_LENGTH + 25] = "";
+                               char *p;
+
+                               switch_uuid_get(&uuid);
+                               switch_uuid_format(uuid_str, &uuid);
+
+                               switch_snprintf(var_name, sizeof(var_name), "__event_%s", uuid_str);
+                               for(p = var_name; p && *p; p++) {
+                                       if (*p == '-') {
+                                               *p = '_';
+                                       }
+                               }
 
-                       mod_perl_conjure_event(my_perl, event, var_name);
-                       code = switch_mprintf("eval {$__RV = &%s($%s, 'event', $%s, '%s');};$%s = undef;",
-                                                                 cb_function, suuid, var_name, switch_str_nil(cb_arg), var_name);
-                       Perl_eval_pv(my_perl, code, FALSE);
-                       free(code);
+                               mod_perl_conjure_event(my_perl, event, var_name);
+                               code = switch_mprintf("eval {$__RV = &%s($%s, 'event', $%s, '%s');};$%s = undef;",
+                                                                         cb_function, suuid, var_name, switch_str_nil(cb_arg), var_name);
+                               Perl_eval_pv(my_perl, code, FALSE);
+                               free(code);
 
-                       return process_callback_result(SvPV(get_sv("__RV", TRUE), n_a));
+                               status = process_callback_result(SvPV(get_sv("__RV", TRUE), n_a));
+                       }
+                       break;
                }
-               break;
        }
-
-       return SWITCH_STATUS_SUCCESS;
+       
+       switch_mutex_unlock(callback_mutex);
+               
+       return status;
 }

diff --git a/src/mod/languages/mod_perl/freeswitch_perl.h b/src/mod/languages/mod_perl/freeswitch_perl.h
index 5c0e6cc3c3e29af1cf6c0a69b7b287d4b3f85733..2d98295c4ef341d1ae50ccf30488de615a211b18 100644 (file)
--- a/src/mod/languages/mod_perl/freeswitch_perl.h
+++ b/src/mod/languages/mod_perl/freeswitch_perl.h
@@ -41,6 +41,9 @@ namespace PERL {
                void unsetInputCallback(void);
                void setHangupHook(char *func, char *arg = NULL);
                bool ready();
+               switch_mutex_t *callback_mutex;
+               int destroying = 0;
+               int event_idx = 0;
                char *suuid;
                char *cb_function;
                char *cb_arg;

diff --git a/src/mod/languages/mod_perl/mod_perl.c b/src/mod/languages/mod_perl/mod_perl.c
index 24efaefb983304dff63ae9def722245eea441cbb..01795fafbb99f6b704e84d59d596bbd308a13866 100644 (file)
--- a/src/mod/languages/mod_perl/mod_perl.c
+++ b/src/mod/languages/mod_perl/mod_perl.c
@@ -143,7 +143,11 @@ static int perl_parse_and_execute(PerlInterpreter * my_perl, char *input_code, c
        return error;
 }
 
+#ifdef DEBUG_PERL
+#define HACK_CLEAN_CODE "eval{foreach my $kl(keys %main::) {eval{print qq'DEBUG: ' . $kl . '/' . $$kl . '/' . $$$kl . qq'\n';undef($$kl);} if (defined($$kl) && ($kl =~ /^\\w+[\\w\\d_]+$/))}}"
+#else
 #define HACK_CLEAN_CODE "eval{foreach my $kl(keys %main::) {eval{undef($$kl);} if (defined($$kl) && ($kl =~ /^\\w+[\\w\\d_]+$/))}}"
+#endif
 
 static void destroy_perl(PerlInterpreter ** to_destroy)
 {