fifo update

src/include/private/switch_core_pvt.h

@@ -166,6 +166,7 @@ struct switch_core_session {
 	uint32_t track_duration;
 	uint32_t track_id;
 	switch_log_level_t loglevel;
+	uint32_t soft_lock;
 };
 
 struct switch_media_bug {

src/include/switch_core.h

@@ -483,6 +483,7 @@ SWITCH_DECLARE(unsigned int) switch_core_session_started(_In_ switch_core_sessio
 
 SWITCH_DECLARE(void *) switch_core_perform_permanent_alloc(_In_ switch_size_t memory, _In_z_ const char *file, _In_z_ const char *func, _In_ int line);
 
+
 /*! 
   \brief Allocate memory from the main pool with no intention of returning it
   \param _memory the number of bytes to allocate
@@ -698,6 +699,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_loglevel(switch_core_ses
 */
 SWITCH_DECLARE(switch_log_level_t) switch_core_session_get_loglevel(switch_core_session_t *session);
 
+
+SWITCH_DECLARE(void) switch_core_session_soft_lock(switch_core_session_t *session, uint32_t sec);
+SWITCH_DECLARE(void) switch_core_session_soft_unlock(switch_core_session_t *session);
+
+
 /*! 
   \brief Retrieve the unique identifier from the core
   \return a string representing the uuid

src/mod/applications/mod_dptools/mod_dptools.c

@@ -2688,20 +2688,22 @@ static switch_call_cause_t user_outgoing_channel(switch_core_session_t *session,
 	}
 
 
+	switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS);
+	switch_assert(params);
+	switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "as_channel", "true");
+	switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "action", "user_call");
+
+	if (var_event) {
+		switch_event_merge(params, var_event);
+	}
+
 	if (var_event && (skip = switch_event_get_header(var_event, "user_recurse_variables")) && switch_false(skip)) {
 		if ((var = switch_event_get_header(var_event, SWITCH_CALL_TIMEOUT_VARIABLE)) || (var = switch_event_get_header(var_event, "leg_timeout"))) {
 			timelimit = atoi(var);
 		}
 		var_event = NULL;
 	}
-
-
-
-	switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS);
-	switch_assert(params);
-	switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "as_channel", "true");
-	switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "action", "user_call");
-
+	
 	if (switch_xml_locate_user("id", user, domain, NULL, &xml, &x_domain, &x_user, &x_group, params) != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Can't find user [%s@%s]\n", user, domain);
 		cause = SWITCH_CAUSE_SUBSCRIBER_ABSENT;

src/switch_core_session.c

@@ -38,6 +38,16 @@
 
 struct switch_session_manager session_manager;
 
+SWITCH_DECLARE(void) switch_core_session_soft_lock(switch_core_session_t *session, uint32_t sec)
+{
+	session->soft_lock = sec;
+}
+
+SWITCH_DECLARE(void) switch_core_session_soft_unlock(switch_core_session_t *session)
+{
+	session->soft_lock = 0;
+}
+
 #ifdef SWITCH_DEBUG_RWLOCKS
 SWITCH_DECLARE(switch_core_session_t *) switch_core_session_perform_locate(const char *uuid_str, const char *file, const char *func, int line)
 #else
@@ -1174,6 +1184,21 @@ static void *SWITCH_THREAD_FUNC switch_core_session_thread(switch_thread_t *thre
 
 	switch_core_session_run(session);
 	switch_core_media_bug_remove_all(session);
+
+	if (session->soft_lock) {
+		uint32_t loops = session->soft_lock * 10;
+
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Session %" SWITCH_SIZE_T_FMT " (%s) Soft-Locked, "
+						  "Waiting %u for external entities\n",
+						  session->id, switch_channel_get_name(session->channel), session->soft_lock);
+
+		while(--loops > 0) {
+			if (!session->soft_lock) break;
+			switch_yield(100000);
+		}
+
+	}
+
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Session %" SWITCH_SIZE_T_FMT " (%s) Locked, Waiting on external entities\n",
 					  session->id, switch_channel_get_name(session->channel));
 	switch_core_session_write_lock(session);