<!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][14543] </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=14543">14543</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-08-17 02:28:19 -0500 (Mon, 17 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix buggy realtime statistics and a few things at MonitorStateMachine. Too late to remember what...</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcinterfaceseslconnectioncpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/eslconnection.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcinterfacesmonitorstatemachinecpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcinterfacesmonitorstatemachineh">freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimestatisticsdialogcpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimestatisticsdialogh">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguisrcinterfaceseslconnectioncpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/eslconnection.cpp (14542 => 14543)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/eslconnection.cpp 2009-08-17 04:22:03 UTC (rev 14542)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/eslconnection.cpp 2009-08-17 07:28:19 UTC (rev 14543)
</span><span class="lines">@@ -299,7 +299,6 @@
</span><span class="cx"> {
</span><span class="cx"> commandTransaction = _commandQueue.dequeue();
</span><span class="cx"> event = bgapi(commandTransaction->getCommand());
</span><del>- qDebug() << "Sent a command and got this response : " << event;
</del><span class="cx"> if (event)
</span><span class="cx"> _commandHash.insert(event->_headers.value("Job-UUID"), commandTransaction);
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcinterfacesmonitorstatemachinecpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.cpp (14542 => 14543)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.cpp 2009-08-17 04:22:03 UTC (rev 14542)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.cpp 2009-08-17 07:28:19 UTC (rev 14543)
</span><span class="lines">@@ -2,6 +2,13 @@
</span><span class="cx"> #include "eslconnection.h"
</span><span class="cx"> #include "esl.h"
</span><span class="cx">
</span><ins>+Call::Call(QString orig_uuid, Channel *orig_channel, QString caller_uuid, Channel *caller_channel) :
+ _orig_uuid(orig_uuid),
+ _orig_channel(orig_channel),
+ _caller_uuid(caller_uuid),
+ _caller_channel(caller_channel)
+{}
+
</ins><span class="cx"> MonitorStateMachine::MonitorStateMachine()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -37,6 +44,44 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+ case (ESL_EVENT_CHANNEL_BRIDGE) :
+ {
+ QString orig_uuid = e._headers.value("Other-Leg-Unique-ID");
+ QString caller_uuid = e._headers.value("Unique-ID");
+ Channel * orig_chan = _channels.value(orig_uuid, NULL);
+ Channel * caller_chan = _channels.value(caller_uuid, NULL);
+ if (!orig_chan || !caller_chan)
+ {
+ qDebug() << QString("Channel %1 or %2 do not exist! [ESL_EVENT_CHANNEL_BRIDGE]").arg(orig_uuid, caller_uuid);
+ }
+ else
+ {
+ Call * new_call = new Call(orig_uuid, orig_chan, caller_uuid, caller_chan);
+ _calls.insert(caller_uuid,new_call);
+ caller_chan->stateChanged(e._headers);
+ emit callCreated(new_call);
+ }
+ break;
+ }
+ case (ESL_EVENT_CHANNEL_UNBRIDGE) :
+ {
+ QString orig_uuid = e._headers.value("Other-Leg-Unique-ID");
+ QString caller_uuid = e._headers.value("Unique-ID");
+ Channel * orig_chan = _channels.value(orig_uuid, NULL);
+ Channel * caller_chan = _channels.value(caller_uuid, NULL);
+ if (!orig_chan || !caller_chan)
+ {
+ qDebug() << QString("Channel %1 or %2 do not exist! [ESL_EVENT_CHANNEL_UNBRIDGE]").arg(orig_uuid, caller_uuid);
+ }
+ else
+ {
+ Call *ecall = _calls.take(caller_uuid);
+ _inactive_calls.insert(caller_uuid, ecall);
+ caller_chan->stateChanged(e._headers);
+ emit callDestroyed(ecall);
+ }
+ break;
+ }
</ins><span class="cx"> case (ESL_EVENT_CHANNEL_STATE) :
</span><span class="cx"> {
</span><span class="cx"> if (!_channels.contains(e._headers.value("Unique-ID")))
</span><span class="lines">@@ -48,7 +93,6 @@
</span><span class="cx"> _channels[e._headers.value("Unique-ID")]->stateChanged(e._headers);
</span><span class="cx"> emit channelStateChanged(_channels.value(e._headers.value("Unique-ID")));
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case (ESL_EVENT_CHANNEL_DESTROY):
</span><span class="lines">@@ -59,15 +103,15 @@
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><del>- _channels[e._headers.value("Unique-ID")]->stateChanged(e._headers);
- emit channelDestroyed(_channels.value(e._headers.value("Unique-ID")));
</del><ins>+ Channel * chan = _channels.take(e._headers.value("Unique-ID"));
+ _inactive_channels.insert(e._headers.value("Unique-ID"), chan);
+ emit channelDestroyed(chan);
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> default:
</span><span class="cx"> {
</span><del>- if (e.getType() != "COMMAND")
- qDebug() << "Event not treated: " << e.getType();
</del><ins>+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcinterfacesmonitorstatemachineh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.h (14542 => 14543)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.h 2009-08-17 04:22:03 UTC (rev 14542)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/monitorstatemachine.h 2009-08-17 07:28:19 UTC (rev 14543)
</span><span class="lines">@@ -18,15 +18,37 @@
</span><span class="cx"> QHash<QString, QString> getVariables() { return _variables; }
</span><span class="cx"> QString getUUID() { return _uuid; }
</span><span class="cx"> QString getHeader(QString header) { return _variables.value(header, ""); }
</span><ins>+ QHash<QString, QString> getHeaders() { return _variables; }
</ins><span class="cx"> void stateChanged(QHash<QString, QString> variables) { _variables = variables; }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class Call
+{
+private:
+ QString _orig_uuid;
+ Channel *_orig_channel;
+ QString _caller_uuid;
+ Channel *_caller_channel;
+public:
+ Call(QString orig_uuid, Channel *orig_channel,
+ QString caller_uuid, Channel *caller_channel);
+ QString getCallerUUID() { return _caller_uuid; }
+ QString getOriginateeUUID() { return _orig_uuid; }
+ Channel *getCallerChannel() { return _caller_channel; }
+ Channel *getOriginateeChannel() { return _orig_channel; }
+};
+
</ins><span class="cx"> class MonitorStateMachine : public QObject
</span><span class="cx"> {
</span><span class="cx"> Q_OBJECT
</span><span class="cx"> private:
</span><span class="cx"> QList<ESLconnection *> _listESL;
</span><span class="cx"> QHash <QString, Channel *> _channels;
</span><ins>+ QHash <QString, Channel *> _inactive_channels;
+ /*! Always indexed by caller UUID */
+ QHash <QString, Call *> _calls;
+ /*! Always indexed by caller UUID */
+ QHash <QString, Call *> _inactive_calls;
</ins><span class="cx"> public:
</span><span class="cx"> MonitorStateMachine();
</span><span class="cx"> void addESLconnection(ESLconnection *);
</span><span class="lines">@@ -39,6 +61,8 @@
</span><span class="cx"> signals:
</span><span class="cx"> void channelStateChanged(Channel *);
</span><span class="cx"> void channelCreated(Channel *);
</span><ins>+ void callCreated(Call *);
+ void callDestroyed(Call *);
</ins><span class="cx"> void channelDestroyed(Channel *);
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimestatisticsdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp (14542 => 14543)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp 2009-08-17 04:22:03 UTC (rev 14542)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.cpp 2009-08-17 07:28:19 UTC (rev 14543)
</span><span class="lines">@@ -9,12 +9,23 @@
</span><span class="cx"> _sm(sm)
</span><span class="cx"> {
</span><span class="cx"> m_ui->setupUi(this);
</span><ins>+
+ /* Connect channel stuff */
</ins><span class="cx"> connect(sm, SIGNAL(channelCreated(Channel*)),
</span><span class="cx"> this, SLOT(channelCreate(Channel*)));
</span><span class="cx"> connect(sm, SIGNAL(channelDestroyed(Channel*)),
</span><span class="cx"> this, SLOT(channelDestroy(Channel*)));
</span><ins>+ connect(sm, SIGNAL(channelStateChanged(Channel*)),
+ this, SLOT(channelStateChanged(Channel*)));
</ins><span class="cx"> connect(m_ui->listActiveChannels, SIGNAL(itemClicked(QListWidgetItem*)),
</span><span class="cx"> this, SLOT(channelSelected(QListWidgetItem*)));
</span><ins>+
+ /* Connect call stuff */
+ connect(sm, SIGNAL(callCreated(Call*)),
+ this, SLOT(callCreate(Call*)));
+ connect(sm, SIGNAL(callDestroyed(Call*)),
+ this, SLOT(callDestroy(Call*)));
+
</ins><span class="cx"> delete m_ui->tab_2;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -37,6 +48,10 @@
</span><span class="cx">
</span><span class="cx"> void RealtimeStatisticsDialog::channelCreate(Channel *ch)
</span><span class="cx"> {
</span><ins>+ /* Sanity checking */
+ if (!ch)
+ return;
+
</ins><span class="cx"> QListWidgetItem *item = new QListWidgetItem(QString("%1 - %2").arg(ch->getUUID(), ch->getHeader("Channel-State")),
</span><span class="cx"> m_ui->listActiveChannels);
</span><span class="cx"> item->setData(Qt::UserRole, ch->getUUID());
</span><span class="lines">@@ -44,6 +59,10 @@
</span><span class="cx">
</span><span class="cx"> void RealtimeStatisticsDialog::channelDestroy(Channel *ch)
</span><span class="cx"> {
</span><ins>+ /* Sanity checking */
+ if (!ch)
+ return;
+
</ins><span class="cx"> for (int i = 0; i < m_ui->listActiveChannels->count(); i++)
</span><span class="cx"> {
</span><span class="cx"> if (m_ui->listActiveChannels->item(i)->data(Qt::UserRole) == ch->getUUID())
</span><span class="lines">@@ -56,6 +75,23 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RealtimeStatisticsDialog::channelStateChanged(Channel * ch)
+{
+ /* Sanity checking */
+ if (!ch)
+ return;
+
+ for (int i = 0; i < m_ui->listActiveChannels->count(); i++)
+ {
+ if (m_ui->listActiveChannels->item(i)->data(Qt::UserRole).toString() == ch->getUUID())
+ if (m_ui->listActiveChannels->currentItem() == m_ui->listActiveChannels->item(i))
+ {
+ channelSelected(m_ui->listActiveChannels->item(i));
+ }
+ m_ui->listActiveChannels->item(i)->setText(QString("%1 - %2").arg(ch->getUUID(), ch->getHeader("Channel-State")));
+ }
+}
+
</ins><span class="cx"> void RealtimeStatisticsDialog::channelSelected(QListWidgetItem *item)
</span><span class="cx"> {
</span><span class="cx"> m_ui->listActiveVariables->clear();
</span><span class="lines">@@ -69,3 +105,30 @@
</span><span class="cx"> m_ui->listActiveVariables->addItem(QString("%1 = %2").arg(key, ch->getVariables().value(key)));
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+void RealtimeStatisticsDialog::callCreate(Call *c)
+{
+ /* Sanity checking */
+ if (!c)
+ return;
+ QString caller_cidnum = c->getCallerChannel()->getHeader("Caller-Caller-ID-Number");
+ QString caller_cidname = c->getCallerChannel()->getHeader("variable_effective_caller_id_name");
+ QString orig_cidnum = c->getCallerChannel()->getHeader("Caller-Destination-Number");
+ QListWidgetItem *item = new QListWidgetItem(QString("%1(%2) <-> %3").arg(caller_cidnum,
+ caller_cidname,
+ orig_cidnum), m_ui->listActiveCalls);
+ item->setData(Qt::UserRole, c->getCallerUUID());
+}
+
+void RealtimeStatisticsDialog::callDestroy(Call *c)
+{
+ /* Sanity checking */
+ if (!c)
+ return;
+
+ for (int i = 0; i < m_ui->listActiveCalls->count(); i++)
+ {
+ if (m_ui->listActiveCalls->item(i)->data(Qt::UserRole) == c->getCallerUUID())
+ delete m_ui->listActiveCalls->item(i);
+ }
+}
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginrealtimestatisticsdialogh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.h (14542 => 14543)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.h 2009-08-17 04:22:03 UTC (rev 14542)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/realtimestatisticsdialog.h 2009-08-17 07:28:19 UTC (rev 14543)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> class QListWidgetItem;
</span><span class="cx"> class MonitorStateMachine;
</span><span class="cx"> class Channel;
</span><ins>+class Call;
</ins><span class="cx">
</span><span class="cx"> class RealtimeStatisticsDialog : public QDialog {
</span><span class="cx"> Q_OBJECT
</span><span class="lines">@@ -24,7 +25,10 @@
</span><span class="cx"> private slots:
</span><span class="cx"> void channelCreate(Channel *);
</span><span class="cx"> void channelDestroy(Channel *);
</span><ins>+ void channelStateChanged(Channel *);
</ins><span class="cx"> void channelSelected(QListWidgetItem *);
</span><ins>+ void callCreate(Call *);
+ void callDestroy(Call *);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Ui::RealtimeStatisticsDialog *m_ui;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>