add some robustness to deal with runaway threads

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5140 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/include/switch_core.h b/src/include/switch_core.h
index c654ae2ab743165025ed2e2ca3ff2822ef80cf5f..59c59bdc908b7aadee8c74c790851c27e377968e 100644 (file)
--- a/src/include/switch_core.h
+++ b/src/include/switch_core.h
@@ -428,12 +428,15 @@ SWITCH_DECLARE(switch_memory_pool_t *) switch_core_session_get_pool(switch_core_
 SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request(const switch_endpoint_interface_t
                                                                                                                                        *endpoint_interface, switch_memory_pool_t **pool);
 
+
+SWITCH_DECLARE(void) switch_core_session_perform_destroy(switch_core_session_t **session, const char *file, const char *func, int line);
+
 /*! 
   \brief Destroy a session and return the memory pool to the core
   \param session pointer to a pointer of the session to destroy
   \return
 */
-SWITCH_DECLARE(void) switch_core_session_destroy(switch_core_session_t **session);
+#define switch_core_session_destroy(session) switch_core_session_perform_destroy(session, __FILE__, __SWITCH_FUNC__, __LINE__)
 
 /*! 
   \brief Provide the total number of sessions
@@ -458,8 +461,9 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_by_name(char
 /*! 
   \brief Launch the session thread (state machine) on a given session
   \param session the session to activate the state machine on
+  \return SWITCH_STATUS_SUCCESS if the thread was launched
 */
-SWITCH_DECLARE(void) switch_core_session_thread_launch(switch_core_session_t *session);
+SWITCH_DECLARE(switch_status_t) switch_core_session_thread_launch(switch_core_session_t *session);
 
 /*! 
   \brief Retrieve a pointer to the channel object associated with a given session

diff --git a/src/mod/endpoints/mod_alsa/mod_alsa.c b/src/mod/endpoints/mod_alsa/mod_alsa.c
index 2457317d670a40b02e809b3f8206f4e1b6b9d4b1..eed38b69bd12dcd93a24167c10858353a4b134d8 100644 (file)
--- a/src/mod/endpoints/mod_alsa/mod_alsa.c
+++ b/src/mod/endpoints/mod_alsa/mod_alsa.c
@@ -1504,9 +1504,15 @@ static switch_status_t place_call(char **argv, int argc, switch_stream_handle_t
                        switch_set_flag_locked(tech_pvt, TFLAG_ANSWER);
                        switch_channel_mark_answered(channel);
                        switch_channel_set_state(channel, CS_INIT);
-                       switch_core_session_thread_launch(tech_pvt->session);
-                       add_pvt(tech_pvt, PA_MASTER);
-                       stream->write_function(stream, "SUCCESS:%s:%s\n", tech_pvt->call_id, switch_core_session_get_uuid(tech_pvt->session));
+
+                       if (switch_core_session_thread_launch(tech_pvt->session) != SWITCH_STATUS_SUCCESS) {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n");
+                               switch_core_session_destroy(&session);
+                               stream->write_function(stream, "FAIL:Thread Error!\n");
+                       } else {
+                               add_pvt(tech_pvt, PA_MASTER);
+                               stream->write_function(stream, "SUCCESS:%s:%s\n", tech_pvt->call_id, switch_core_session_get_uuid(tech_pvt->session));
+                       }
                } else {
                        switch_core_session_destroy(&session);
                        stream->write_function(stream, "FAIL:Device Error!\n");

diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.c b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
index a275d26c30033d7cfd78741608d3ac6755a84c01..399676596e92442159759c24bc4274b7fe6ad94a 100644 (file)
--- a/src/mod/endpoints/mod_dingaling/mod_dingaling.c
+++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
@@ -2720,7 +2720,12 @@ static ldl_status handle_signalling(ldl_handle_t * handle, ldl_session_t * dlses
                        tech_pvt->dlsession = dlsession;
                        switch_channel_set_name(channel, "DingaLing/new");
                        switch_channel_set_state(channel, CS_INIT);
-                       switch_core_session_thread_launch(session);
+                       if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) {
+                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n");
+                               terminate_session(&session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
+                status = LDL_STATUS_FALSE;
+                goto done;
+                       }
                } else {
                        status = LDL_STATUS_FALSE;
                        goto done;

diff --git a/src/mod/endpoints/mod_iax/mod_iax.c b/src/mod/endpoints/mod_iax/mod_iax.c
index 4c1fa52a5641460b90b34e90df1eabe44cc63d32..417484e137e4e6da280c18d79d7e4be8e946bd39 100644 (file)
--- a/src/mod/endpoints/mod_iax/mod_iax.c
+++ b/src/mod/endpoints/mod_iax/mod_iax.c
@@ -1128,7 +1128,10 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_runtime(void)
                                                        iax_accept(tech_pvt->iax_session, tech_pvt->codec);
                                                        iax_ring_announce(tech_pvt->iax_session);
                                                        switch_channel_set_state(channel, CS_INIT);
-                                                       switch_core_session_thread_launch(session);
+                                                       if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) {
+                                                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n");
+                                                               switch_core_session_destroy(&session);
+                                                       }
                                                }
                                        }
                                }

diff --git a/src/mod/endpoints/mod_portaudio/mod_portaudio.c b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
index 2b8d1710691cbe1cc1f809a358fa6542b465af03..ba540be2711d2448752768b3c844d6722d674d44 100644 (file)
--- a/src/mod/endpoints/mod_portaudio/mod_portaudio.c
+++ b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
@@ -1694,9 +1694,14 @@ static switch_status_t place_call(char **argv, int argc, switch_stream_handle_t
                        switch_set_flag_locked(tech_pvt, TFLAG_ANSWER);
                        switch_channel_mark_answered(channel);
                        switch_channel_set_state(channel, CS_INIT);
-                       switch_core_session_thread_launch(tech_pvt->session);
-                       add_pvt(tech_pvt, PA_MASTER);
-                       stream->write_function(stream, "SUCCESS:%s:%s\n", tech_pvt->call_id, switch_core_session_get_uuid(tech_pvt->session));
+                       if (switch_core_session_thread_launch(tech_pvt->session) != SWITCH_STATUS_SUCCESS) {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n");
+                               switch_core_session_destroy(&session);
+                               stream->write_function(stream, "FAIL:Thread Error!\n");
+                       } else {
+                               add_pvt(tech_pvt, PA_MASTER);
+                               stream->write_function(stream, "SUCCESS:%s:%s\n", tech_pvt->call_id, switch_core_session_get_uuid(tech_pvt->session));
+                       }
                } else {
                        switch_core_session_destroy(&session);
                        stream->write_function(stream, "FAIL:Device Error!\n");

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.h b/src/mod/endpoints/mod_sofia/mod_sofia.h
index 628311736efdd46c4566113b3ba847bf70bf1c31..351450ea3ea6047d7774eaaae481bbc9797ce850 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.h
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.h
@@ -242,6 +242,7 @@ struct sofia_profile {
        switch_thread_rwlock_t *rwlock;
        switch_mutex_t *flag_mutex;
        uint32_t inuse;
+       uint32_t soft_max;
        time_t started;
 #ifdef SWITCH_HAVE_ODBC
        char *odbc_dsn;

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index fb0d873a6d30800922ca411b31b694a17be157ae..fbc6ee048ddf5ee78bfe7b9b8a09a9e047051d4d 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -1703,10 +1703,17 @@ void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_
        const char *context = NULL;
        char network_ip[80];
        switch_event_t *v_event = NULL;
+       uint32_t sess_count = switch_core_session_count();
+       uint32_t sess_max = switch_core_session_limit(0);
+
+       if ((profile->soft_max && sess_count >= profile->soft_max) || sess_count >= sess_max) {
+               nua_respond(nh, 480, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END());
+               return;
+       }
 
        if (!sip || !sip->sip_request || !sip->sip_request->rq_method_name) {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received an invalid packet!\n");
-               nua_respond(nh, SIP_500_INTERNAL_SERVER_ERROR, TAG_END());
+               nua_respond(nh, SIP_503_SERVICE_UNAVAILABLE, TAG_END());
                return;
        }
 
@@ -1906,7 +1913,33 @@ void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_
        switch_copy_string(tech_pvt->sofia_private->uuid, switch_core_session_get_uuid(session), sizeof(tech_pvt->sofia_private->uuid));
        nua_handle_bind(nh, tech_pvt->sofia_private);
        tech_pvt->nh = nh;
-       switch_core_session_thread_launch(session);
+
+       if (switch_core_session_thread_launch(session) == SWITCH_STATUS_SUCCESS) {
+               return;
+       }
+
+       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "LUKE: I'm hit, but not bad.\n");
+                                         
+       switch_mutex_lock(profile->flag_mutex);
+
+       profile->soft_max = sess_count - 10;
+       switch_core_session_limit(profile->soft_max);
+       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "LUKE'S VOICE: Artoo, see what you can do with it. Hang on back there....\n"
+                                         "Green laserfire moves past the beeping little robot as his head turns.  "
+                                         "After a few beeps and a twist of his mechanical arm,\n"
+                                         "Artoo reduces the max sessions to %d thus, saving the switch from certian doom.\n", 
+                                         profile->soft_max);
+
+       switch_mutex_unlock(profile->flag_mutex);
+
+       if (tech_pvt->hash_key) {
+               switch_core_hash_delete(tech_pvt->profile->chat_hash, tech_pvt->hash_key);
+       }
+
+       nua_handle_bind(nh, NULL);
+       free(tech_pvt->sofia_private);
+       switch_core_session_destroy(&session);
+       nua_respond(nh, 480, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END());
 }
 
 void sofia_handle_sip_i_options(int status,

diff --git a/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c b/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
index fe19e89301ea0f17914e92878ef12eb1942dd769..34a0f49577099141f3ae128888e2723df8d24c64 100644 (file)
--- a/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
+++ b/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
@@ -1562,6 +1562,12 @@ static int on_ring(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri
                switch_copy_string(chanmap->map[pevent->ring.channel], switch_core_session_get_uuid(session), sizeof(chanmap->map[pevent->ring.channel]));
                
                switch_channel_set_state(channel, CS_INIT);
+               if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) {
+                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n");
+                       switch_core_session_destroy(&session);
+                       ret = 0;
+                       goto done;
+               }
                switch_core_session_thread_launch(session);
        } else {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create new Inbound Channel!\n");

diff --git a/src/mod/endpoints/mod_woomera/mod_woomera.c b/src/mod/endpoints/mod_woomera/mod_woomera.c
index 78d005b0ef738624d2ad9de70068188eab4ef622..5bcd51ba1715e16fd63b49f2cbf84ba5d6fedb0e 100644 (file)
--- a/src/mod/endpoints/mod_woomera/mod_woomera.c
+++ b/src/mod/endpoints/mod_woomera/mod_woomera.c
@@ -1240,7 +1240,11 @@ static void *woomera_thread_run(void *obj)
                                                break;
                                        }
                                        switch_channel_set_state(channel, CS_INIT);
-                                       switch_core_session_thread_launch(session);
+                                       if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) {
+                                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n");
+                                               switch_core_session_destroy(&session);
+                                               break;
+                                       }
                                }
                        }
                }

diff --git a/src/switch_core_session.c b/src/switch_core_session.c
index df4e4f8764c3856086ec2dc8d489e8ca6751fab2..938756b9e7ec3043fff0cb993ecf8dd9820e976b 100644 (file)
--- a/src/switch_core_session.c
+++ b/src/switch_core_session.c
@@ -651,13 +651,15 @@ SWITCH_DECLARE(unsigned int) switch_core_session_running(switch_core_session_t *
 }
 
 
-SWITCH_DECLARE(void) switch_core_session_destroy(switch_core_session_t **session)
+SWITCH_DECLARE(void) switch_core_session_perform_destroy(switch_core_session_t **session, const char *file, const char *func, int line)
 {
        switch_memory_pool_t *pool;
        switch_event_t *event;
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Close Channel %s\n", switch_channel_get_name((*session)->channel));
-
+       switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_NOTICE, "Close Channel %s [%s]\n", 
+                                         switch_channel_get_name((*session)->channel),
+                                         switch_channel_state_name(switch_channel_get_state((*session)->channel)));
+       
        switch_ivr_deactivate_unicast(*session);
        
        switch_scheduler_del_task_group((*session)->uuid_str);
@@ -711,7 +713,7 @@ static void *SWITCH_THREAD_FUNC switch_core_session_thread(switch_thread_t * thr
 }
 
 
-SWITCH_DECLARE(void) switch_core_session_thread_launch(switch_core_session_t *session)
+SWITCH_DECLARE(switch_status_t) switch_core_session_thread_launch(switch_core_session_t *session)
 {
        switch_thread_t *thread;
        switch_threadattr_t *thd_attr;;
@@ -720,10 +722,16 @@ SWITCH_DECLARE(void) switch_core_session_thread_launch(switch_core_session_t *se
 
        if (!session->thread_running) {
                switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-               if (switch_thread_create(&thread, thd_attr, switch_core_session_thread, session, session->pool) != SWITCH_STATUS_SUCCESS) {
-                       switch_core_session_destroy(&session);
+               if (switch_thread_create(&thread, thd_attr, switch_core_session_thread, session, session->pool) == SWITCH_STATUS_SUCCESS) {
+                       return SWITCH_STATUS_SUCCESS;
+               } else {
+                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot create thread!\n");
                }
+       } else {
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot double-launch thread!\n");
        }
+
+       return SWITCH_STATUS_FALSE;
 }