<!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][15183] </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=15183">15183</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-10-20 13:44:29 -0500 (Tue, 20 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/FSCORE-470">FSCORE-470</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcswitch_core_sqldbc">freeswitch/trunk/src/switch_core_sqldb.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcswitch_core_sqldbc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_sqldb.c (15182 => 15183)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_sqldb.c 2009-10-20 18:07:24 UTC (rev 15182)
+++ freeswitch/trunk/src/switch_core_sqldb.c 2009-10-20 18:44:29 UTC (rev 15183)
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx"> switch_core_db_t *event_db;
</span><span class="cx"> switch_queue_t *sql_queue[2];
</span><span class="cx"> switch_memory_pool_t *memory_pool;
</span><ins>+ switch_event_node_t *event_node;
+ switch_thread_t *thread;
</ins><span class="cx"> int thread_running;
</span><span class="cx"> } sql_manager;
</span><span class="cx">
</span><span class="lines">@@ -177,7 +179,7 @@
</span><span class="cx"> if (itterations == 0) {
</span><span class="cx"> trans = 1;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /* ignore abnormally large strings sql strings as potential buffer overflow */
</span><span class="cx"> if (newlen < SQLLEN) {
</span><span class="cx"> itterations++;
</span><span class="lines">@@ -440,8 +442,7 @@
</span><span class="cx">
</span><span class="cx"> void switch_core_sqldb_start(switch_memory_pool_t *pool)
</span><span class="cx"> {
</span><del>- switch_thread_t *thread;
- switch_threadattr_t *thd_attr;;
</del><ins>+ switch_threadattr_t *thd_attr;
</ins><span class="cx">
</span><span class="cx"> sql_manager.memory_pool = pool;
</span><span class="cx">
</span><span class="lines">@@ -567,7 +568,8 @@
</span><span class="cx"> switch_core_db_exec(sql_manager.db, create_calls_sql, NULL, NULL, NULL);
</span><span class="cx"> switch_core_db_exec(sql_manager.db, create_interfaces_sql, NULL, NULL, NULL);
</span><span class="cx"> switch_core_db_exec(sql_manager.db, create_tasks_sql, NULL, NULL, NULL);
</span><del>- if (switch_event_bind("core_db", SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, core_event_handler, NULL) != SWITCH_STATUS_SUCCESS) {
</del><ins>+
+ if (switch_event_bind_removable("core_db", SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, core_event_handler, NULL, &sql_manager.event_node) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind event handler!\n");
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -578,7 +580,7 @@
</span><span class="cx"> switch_threadattr_create(&thd_attr, sql_manager.memory_pool);
</span><span class="cx"> switch_threadattr_detach_set(thd_attr, 1);
</span><span class="cx"> switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
</span><del>- switch_thread_create(&thread, thd_attr, switch_core_sql_thread, NULL, sql_manager.memory_pool);
</del><ins>+ switch_thread_create(&sql_manager.thread, thd_attr, switch_core_sql_thread, NULL, sql_manager.memory_pool);
</ins><span class="cx">
</span><span class="cx"> while (!sql_manager.thread_running) {
</span><span class="cx"> switch_yield(10000);
</span><span class="lines">@@ -587,16 +589,15 @@
</span><span class="cx">
</span><span class="cx"> void switch_core_sqldb_stop(void)
</span><span class="cx"> {
</span><ins>+ switch_status_t st;
+
+ switch_event_unbind(&sql_manager.event_node);
+
</ins><span class="cx"> switch_queue_push(sql_manager.sql_queue[0], NULL);
</span><span class="cx"> switch_queue_push(sql_manager.sql_queue[1], NULL);
</span><span class="cx">
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Waiting for unfinished SQL transactions\n");
</span><del>- while (switch_queue_size(sql_manager.sql_queue[0]) > 0) {
- switch_yield(10000);
- }
- while (switch_queue_size(sql_manager.sql_queue[1]) > 0) {
- switch_yield(10000);
- }
</del><ins>+ switch_thread_join(&st, sql_manager.thread);
</ins><span class="cx">
</span><span class="cx"> switch_core_db_close(sql_manager.db);
</span><span class="cx"> switch_core_db_close(sql_manager.event_db);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>