<!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][15497] </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=15497">15497</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-11-17 13:16:24 -0600 (Tue, 17 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>db cache part 2</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_coreh">freeswitch/trunk/src/include/switch_core.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_aprc">freeswitch/trunk/src/switch_apr.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_memoryc">freeswitch/trunk/src/switch_core_memory.c</a></li>
<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="freeswitchtrunksrcincludeswitch_coreh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_core.h (15496 => 15497)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_core.h 2009-11-17 19:12:20 UTC (rev 15496)
+++ freeswitch/trunk/src/include/switch_core.h 2009-11-17 19:16:24 UTC (rev 15497)
</span><span class="lines">@@ -1916,15 +1916,23 @@
</span><span class="cx"> \}
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#define CACHE_DB_LEN 256
+typedef enum {
+ CDF_INUSE = (1 << 0)
+} cache_db_flag_t;
+
</ins><span class="cx"> typedef struct {
</span><ins>+ char name[CACHE_DB_LEN];
</ins><span class="cx"> switch_core_db_t *db;
</span><span class="cx"> switch_odbc_handle_t *odbc_dbh;
</span><span class="cx"> time_t last_used;
</span><span class="cx"> switch_mutex_t *mutex;
</span><span class="cx"> switch_memory_pool_t *pool;
</span><ins>+ int32_t flags;
</ins><span class="cx"> } switch_cache_db_handle_t;
</span><span class="cx">
</span><span class="cx"> SWITCH_DECLARE(void) switch_cache_db_release_db_handle(switch_cache_db_handle_t **dbh);
</span><ins>+SWITCH_DECLARE(void) switch_cache_db_destroy_db_handle(switch_cache_db_handle_t **dbh);
</ins><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_cache_db_get_db_handle(switch_cache_db_handle_t **dbh,
</span><span class="cx"> const char *db_name, const char *odbc_user, const char *odbc_pass);
</span><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_cache_db_execute_sql(switch_cache_db_handle_t *dbh, const char *sql, char **err);
</span><span class="lines">@@ -1935,6 +1943,7 @@
</span><span class="cx"> SWITCH_DECLARE(void) switch_cache_db_test_reactive(switch_cache_db_handle_t *db, const char *test_sql, const char *drop_sql, const char *reactive_sql);
</span><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_cache_db_persistant_execute(switch_cache_db_handle_t *dbh, const char *sql, uint32_t retries);
</span><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_cache_db_persistant_execute_trans(switch_cache_db_handle_t *dbh, const char *sql, uint32_t retries);
</span><ins>+SWITCH_DECLARE(void) switch_cache_db_detach(void);
</ins><span class="cx">
</span><span class="cx"> SWITCH_END_EXTERN_C
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (15496 => 15497)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-11-17 19:12:20 UTC (rev 15496)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-11-17 19:16:24 UTC (rev 15497)
</span><span class="lines">@@ -4123,7 +4123,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (db) dbh->db = db; else dbh->odbc_dbh = odbc_dbh;
</span><del>- switch_mutex_init(&dbh->mutex, 0, dbh->pool);
</del><ins>+ switch_mutex_init(&dbh->mutex, SWITCH_MUTEX_UNNESTED, dbh->pool);
</ins><span class="cx"> switch_mutex_lock(dbh->mutex);
</span><span class="cx">
</span><span class="cx"> switch_core_hash_insert(profile->db_hash, thread_str, dbh);
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_aprc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_apr.c (15496 => 15497)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_apr.c 2009-11-17 19:12:20 UTC (rev 15496)
+++ freeswitch/trunk/src/switch_apr.c 2009-11-17 19:16:24 UTC (rev 15497)
</span><span class="lines">@@ -630,10 +630,12 @@
</span><span class="cx"> return stat;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static char TT_KEY[] = "1";
</ins><span class="cx">
</span><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_thread_create(switch_thread_t **new_thread, switch_threadattr_t *attr,
</span><span class="cx"> switch_thread_start_t func, void *data, switch_memory_pool_t *cont)
</span><span class="cx"> {
</span><ins>+ switch_core_memory_pool_set_data(cont, "_in_thread", TT_KEY);
</ins><span class="cx"> return apr_thread_create(new_thread, attr, func, data, cont);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_memoryc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_memory.c (15496 => 15497)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_memory.c 2009-11-17 19:12:20 UTC (rev 15496)
+++ freeswitch/trunk/src/switch_core_memory.c 2009-11-17 19:16:24 UTC (rev 15497)
</span><span class="lines">@@ -391,6 +391,9 @@
</span><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_core_perform_destroy_memory_pool(switch_memory_pool_t **pool, const char *file, const char *func, int line)
</span><span class="cx"> {
</span><span class="cx"> switch_assert(pool != NULL);
</span><ins>+ if (switch_core_memory_pool_get_data(*pool, "_in_thread")) {
+ switch_cache_db_detach();
+ }
</ins><span class="cx">
</span><span class="cx"> #ifdef DEBUG_ALLOC2
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_CONSOLE, "Free Pool\n");
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_sqldbc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_sqldb.c (15496 => 15497)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_sqldb.c 2009-11-17 19:12:20 UTC (rev 15496)
+++ freeswitch/trunk/src/switch_core_sqldb.c 2009-11-17 19:16:24 UTC (rev 15497)
</span><span class="lines">@@ -106,6 +106,7 @@
</span><span class="cx"> switch_mutex_unlock(dbh_mutex);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> SWITCH_DECLARE(void) switch_cache_db_release_db_handle(switch_cache_db_handle_t **dbh)
</span><span class="cx"> {
</span><span class="cx"> if (dbh && *dbh) {
</span><span class="lines">@@ -114,19 +115,89 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+SWITCH_DECLARE(void) switch_cache_db_destroy_db_handle(switch_cache_db_handle_t **dbh)
+{
+ if (dbh && *dbh) {
+ switch_mutex_lock(dbh_mutex);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Deleting DB connection %s\n", (*dbh)->name);
+ if ((*dbh)->db) {
+ switch_core_db_close((*dbh)->db);
+ (*dbh)->db = NULL;
+ } else if (switch_odbc_available() && (*dbh)->odbc_dbh) {
+ switch_odbc_handle_destroy(&(*dbh)->odbc_dbh);
+ }
+
+ switch_core_hash_delete(dbh_hash, (*dbh)->name);
+ switch_mutex_unlock((*dbh)->mutex);
+ switch_core_destroy_memory_pool(&(*dbh)->pool);
+ *dbh = NULL;
+ switch_mutex_unlock(dbh_mutex);
+ }
+}
+
+SWITCH_DECLARE(void) switch_cache_db_detach(void)
+{
+ char thread_str[CACHE_DB_LEN] = "";
+ switch_hash_index_t *hi;
+ const void *var;
+ void *val;
+ char *key;
+ switch_cache_db_handle_t *dbh = NULL;
+
+ snprintf(thread_str, sizeof(thread_str) - 1, "%lu", (unsigned long)(intptr_t)switch_thread_self());
+ switch_mutex_lock(dbh_mutex);
+
+ for (hi = switch_hash_first(NULL, dbh_hash); hi; hi = switch_hash_next(hi)) {
+ switch_hash_this(hi, &var, NULL, &val);
+ key = (char *) var;
+ if ((dbh = (switch_cache_db_handle_t *) val)) {
+ if (switch_mutex_trylock(dbh->mutex) == SWITCH_STATUS_SUCCESS) {
+ if (strstr(dbh->name, thread_str)) {
+ switch_clear_flag(dbh, CDF_INUSE);
+ }
+ switch_mutex_unlock(dbh->mutex);
+ }
+ }
+ }
+
+ switch_mutex_unlock(dbh_mutex);
+}
+
</ins><span class="cx"> SWITCH_DECLARE(switch_status_t)switch_cache_db_get_db_handle(switch_cache_db_handle_t **dbh,
</span><span class="cx"> const char *db_name, const char *odbc_user, const char *odbc_pass)
</span><span class="cx"> {
</span><span class="cx"> switch_thread_id_t self = switch_thread_self();
</span><del>- char thread_str[256] = "";
</del><ins>+ char thread_str[CACHE_DB_LEN] = "";
</ins><span class="cx"> switch_cache_db_handle_t *new_dbh = NULL;
</span><span class="cx">
</span><span class="cx"> switch_assert(db_name);
</span><span class="cx">
</span><span class="cx"> snprintf(thread_str, sizeof(thread_str) - 1, "%s_%lu", db_name, (unsigned long)(intptr_t)self);
</span><del>-
</del><ins>+
</ins><span class="cx"> switch_mutex_lock(dbh_mutex);
</span><span class="cx"> if (!(new_dbh = switch_core_hash_find(dbh_hash, thread_str))) {
</span><ins>+ switch_hash_index_t *hi;
+ const void *var;
+ void *val;
+ char *key;
+
+ for (hi = switch_hash_first(NULL, dbh_hash); hi; hi = switch_hash_next(hi)) {
+ switch_hash_this(hi, &var, NULL, &val);
+ key = (char *) var;
+
+ if ((new_dbh = (switch_cache_db_handle_t *) val)) {
+ if (!switch_test_flag(new_dbh, CDF_INUSE) && switch_mutex_trylock(new_dbh->mutex) == SWITCH_STATUS_SUCCESS) {
+ switch_set_flag(new_dbh, CDF_INUSE);
+ switch_set_string(new_dbh->name, thread_str);
+ break;
+ }
+ }
+ new_dbh = NULL;
+ }
+ }
+
+ if (!new_dbh) {
</ins><span class="cx"> switch_memory_pool_t *pool = NULL;
</span><span class="cx"> switch_core_db_t *db = NULL;
</span><span class="cx"> switch_odbc_handle_t *odbc_dbh = NULL;
</span><span class="lines">@@ -149,13 +220,14 @@
</span><span class="cx"> switch_core_new_memory_pool(&pool);
</span><span class="cx"> new_dbh = switch_core_alloc(pool, sizeof(*new_dbh));
</span><span class="cx"> new_dbh->pool = pool;
</span><del>-
</del><ins>+ switch_set_string(new_dbh->name, thread_str);
+ switch_set_flag(new_dbh, CDF_INUSE);
</ins><span class="cx">
</span><span class="cx"> if (db) new_dbh->db = db; else new_dbh->odbc_dbh = odbc_dbh;
</span><del>- switch_mutex_init(&new_dbh->mutex, 0, new_dbh->pool);
</del><ins>+ switch_mutex_init(&new_dbh->mutex, SWITCH_MUTEX_UNNESTED, new_dbh->pool);
</ins><span class="cx"> switch_mutex_lock(new_dbh->mutex);
</span><span class="cx">
</span><del>- switch_core_hash_insert(dbh_hash, thread_str, new_dbh);
</del><ins>+ switch_core_hash_insert(dbh_hash, new_dbh->name, new_dbh);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> end:
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>