<!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][15217] </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=15217">15217</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-10-23 15:09:34 -0500 (Fri, 23 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>sql-in-transactions profile param (only vaid on first load) weather or not to bundle sql stmts in transactions</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (15216 => 15217)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-10-23 17:36:23 UTC (rev 15216)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-10-23 20:09:34 UTC (rev 15217)
</span><span class="lines">@@ -198,6 +198,7 @@
</span><span class="cx"> PFLAG_MANUAL_REDIRECT,
</span><span class="cx"> PFLAG_AUTO_NAT,
</span><span class="cx"> PFLAG_SIPCOMPACT,
</span><ins>+ PFLAG_SQL_IN_TRANS,
</ins><span class="cx"> /* No new flags below this line */
</span><span class="cx"> PFLAG_MAX
</span><span class="cx"> } PFLAGS;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (15216 => 15217)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-10-23 17:36:23 UTC (rev 15216)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-10-23 20:09:34 UTC (rev 15217)
</span><span class="lines">@@ -881,6 +881,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#define SQLLEN 1024 * 64
</ins><span class="cx"> void *SWITCH_THREAD_FUNC sofia_profile_worker_thread_run(switch_thread_t *thread, void *obj)
</span><span class="cx"> {
</span><span class="cx"> sofia_profile_t *profile = (sofia_profile_t *) obj;
</span><span class="lines">@@ -889,7 +890,14 @@
</span><span class="cx"> int loops = 0;
</span><span class="cx"> uint32_t qsize;
</span><span class="cx"> void *pop;
</span><del>-
</del><ins>+ int loop_count = 0;
+ switch_size_t sql_len = SQLLEN;
+ char *tmp, *sqlbuf = NULL;
+
+ if (sofia_test_pflag(profile, PFLAG_SQL_IN_TRANS)) {
+ sqlbuf = (char *) malloc(sql_len);
+ }
+
</ins><span class="cx"> ireg_loops = IREG_SECONDS;
</span><span class="cx"> gateway_loops = GATEWAY_SECONDS;
</span><span class="cx">
</span><span class="lines">@@ -900,15 +908,57 @@
</span><span class="cx"> qsize = switch_queue_size(profile->sql_queue);
</span><span class="cx">
</span><span class="cx"> while ((mod_sofia_globals.running == 1 && sofia_test_pflag(profile, PFLAG_RUNNING)) || qsize) {
</span><del>- if (qsize) {
- switch_mutex_lock(profile->ireg_mutex);
- while (switch_queue_trypop(profile->sql_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) {
- sofia_glue_actually_execute_sql(profile, SWITCH_TRUE, (char *) pop, NULL);
- free(pop);
</del><ins>+ if (sofia_test_pflag(profile, PFLAG_SQL_IN_TRANS)) {
+ if (qsize > 0 && (qsize >= 500 || ++loop_count >= 500)) {
+ switch_size_t newlen;
+ uint32_t itterations = 0;
+ switch_size_t len = 0;
+
+ switch_mutex_lock(profile->ireg_mutex);
+
+ sprintf(sqlbuf + len, "begin;\n");
+ len += 7;
+
+ while (switch_queue_trypop(profile->sql_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) {
+ char *sql = (char *) pop;
+
+ newlen = strlen(sql) + 2;
+
+ if (newlen + 10 < SQLLEN) {
+ itterations++;
+ if (len + newlen + 10 > sql_len) {
+ sql_len = len + 10 + SQLLEN;
+ if (!(tmp = realloc(sqlbuf, sql_len))) {
+ abort();
+ break;
+ }
+ sqlbuf = tmp;
+ }
+ sprintf(sqlbuf + len, "%s;\n", sql);
+ len += newlen;
+ }
+
+ free(pop);
+ }
+
+ sprintf(sqlbuf + len, "commit;\n");
+
+ //printf("TRANS:\n%s\n", sqlbuf);
+ sofia_glue_actually_execute_sql(profile, SWITCH_TRUE, sqlbuf, NULL);
+ switch_mutex_unlock(profile->ireg_mutex);
+ loop_count = 0;
</ins><span class="cx"> }
</span><del>- switch_mutex_unlock(profile->ireg_mutex);
</del><ins>+ } else {
+ if (qsize) {
+ switch_mutex_lock(profile->ireg_mutex);
+ while (switch_queue_trypop(profile->sql_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) {
+ sofia_glue_actually_execute_sql(profile, SWITCH_TRUE, (char *) pop, NULL);
+ free(pop);
+ }
+ switch_mutex_unlock(profile->ireg_mutex);
+ }
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (++loops >= 100) {
</span><span class="cx"> if (++ireg_loops >= IREG_SECONDS) {
</span><span class="cx"> sofia_reg_check_expire(profile, switch_epoch_time_now(NULL), 0);
</span><span class="lines">@@ -935,6 +985,7 @@
</span><span class="cx"> switch_mutex_unlock(profile->ireg_mutex);
</span><span class="cx">
</span><span class="cx"> sofia_clear_pflag_locked(profile, PFLAG_WORKER_RUNNING);
</span><ins>+ switch_safe_free(sqlbuf);
</ins><span class="cx">
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="lines">@@ -2718,6 +2769,12 @@
</span><span class="cx"> if (switch_true(val)) {
</span><span class="cx"> sofia_set_pflag(profile, PFLAG_SIPCOMPACT);
</span><span class="cx"> }
</span><ins>+ } else if (!strcasecmp(var, "sql-in-transactions")) {
+ if (switch_true(val)) {
+ sofia_set_pflag(profile, PFLAG_SQL_IN_TRANS);
+ } else {
+ sofia_clear_pflag(profile, PFLAG_SQL_IN_TRANS);
+ }
</ins><span class="cx"> } else if (!strcasecmp(var, "bitpacking")) {
</span><span class="cx"> if (!strcasecmp(val, "aal2")) {
</span><span class="cx"> profile->codec_flags = SWITCH_CODEC_FLAG_AAL2;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>