<!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][14555] </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=14555">14555</a></dd>
<dt>Author</dt> <dd>mrene</dd>
<dt>Date</dt> <dd>2009-08-18 13:24:31 -0500 (Tue, 18 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>refactor node allocation and make a copy of userdata in case the session gets killed before the logger module gets the node</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_logh">freeswitch/trunk/src/include/switch_log.h</a></li>
<li><a href="#freeswitchtrunksrcswitch_logc">freeswitch/trunk/src/switch_log.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_logh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_log.h (14554 => 14555)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_log.h 2009-08-18 16:58:26 UTC (rev 14554)
+++ freeswitch/trunk/src/include/switch_log.h 2009-08-18 18:24:31 UTC (rev 14555)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> switch_time_t timestamp;
</span><span class="cx"> /*! A pointer to where the actual content of the message starts (skipping past the preformatted portion) */
</span><span class="cx"> char *content;
</span><del>- const char *userdata;
</del><ins>+ char *userdata;
</ins><span class="cx"> /* To maintain abi, only add new elements to the end of this struct and do not delete any elements */
</span><span class="cx"> switch_text_channel_t channel;
</span><span class="cx"> } switch_log_node_t;
</span><span class="lines">@@ -143,6 +143,9 @@
</span><span class="cx"> SWITCH_DECLARE(uint32_t) switch_log_str2mask(_In_z_ const char *str);
</span><span class="cx"> #define switch_log_check_mask(_mask, _level) (_mask & (1 << _level))
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(switch_log_node_t*) switch_log_node_alloc();
+SWITCH_DECLARE(void) switch_log_node_free(switch_log_node_t **node);
+
</ins><span class="cx"> ///\}
</span><span class="cx"> SWITCH_END_EXTERN_C
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_logc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_log.c (14554 => 14555)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_log.c 2009-08-18 16:58:26 UTC (rev 14554)
+++ freeswitch/trunk/src/switch_log.c 2009-08-18 18:24:31 UTC (rev 14555)
</span><span class="lines">@@ -332,6 +332,9 @@
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Log-Function", funcp);
</span><span class="cx"> switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-Line", "%d", line);
</span><span class="cx"> switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-Level", "%d", (int) level);
</span><ins>+ if (!switch_strlen_zero(userdata)) {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "User-Data", userdata);
+ }
</ins><span class="cx"> switch_event_fire(&event);
</span><span class="cx"> data = NULL;
</span><span class="cx"> }
</span><span class="lines">@@ -378,19 +381,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (do_mods && level <= MAX_LEVEL) {
</span><del>- switch_log_node_t *node;
-#ifdef SWITCH_LOG_RECYCLE
- void *pop = NULL;
-
- if (switch_queue_trypop(LOG_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) {
- node = (switch_log_node_t *) pop;
- } else {
-#endif
- node = malloc(sizeof(*node));
- switch_assert(node);
-#ifdef SWITCH_LOG_RECYCLE
- }
-#endif
</del><ins>+ switch_log_node_t *node = switch_log_node_alloc();
</ins><span class="cx">
</span><span class="cx"> node->data = data;
</span><span class="cx"> data = NULL;
</span><span class="lines">@@ -401,18 +392,10 @@
</span><span class="cx"> node->content = content;
</span><span class="cx"> node->timestamp = now;
</span><span class="cx"> node->channel = channel;
</span><del>- node->userdata = userdata;
</del><ins>+ node->userdata = !switch_strlen_zero(userdata) ? strdup(userdata) : NULL;
</ins><span class="cx">
</span><span class="cx"> if (switch_queue_trypush(LOG_QUEUE, node) != SWITCH_STATUS_SUCCESS) {
</span><del>- free(node->data);
-#ifdef SWITCH_LOG_RECYCLE
- if (switch_queue_trypush(LOG_RECYCLE_QUEUE, node) != SWITCH_STATUS_SUCCESS) {
- free(node);
- }
-#else
- free(node);
-#endif
- node = NULL;
</del><ins>+ switch_log_node_free(&node);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -471,7 +454,7 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Returning %d recycled log node(s) %d bytes\n", size,
</span><span class="cx"> (int) sizeof(switch_log_node_t) * size);
</span><span class="cx"> while (switch_queue_trypop(LOG_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) {
</span><del>- free(pop);
</del><ins>+ switch_log_node_free(&pop);
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> return;
</span><span class="lines">@@ -496,6 +479,48 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(switch_log_node_t*) switch_log_node_alloc()
+{
+ switch_log_node_t *node = NULL;
+#ifdef SWITCH_LOG_RECYCLE
+ void *pop = NULL;
+
+ if (switch_queue_trypop(LOG_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) {
+ node = (switch_log_node_t *) pop;
+ } else {
+#endif
+ node = malloc(sizeof(*node));
+ switch_assert(node);
+#ifdef SWITCH_LOG_RECYCLE
+ }
+#endif
+ return node;
+}
+
+SWITCH_DECLARE(void) switch_log_node_free(switch_log_node_t **pnode)
+{
+ switch_log_node_t *node;
+
+ if (!pnode) {
+ return;
+ }
+
+ node = *pnode;
+
+ if (node) {
+ switch_safe_free(node->userdata);
+ switch_safe_free(node->data);
+#ifdef SWITCH_LOG_RECYCLE
+ if (switch_queue_trypush(LOG_RECYCLE_QUEUE, node) != SWITCH_STATUS_SUCCESS) {
+ free(node);
+ }
+#else
+ free(node);
+#endif
+ }
+ *pnode = NULL;
+}
+
</ins><span class="cx"> /* For Emacs:
</span><span class="cx"> * Local Variables:
</span><span class="cx"> * mode:c
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>