<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14652] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14652">14652</a></dd>
<dt>Author</dt> <dd>andrew</dd>
<dt>Date</dt> <dd>2009-08-27 16:41:47 -0500 (Thu, 27 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use our own memory pool instead of the sessions</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodevent_handlersmod_erlang_eventmod_erlang_eventc">freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c</a></li>
<li><a href="#freeswitchtrunksrcmodevent_handlersmod_erlang_eventmod_erlang_eventh">freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodevent_handlersmod_erlang_eventmod_erlang_eventc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (14651 => 14652)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c 2009-08-27 20:02:35 UTC (rev 14651)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c 2009-08-27 21:41:47 UTC (rev 14652)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> SWITCH_MODULE_DEFINITION(mod_erlang_event, mod_erlang_event_load, mod_erlang_event_shutdown, mod_erlang_event_runtime);
</span><span class="cx">
</span><span class="cx"> static void remove_listener(listener_t *listener);
</span><ins>+static switch_status_t state_handler(switch_core_session_t *session);
</ins><span class="cx">
</span><span class="cx"> SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_pref_ip, prefs.ip);
</span><span class="cx"> SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_pref_cookie, prefs.cookie);
</span><span class="lines">@@ -147,7 +148,7 @@
</span><span class="cx"> for (s = listener->session_list; s; s = s->next) {
</span><span class="cx"> /* check the event uuid against the uuid of each session */
</span><span class="cx"> if (!strcmp(uuid, s->uuid_str)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_UUID_LOG(s->uuid_str), SWITCH_LOG_DEBUG, "Sending event to attached session for %s\n", s->uuid_str);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_UUID_LOG(s->uuid_str), SWITCH_LOG_DEBUG, "Sending event %s to attached session for %s\n", switch_event_name(event->event_id), s->uuid_str);
</ins><span class="cx"> if (switch_event_dup(&clone, event) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> /* add the event to the queue for this session */
</span><span class="cx"> if (switch_queue_trypush(s->event_queue, clone) != SWITCH_STATUS_SUCCESS) {
</span><span class="lines">@@ -312,7 +313,6 @@
</span><span class="cx"> static void remove_session_elem_from_listener(listener_t *listener, session_elem_t *session_element)
</span><span class="cx"> {
</span><span class="cx"> session_elem_t *s, *last = NULL;
</span><del>- switch_core_session_t *session;
</del><span class="cx">
</span><span class="cx"> if (!session_element)
</span><span class="cx"> return;
</span><span class="lines">@@ -325,20 +325,26 @@
</span><span class="cx"> } else {
</span><span class="cx"> listener->session_list = s->next;
</span><span class="cx"> }
</span><del>- if ((session = switch_core_session_locate(session_element->uuid_str))) {
- switch_channel_clear_flag(switch_core_session_get_channel(session), CF_CONTROLLED);
- switch_core_session_rwunlock(session);
- }
- /* this allows the application threads to exit */
- switch_clear_flag_locked(s, LFLAG_SESSION_ALIVE);
- switch_safe_free(s);
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> last = s;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void destroy_session_elem(session_elem_t *session_element)
+{
+ switch_core_session_t *session;
</ins><span class="cx">
</span><ins>+ if ((session = switch_core_session_locate(session_element->uuid_str))) {
+ switch_channel_clear_flag(switch_core_session_get_channel(session), CF_CONTROLLED);
+ switch_core_session_rwunlock(session);
+ }
+ /* this allows the application threads to exit */
+ switch_clear_flag_locked(session_element, LFLAG_SESSION_ALIVE);
+ switch_core_destroy_memory_pool(&session_element->pool);
+ /*switch_safe_free(s);*/
+}
+
</ins><span class="cx"> static void remove_session_elem_from_listener_locked(listener_t *listener, session_elem_t *session_element) {
</span><span class="cx"> switch_mutex_lock(listener->session_mutex);
</span><span class="cx"> remove_session_elem_from_listener(listener, session_element);
</span><span class="lines">@@ -537,9 +543,52 @@
</span><span class="cx"> }
</span><span class="cx"> switch_set_flag(sp, LFLAG_OUTBOUND_INIT);
</span><span class="cx"> }
</span><del>- /* check event queue for this session */
- if (switch_queue_trypop(sp->event_queue, &pop) == SWITCH_STATUS_SUCCESS) {
</del><ins>+
+ if (switch_test_flag(sp, LFLAG_SESSION_COMPLETE)) {
+ ei_x_buff ebuf;
+
+ /* flush the event queue */
+ while (switch_queue_trypop(sp->event_queue, &pop) == SWITCH_STATUS_SUCCESS) {
+ switch_event_t *pevent = (switch_event_t *) pop;
+
+ /*switch_log_printf(SWITCH_CHANNEL_UUID_LOG(sp->uuid_str), SWITCH_LOG_DEBUG, "flushed event %s for %s\n", switch_event_name(pevent->event_id), sp->uuid_str);*/
+
+ /* events from attached sessions are wrapped in a {call_event,<EVT>} tuple
+ to distinguish them from normal events (if they are sent to the same process)
+ */
+
+ ei_x_new_with_version(&ebuf);
+ ei_x_encode_tuple_header(&ebuf, 2);
+ ei_x_encode_atom(&ebuf, "call_event");
+ ei_encode_switch_event(&ebuf, pevent);
+
+ switch_mutex_lock(listener->sock_mutex);
+ ei_sendto(listener->ec, listener->sockfd, &sp->process, &ebuf);
+ switch_mutex_unlock(listener->sock_mutex);
+ ei_x_free(&ebuf);
+ switch_event_destroy(&pevent);
+ }
+ /* this session can be removed */
+ switch_log_printf(SWITCH_CHANNEL_UUID_LOG(sp->uuid_str), SWITCH_LOG_DEBUG, "Destroy event for attached session for %s in state %s\n", sp->uuid_str, switch_channel_state_name(sp->channel_state));
+
+ ei_x_new_with_version(&ebuf);
+ ei_x_encode_atom(&ebuf, "call_hangup");
+ switch_mutex_lock(listener->sock_mutex);
+ ei_sendto(listener->ec, listener->sockfd, &sp->process, &ebuf);
+ switch_mutex_unlock(listener->sock_mutex);
+ ei_x_free(&ebuf);
+ removed = sp;
+ sp = removed->next;
+
+ remove_session_elem_from_listener(listener, removed);
+ destroy_session_elem(removed);
+ continue;
+ } else if (switch_queue_trypop(sp->event_queue, &pop) == SWITCH_STATUS_SUCCESS) {
+
+ /* check event queue for this session */
</ins><span class="cx"> switch_event_t *pevent = (switch_event_t *) pop;
</span><ins>+
+ /*switch_log_printf(SWITCH_CHANNEL_UUID_LOG(sp->uuid_str), SWITCH_LOG_DEBUG, "popped event %s for %s\n", switch_event_name(pevent->event_id), sp->uuid_str);*/
</ins><span class="cx">
</span><span class="cx"> /* events from attached sessions are wrapped in a {call_event,<EVT>} tuple
</span><span class="cx"> to distinguish them from normal events (if they are sent to the same process)
</span><span class="lines">@@ -556,33 +605,9 @@
</span><span class="cx"> switch_mutex_unlock(listener->sock_mutex);
</span><span class="cx"> ei_x_free(&ebuf);
</span><span class="cx">
</span><del>- /* event is a channel destroy, so this session can be removed */
- if (pevent->event_id == SWITCH_EVENT_CHANNEL_DESTROY) {
- switch_log_printf(SWITCH_CHANNEL_UUID_LOG(sp->uuid_str), SWITCH_LOG_DEBUG, "Destroy event for attached session for %s in state %s\n", sp->uuid_str, switch_channel_state_name(sp->channel_state));
-
- /* this allows the application threads to exit */
- removed = sp;
-
- ei_x_new_with_version(&ebuf);
- ei_x_encode_atom(&ebuf, "call_hangup");
- switch_mutex_lock(listener->sock_mutex);
- ei_sendto(listener->ec, listener->sockfd, &sp->process, &ebuf);
- switch_mutex_unlock(listener->sock_mutex);
- ei_x_free(&ebuf);
-
- /* TODO
- if this listener was created outbound, and the last session has been detached
- should the listener also exit? Does it matter?
- */
- }
</del><span class="cx"> switch_event_destroy(&pevent);
</span><span class="cx"> }
</span><span class="cx"> sp = sp->next;
</span><del>- if (removed) {
- remove_session_elem_from_listener(listener, removed);
- } else {
- last = sp;
- }
</del><span class="cx"> }
</span><span class="cx"> switch_mutex_unlock(listener->session_mutex);
</span><span class="cx"> return status;
</span><span class="lines">@@ -685,12 +710,13 @@
</span><span class="cx"> switch_channel_t *channel = switch_core_session_get_channel(session);
</span><span class="cx"> switch_channel_set_private(channel, "_erlang_session_", NULL);
</span><span class="cx"> switch_channel_set_private(channel, "_erlang_listener_", NULL);
</span><del>- /* TODO can we clear out the state_change hook too? */
</del><ins>+ switch_core_event_hook_remove_state_change(session, state_handler);
</ins><span class="cx"> switch_core_session_rwunlock(session);
</span><span class="cx"> }
</span><span class="cx"> /* TODO - if a spawned process that was handling an outbound call fails.. what do we do with the call? */
</span><span class="cx"> }
</span><span class="cx"> remove_session_elem_from_listener_locked(listener, s);
</span><ins>+ destroy_session_elem(s);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (listener->log_process.type == ERLANG_PID && !ei_compare_pids(&listener->log_process.pid, pid)) {
</span><span class="lines">@@ -713,7 +739,10 @@
</span><span class="cx">
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Event handler process for node %s exited\n", pid->node);
</span><span class="cx"> /*purge the event queue */
</span><del>- while (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS);
</del><ins>+ while (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS) {
+ switch_event_t *pevent = (switch_event_t *) pop;
+ switch_event_destroy(&pevent);
+ }
</ins><span class="cx">
</span><span class="cx"> if (switch_test_flag(listener, LFLAG_EVENTS)) {
</span><span class="cx"> uint8_t x = 0;
</span><span class="lines">@@ -906,6 +935,7 @@
</span><span class="cx">
</span><span class="cx"> /* clean up all the attached sessions */
</span><span class="cx"> switch_mutex_lock(listener->session_mutex);
</span><ins>+ /* TODO destroy memory pools since they're not children of the listener's pool*/
</ins><span class="cx"> for (s = listener->session_list; s; s = s->next) {
</span><span class="cx"> if ((session = switch_core_session_locate(s->uuid_str))) {
</span><span class="cx"> switch_channel_clear_flag(switch_core_session_get_channel(session), CF_CONTROLLED);
</span><span class="lines">@@ -1076,6 +1106,11 @@
</span><span class="cx">
</span><span class="cx"> if (session_element) {
</span><span class="cx"> session_element->channel_state = state;
</span><ins>+ if (state == CS_DESTROY) {
+ /* indicate that once all the events in the event queue are done
+ * we can throw this away */
+ switch_set_flag(session_element, LFLAG_SESSION_COMPLETE);
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to update channel state for %s to %s\n", switch_core_session_get_uuid(session), switch_channel_state_name(state));
</span><span class="cx"> }
</span><span class="lines">@@ -1086,15 +1121,25 @@
</span><span class="cx"> session_elem_t *session_elem_create(listener_t* listener, switch_core_session_t *session)
</span><span class="cx"> {
</span><span class="cx"> /* create a session list element */
</span><del>- session_elem_t* session_element = malloc(sizeof(*session_element));
</del><ins>+ switch_memory_pool_t *session_elem_pool;
+ session_elem_t* session_element;/* = malloc(sizeof(*session_element));*/
</ins><span class="cx"> switch_channel_t *channel = switch_core_session_get_channel(session);
</span><span class="cx">
</span><ins>+ if (switch_core_new_memory_pool(&session_elem_pool) != SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "OH OH no pool\n");
+ return NULL;
+ }
+
+ session_element = switch_core_alloc(session_elem_pool, sizeof(*session_element));
+
</ins><span class="cx"> memset(session_element, 0, sizeof(*session_element));
</span><span class="cx">
</span><span class="cx"> memcpy(session_element->uuid_str, switch_core_session_get_uuid(session), SWITCH_UUID_FORMATTED_LENGTH);
</span><ins>+ session_element->pool = session_elem_pool;
+ session_elem_pool = NULL;
</ins><span class="cx">
</span><del>- switch_queue_create(&session_element->event_queue, SWITCH_CORE_QUEUE_LEN, switch_core_session_get_pool(session));
- switch_mutex_init(&session_element->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
</del><ins>+ switch_queue_create(&session_element->event_queue, SWITCH_CORE_QUEUE_LEN, session_element->pool);
+ switch_mutex_init(&session_element->flag_mutex, SWITCH_MUTEX_NESTED, session_element->pool);
</ins><span class="cx">
</span><span class="cx"> switch_channel_set_private(channel, "_erlang_session_", session_element);
</span><span class="cx"> switch_channel_set_private(channel, "_erlang_listener_", listener);
</span><span class="lines">@@ -1184,6 +1229,7 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timed out when waiting for outbound pid\n");
</span><span class="cx"> remove_session_elem_from_listener_locked(listener,session_element);
</span><span class="cx"> switch_core_hash_insert(listener->spawn_pid_hash, hash, &globals.TIMEOUT); /* TODO lock this? */
</span><ins>+ destroy_session_elem(session_element);
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx"> i++;
</span><span class="lines">@@ -1399,7 +1445,7 @@
</span><span class="cx"> stream->write_function(stream, "Could not find a listener for %s\n", argv[1]);
</span><span class="cx">
</span><span class="cx"> } else {
</span><del>- stream->write_function(stream, "I don't care for those arguments at all, sorry");
</del><ins>+ stream->write_function(stream, "USAGE: erlang sessions <nodename>\n");
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodevent_handlersmod_erlang_eventmod_erlang_eventh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h (14651 => 14652)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h 2009-08-27 20:02:35 UTC (rev 14651)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h 2009-08-27 21:41:47 UTC (rev 14652)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> LFLAG_WAITING_FOR_PID = (1 << 0), /* waiting for a node to return a pid */
</span><span class="cx"> LFLAG_OUTBOUND_INIT = (1 << 1), /* Erlang peer has been notified of this session */
</span><span class="cx"> LFLAG_SESSION_ALIVE = (1 << 2),
</span><ins>+ LFLAG_SESSION_COMPLETE = (1 << 3),
</ins><span class="cx"> } session_flag_t;
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="lines">@@ -61,6 +62,7 @@
</span><span class="cx"> struct erlang_process process;
</span><span class="cx"> switch_queue_t *event_queue;
</span><span class="cx"> switch_channel_state_t channel_state;
</span><ins>+ switch_memory_pool_t *pool;
</ins><span class="cx"> struct session_elem *next;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>