<!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][14678] </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=14678">14678</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-08-29 23:08:17 -0500 (Sat, 29 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Needs more testing but I think we now have connection pooling for ESL and segvs have been solved.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcinterfacesservermanagercpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcinterfacesservermanagerh">freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoleplugincpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsolepluginh">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgetcpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguisrcinterfacesservermanagercpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.cpp (14677 => 14678)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.cpp 2009-08-30 01:11:46 UTC (rev 14677)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.cpp 2009-08-30 04:08:17 UTC (rev 14678)
</span><span class="lines">@@ -29,15 +29,60 @@
</span><span class="cx"> delete m_ui;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ESLconnection * ServerManager::getESLconnection()
</del><ins>+ESLconnection *ServerManager::getESLconnection(QString pluginName, QString name)
</ins><span class="cx"> {
</span><span class="cx"> QTreeWidgetItem * item = m_ui->listServers->selectedItems().first();
</span><del>- return new ESLconnection(item->data(0, ServerManager::Host).toByteArray(),
- item->data(0, ServerManager::Port).toByteArray(),
- item->data(0, ServerManager::Password).toByteArray(),
- item->data(0, ServerManager::Name).toByteArray());
</del><ins>+ if (name.isNull())
+ {
+ name = item->data(0, ServerManager::Name).toByteArray();
+ }
+
+ if(! _ESLpool.contains(name) )
+ {
+ _ESLpool.insert(name, new ESLconnection(item->data(0, ServerManager::Host).toByteArray(),
+ item->data(0, ServerManager::Port).toByteArray(),
+ item->data(0, ServerManager::Password).toByteArray(),
+ item->data(0, ServerManager::Name).toByteArray()));
+ if ( _ESLpoolCount.contains(name) )
+ qDebug() << "Something really bad happened here.";
+
+ QList<QString> pluginRefs;
+ pluginRefs.append(pluginName);
+ _ESLpoolCount.insert(name, pluginRefs);
+ }
+ else
+ {
+ if ( !_ESLpoolCount.contains(name) )
+ qDebug() << "Something really bad happened here.";
+
+ QList<QString> list = _ESLpoolCount.value(name);
+ list.append(pluginName);
+ }
+ return _ESLpool.value(name);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void ServerManager::endESLconnection(QString pluginName, QString name)
+{
+ if ( _ESLpool.contains(name) )
+ {
+ QList<QString> pluginList = _ESLpoolCount.value(name);
+ for ( int i=0; i < pluginList.size(); i++)
+ {
+ if ( pluginList[i] == pluginName )
+ {
+ pluginList.removeAt(i);
+ break;
+ }
+ }
+
+ if ( _ESLpoolCount.value(name).count() == 0 )
+ {
+ delete _ESLpool.take(name);
+ _ESLpoolCount.remove(name);
+ }
+ }
+}
+
</ins><span class="cx"> void ServerManager::changeEvent(QEvent *e)
</span><span class="cx"> {
</span><span class="cx"> QDialog::changeEvent(e);
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcinterfacesservermanagerh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.h (14677 => 14678)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.h 2009-08-30 01:11:46 UTC (rev 14677)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.h 2009-08-30 04:08:17 UTC (rev 14678)
</span><span class="lines">@@ -39,6 +39,9 @@
</span><span class="cx"> #define SERVERMANAGER_H
</span><span class="cx">
</span><span class="cx"> #include <QtGui/QDialog>
</span><ins>+#include <QSharedPointer>
+#include <QHash>
+#include <QList>
</ins><span class="cx">
</span><span class="cx"> namespace Ui {
</span><span class="cx"> class ServerManager;
</span><span class="lines">@@ -56,11 +59,20 @@
</span><span class="cx"> ServerManager(QWidget *parent = 0);
</span><span class="cx"> ~ServerManager();
</span><span class="cx"> /*!
</span><del>- \brief Gets a new ESLconnection object from the selected server entry
</del><ins>+ \brief Gets a new ESLconnection from pool
+ \param pluginName Name of the plugin that requests the connection
+ \param name Name of the connection to return. If NULL, new one from dialog is returned
</ins><span class="cx"> \return The ESLconnection object
</span><span class="cx"> */
</span><del>- ESLconnection * getESLconnection();
</del><ins>+ ESLconnection *getESLconnection(QString pluginName, QString name = NULL);
</ins><span class="cx">
</span><ins>+ /*!
+ \brief Tells ServerManager that we have finnished using a ESLconnection
+ \param pluginName Name of the plugin that ends the connection
+ \param name Name of the connection that the plugin is no longer using
+ */
+ void endESLconnection(QString pluginName, QString name);
+
</ins><span class="cx"> protected:
</span><span class="cx"> /*!
</span><span class="cx"> \brief Used for changing translation on runtime
</span><span class="lines">@@ -102,6 +114,11 @@
</span><span class="cx"> Name
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ /*! Holds all already initiated ESLconnections */
+ QHash <QString, ESLconnection *> _ESLpool;
+ /*! Holds ref cont for ESLconnections */
+ QHash <QString, QList<QString> > _ESLpoolCount;
+
</ins><span class="cx"> /*!
</span><span class="cx"> \brief Read all servers and populate the interface
</span><span class="cx"> */
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoleplugincpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp (14677 => 14678)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp 2009-08-30 01:11:46 UTC (rev 14677)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp 2009-08-30 04:08:17 UTC (rev 14678)
</span><span class="lines">@@ -134,16 +134,15 @@
</span><span class="cx"> {
</span><span class="cx"> if (serverManager->exec())
</span><span class="cx"> {
</span><del>- ESLconnection *esl = serverManager->getESLconnection();
</del><ins>+ ESLconnection *esl = serverManager->getESLconnection(PLUGIN_NAME);
</ins><span class="cx">
</span><del>- if (hashESL.contains(esl->getName()))
</del><ins>+ if (esl)
</ins><span class="cx"> {
</span><span class="cx"> for (int i = 0; i < consoleWindow->tabConsole->count(); i++)
</span><span class="cx"> {
</span><span class="cx"> if (consoleWindow->tabConsole->tabText(i) == esl->getName())
</span><span class="cx"> {
</span><span class="cx"> consoleWindow->tabConsole->setCurrentIndex(i);
</span><del>- delete esl;
</del><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -152,7 +151,6 @@
</span><span class="cx"> ConsoleTabWidget *newTab = new ConsoleTabWidget(this, esl);
</span><span class="cx"> consoleWindow->tabConsole->addTab(newTab, esl->getName());
</span><span class="cx"> consoleWindow->tabConsole->setCurrentWidget(newTab);
</span><del>- hashESL.insert(esl->getName(), esl);
</del><span class="cx"> QObject::connect(esl, SIGNAL(connected()),
</span><span class="cx"> this, SLOT(connectionStateChanged()));
</span><span class="cx"> QObject::connect(esl, SIGNAL(disconnected()),
</span><span class="lines">@@ -423,14 +421,7 @@
</span><span class="cx"> void ConsolePlugin::tabClose(int index)
</span><span class="cx"> {
</span><span class="cx"> QWidget *tab = consoleWindow->tabConsole->widget(index);
</span><del>- ESLconnection *esl = hashESL.value(consoleWindow->tabConsole->tabText(index), NULL);
- if (esl)
- {
- hashESL.remove(consoleWindow->tabConsole->tabText(index));
- esl->disconnect();
- esl->wait();
- delete esl;
- }
</del><ins>+ serverManager->endESLconnection(PLUGIN_NAME, consoleWindow->tabConsole->tabText(index));
</ins><span class="cx"> consoleWindow->tabConsole->removeTab(index);
</span><span class="cx"> delete tab;
</span><span class="cx"> if (consoleWindow->tabConsole->count() == 0)
</span><span class="lines">@@ -442,7 +433,7 @@
</span><span class="cx">
</span><span class="cx"> void ConsolePlugin::tabChanged(int index)
</span><span class="cx"> {
</span><del>- ESLconnection *esl = hashESL.value(consoleWindow->tabConsole->tabText(index), NULL);
</del><ins>+ ESLconnection *esl = serverManager->getESLconnection(PLUGIN_NAME, consoleWindow->tabConsole->tabText(index));
</ins><span class="cx"> if (esl)
</span><span class="cx"> {
</span><span class="cx"> consoleWindow->action_Connect->setDisabled(esl->isConnected());
</span><span class="lines">@@ -452,7 +443,7 @@
</span><span class="cx">
</span><span class="cx"> void ConsolePlugin::connect()
</span><span class="cx"> {
</span><del>- ESLconnection *esl = hashESL.value(consoleWindow->tabConsole->tabText(consoleWindow->tabConsole->currentIndex()), NULL);
</del><ins>+ ESLconnection *esl = serverManager->getESLconnection(PLUGIN_NAME, consoleWindow->tabConsole->tabText(consoleWindow->tabConsole->currentIndex()));
</ins><span class="cx"> if (esl)
</span><span class="cx"> {
</span><span class="cx"> esl->connect();
</span><span class="lines">@@ -461,7 +452,7 @@
</span><span class="cx">
</span><span class="cx"> void ConsolePlugin::disconnect()
</span><span class="cx"> {
</span><del>- ESLconnection *esl = hashESL.value(consoleWindow->tabConsole->tabText(consoleWindow->tabConsole->currentIndex()), NULL);
</del><ins>+ ESLconnection *esl = serverManager->getESLconnection(PLUGIN_NAME, consoleWindow->tabConsole->tabText(consoleWindow->tabConsole->currentIndex()));
</ins><span class="cx"> if (esl)
</span><span class="cx"> {
</span><span class="cx"> esl->disconnect();
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsolepluginh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h (14677 => 14678)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h 2009-08-30 01:11:46 UTC (rev 14677)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h 2009-08-30 04:08:17 UTC (rev 14678)
</span><span class="lines">@@ -44,6 +44,8 @@
</span><span class="cx"> #include "interfaces.h"
</span><span class="cx"> #include "ui_centralWidget.h"
</span><span class="cx">
</span><ins>+#define PLUGIN_NAME "Console"
+
</ins><span class="cx"> namespace Ui
</span><span class="cx"> {
</span><span class="cx"> class configPage;
</span><span class="lines">@@ -103,7 +105,6 @@
</span><span class="cx"> Ui::consoleWindow *consoleWindow;
</span><span class="cx"> Ui::configPage *consoleConfigPage;
</span><span class="cx"> ServerManager *serverManager;
</span><del>- QHash<QString, ESLconnection *> hashESL;
</del><span class="cx"> SettingsDialog *settingsDialog;
</span><span class="cx">
</span><span class="cx"> void setPalette(QLineEdit *control, QString key);
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgetcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp (14677 => 14678)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp 2009-08-30 01:11:46 UTC (rev 14677)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp 2009-08-30 04:08:17 UTC (rev 14678)
</span><span class="lines">@@ -75,8 +75,6 @@
</span><span class="cx">
</span><span class="cx"> ConsoleTabWidget::~ConsoleTabWidget()
</span><span class="cx"> {
</span><del>- esl->disconnect();
- esl->wait();
</del><span class="cx"> writeSettings();
</span><span class="cx"> delete m_ui;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>