November 2006 - Sofaswitch-svn - FreeSWITCH Mailing Lists

[commit] r217 - in sofaswitch/trunk: am callflow/docs callflow/docs/current mcu voip
by SofaSWITCH SVN 21 Nov '06

21 Nov '06

Author: derek Date: Tue Nov 21 18:41:02 2006 New Revision: 217 Modified: sofaswitch/trunk/am/audio.cxx sofaswitch/trunk/callflow/docs/current/eachicon.dxy sofaswitch/trunk/callflow/docs/description.dxy sofaswitch/trunk/mcu/audio.cxx sofaswitch/trunk/voip/mymanager.cxx Log: Update documentation on loadnewgraph extend mcu & am to cope with supersized packets. These supersize packets (eg 1280 byte) can be generated by the voip system. Modified: sofaswitch/trunk/am/audio.cxx ============================================================================== --- sofaswitch/trunk/am/audio.cxx (original) +++ sofaswitch/trunk/am/audio.cxx Tue Nov 21 18:41:02 2006 @@ -145,7 +145,7 @@ void AudioWrite::Main() { PBYTEArray data; - data.SetSize(480); + data.SetSize(4800); while (socket->IsOpen()) { socket->Read(data.GetPointer(), data.GetSize()); Modified: sofaswitch/trunk/callflow/docs/current/eachicon.dxy ============================================================================== --- sofaswitch/trunk/callflow/docs/current/eachicon.dxy (original) +++ sofaswitch/trunk/callflow/docs/current/eachicon.dxy Tue Nov 21 18:41:02 2006 @@ -419,15 +419,26 @@ populated by the \ref seubsecEventer item \li \code self.generatedEvents\endcode A list of events we have to examine at the next opportunity -\li \code self.keepGoing \endcode A flag to inidicate that we should keep +\li \code self.keepGoing \endcode A flag to indicate that we should keep working along this graph. If set to \c False , it is equivalent to processing a \ref subsecEndProcessing To send a message to a particular node, you would do \code self.transport.write("remId:the_message \0")\endcode -This may need to be modified to protect the quotes and backslash. + +In the test subdirectory, there is a \c parent.src and \c child.src file, +which are used to illustrate the operation of the "load new graph" item. The +parent runs a for loop, which creates 20 child processes. Each of the 20 child +proceses is the same, and executes a print statement. If you compile +\c parent.src to \c parent.py, and compile \c child.src to \c child.py, and +then do: +\code python parent.py \endcode +what happens? The server will report the creation and termination of 21 new +nodes. Further, analysis of the messages to and from the server shows the +blockiness of the processing. All new nodes are created at the same time, and +setup at the same time. Then, all created child nodes die at the same time. \subsection subsecMakeCall Make a call Make a call to some external entity is indicated by the toolbar icon and drawing area Modified: sofaswitch/trunk/callflow/docs/description.dxy ============================================================================== --- sofaswitch/trunk/callflow/docs/description.dxy (original) +++ sofaswitch/trunk/callflow/docs/description.dxy Tue Nov 21 18:41:02 2006 @@ -11,6 +11,8 @@ \li \ref secEvent \li \ref secUsage + +\section secIntro Introduction The language chosen to control the SofaSwitch utilties is Python. It is reasonably tidy language, cross platform, straightforward syntax and does not have the dependency hell of perl. Sadly nothing is easy, and it takes Modified: sofaswitch/trunk/mcu/audio.cxx ============================================================================== --- sofaswitch/trunk/mcu/audio.cxx (original) +++ sofaswitch/trunk/mcu/audio.cxx Tue Nov 21 18:41:02 2006 @@ -113,7 +113,7 @@ PSafePtr <Member> member = manager->activeMembers.FindWithLock(memberId, PSafeReadOnly); - PINDEX maxSize = 480; + PINDEX maxSize = 4800; PBYTEArray data; data.SetSize(maxSize); PINDEX readSize; Modified: sofaswitch/trunk/voip/mymanager.cxx ============================================================================== --- sofaswitch/trunk/voip/mymanager.cxx (original) +++ sofaswitch/trunk/voip/mymanager.cxx Tue Nov 21 18:41:02 2006 @@ -168,8 +168,8 @@ toDelete += "H.261(QCIF)"; toDelete += "RGB32"; toDelete += "RGB24"; - toDelete += "G.711-uLaw-64k"; - toDelete += "G.711-ALaw-64k"; +// toDelete += "G.711-uLaw-64k"; +// toDelete += "G.711-ALaw-64k"; PStringArray toRemove = args.GetOptionString('D').Lines(); PStringArray toReorder = args.GetOptionString('P').Lines(); toDelete += toRemove;

1 0

[commit] r216 - sofaswitch/trunk/sound
by SofaSWITCH SVN 21 Nov '06

21 Nov '06

Author: derek Date: Tue Nov 21 18:32:45 2006 New Revision: 216 Modified: sofaswitch/trunk/sound/audio.cxx Log: Read supersized packets from the network correctly. Modified: sofaswitch/trunk/sound/audio.cxx ============================================================================== --- sofaswitch/trunk/sound/audio.cxx (original) +++ sofaswitch/trunk/sound/audio.cxx Tue Nov 21 18:32:45 2006 @@ -99,7 +99,7 @@ PBYTEArray data; - data.SetSize(480); + data.SetSize(4800); while (keepGoing) { socket.Read(data.GetPointer(), data.GetSize());

1 0

[commit] r215 - in sofaswitch/trunk: callflow/src callflow/tests voip
by SofaSWITCH SVN 21 Nov '06

21 Nov '06

Author: derek Date: Tue Nov 21 16:03:10 2006 New Revision: 215 Modified: sofaswitch/trunk/callflow/src/startfor.cpp sofaswitch/trunk/callflow/tests/parent.src sofaswitch/trunk/voip/mymanager.cxx Log: Fix default operation in for loop. Modify parent example to launch 20 children, not one. Work on voip manager.cxx, to exclude g.711 codec. Not right - some issues here. Modified: sofaswitch/trunk/callflow/src/startfor.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/startfor.cpp (original) +++ sofaswitch/trunk/callflow/src/startfor.cpp Tue Nov 21 16:03:10 2006 @@ -36,7 +36,7 @@ InformationSection(wxT("Test for Termination (Python code)"), wxT("self.i < loops")); displayData[displayData.size()] = - InformationSection(wxT("Increment (Python code)"), wxT("self.i++")); + InformationSection(wxT("Increment (Python code)"), wxT("self.i+=1")); } void DndShapeStartFor::Draw(wxDC& dc) Modified: sofaswitch/trunk/callflow/tests/parent.src ============================================================================== --- sofaswitch/trunk/callflow/tests/parent.src (original) +++ sofaswitch/trunk/callflow/tests/parent.src Tue Nov 21 16:03:10 2006 @@ -1 +1 @@ -14574226 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>Terminating<ms><special>Python variable to hold event data<ms>self.termTime<ms><special> <Shape>14533200 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>timer<ms><special>Python variable to hold event data<ms>self.eventData<ms><special> <Shape>1851899 extra <special>Tool Tip<ms>Load New Graph<ms><special>new graph file (Python code)<ms>"child.graph"<ms><special>Python variable to pass to child<ms>self.data[a]<ms><special> <Shape>2564314 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>151850 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>2599249 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>20534247 extra <special>Tool Tip<ms>Death<ms><special> <Shape>10572265 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "child has terminated", self.termTime<ms><special> <Shape>12519146 extra <special>Tool Tip<ms>Timer<ms><special>Timer period (seconds, Python code)<ms>10<ms><special>Timer label (Python code)<ms>self.myId + "thistimer"<ms><special> <Shape> +918742187,236,283,240,285,42,334,44<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>1230742 extra <special>Tool Tip<ms>Timer<ms><special>Timer period (seconds, Python code)<ms>10<ms><special>Timer label (Python code)<ms>self.myId + "thistimer"<ms><special> <Shape>20322143 extra <special>Tool Tip<ms>Death<ms><special> <Shape>18160141 extra <special>Tool Tip<ms>Load New Graph<ms><special>new graph file (Python code)<ms>"child.graph"<ms><special>Python variable to pass to child<ms>self.data[a]<ms><special> <Shape>4154189 extra <special>Tool Tip<ms>End For Loop<ms><special> <Shape>2352210 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9152120152,120,153,214<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>315393 extra <special>Tool Tip<ms>Start For<ms><special>Initialise (Python code)<ms>self.i = 0<ms><special>Test for Termination (Python code)<ms>self.i < 20<ms><special>Increment (Python code)<ms>self.i++<ms><special> <Shape>116046 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>14362122 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>Terminating<ms><special>Python variable to hold event data<ms>self.termTime<ms><special> <Shape>10360161 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "child has terminated", self.termTime<ms><special> <Shape>2387145 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>1432196 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>timer<ms><special>Python variable to hold event data<ms>self.eventData<ms><special> <Shape> Modified: sofaswitch/trunk/voip/mymanager.cxx ============================================================================== --- sofaswitch/trunk/voip/mymanager.cxx (original) +++ sofaswitch/trunk/voip/mymanager.cxx Tue Nov 21 16:03:10 2006 @@ -168,13 +168,15 @@ toDelete += "H.261(QCIF)"; toDelete += "RGB32"; toDelete += "RGB24"; - - if (args.HasOption('D')) - toDelete += args.GetOptionString('D').Lines(); + toDelete += "G.711-uLaw-64k"; + toDelete += "G.711-ALaw-64k"; + PStringArray toRemove = args.GetOptionString('D').Lines(); + PStringArray toReorder = args.GetOptionString('P').Lines(); + toDelete += toRemove; - SetMediaFormatMask(toDelete); + SetMediaFormatMask(toRemove); if (args.HasOption('P')) - SetMediaFormatOrder(args.GetOptionString('P').Lines()); + SetMediaFormatOrder(toReorder); cout << "Jitter buffer: " << GetMinAudioJitterDelay() << '-' << GetMaxAudioJitterDelay() << " ms\n" "Codecs removed: " << setfill(',') << GetMediaFormatMask() << "\n"

1 0

[commit] r214 - in sofaswitch/trunk/callflow: docs docs/current src
by SofaSWITCH SVN 20 Nov '06

20 Nov '06

Author: derek Date: Mon Nov 20 16:02:30 2006 New Revision: 214 Modified: sofaswitch/trunk/callflow/docs/current/eachicon.dxy sofaswitch/trunk/callflow/docs/description.dxy sofaswitch/trunk/callflow/src/shapelist.cpp Log: Append additional information to the files. Modified: sofaswitch/trunk/callflow/docs/current/eachicon.dxy ============================================================================== --- sofaswitch/trunk/callflow/docs/current/eachicon.dxy (original) +++ sofaswitch/trunk/callflow/docs/current/eachicon.dxy Mon Nov 20 16:02:30 2006 @@ -393,8 +393,40 @@ died before the child. In this case, the "advice on termination" mesasge is never sent - the server has nowhere to send it. +The compilation processes makes a python executable and a graph file. The +python executable is, in fact, able to process any graph file. This happens as +the python executable contains all the methods for all known types of +items. Indeed, if you compile two different graphs on the screen, the only +difference in the generated python code is the specified graph file. +When the python executable processes a graph file, the following variables are +available for the user to access. Sometimes, it is helpful to include a print +statement in development graphs to report on these variables. The user may +modify these variables (at their own peril) to give interesting results. For +example, one could modify self.data[a] to control which node in the graph is +executed next. + +\li \code self.data[a] \endcode The data structure describing this node on the graph +\li \code self.pendingEvents \endcode Holds the name of timers waiting to expire. +\li \code self.isMaster \endcode Boolean flag, if this graph is + generated directly from the command line. +\li \code self.parentId \endcode The id assigned to the parent graph by + the server, or \c None (if this graph + is generated directly from the command line) +\li \code self.myId \endcode The id assigned to this graph by the server +\li \code self.currentHandlers\endcode List of registered handlers, which is + populated by the \ref seubsecEventer item +\li \code self.generatedEvents\endcode A list of events we have to examine at + the next opportunity +\li \code self.keepGoing \endcode A flag to inidicate that we should keep + working along this graph. If set to \c + False , it is equivalent to processing + a \ref subsecEndProcessing + +To send a message to a particular node, you would do +\code self.transport.write("remId:the_message \0")\endcode +This may need to be modified to protect the quotes and backslash. \subsection subsecMakeCall Make a call Modified: sofaswitch/trunk/callflow/docs/description.dxy ============================================================================== --- sofaswitch/trunk/callflow/docs/description.dxy (original) +++ sofaswitch/trunk/callflow/docs/description.dxy Mon Nov 20 16:02:30 2006 @@ -1,7 +1,16 @@ /*! \page pageCallFlow Detailed description of CallFlow -\section secIntro Introduction +This page is provided as an introduction to the CallFlow utility. The +following sections are provided to help explain this utility and operation. +\li \ref secIntro +\li \ref secOverview +\li \ref secPython +\li \ref secHelloWorld +\li \ref secForLoop +\li \ref secEvent +\li \ref secUsage + The language chosen to control the SofaSwitch utilties is Python. It is reasonably tidy language, cross platform, straightforward syntax and does not have the dependency hell of perl. Sadly nothing is easy, and it takes @@ -67,7 +76,11 @@ To evaluate a conditional, the string is passed to the python command "eval", which returns a True or False value. +When the Python code executes, it has access to a number of variables relevant +to the processing of the graph. However, the user may access them if desired. +The user may change them, but this is not recommended. + \section secHelloWorld Hello World example Perhaps the simplest example of a graph you can create is the standard "Hello World" example, shown here. @@ -156,9 +169,6 @@ right mouse clicking on an item and adjusting the displayed setting. Some find it helpful to display in the tooltip of the forloop information about the number of loops that should be executed. - - - Modified: sofaswitch/trunk/callflow/src/shapelist.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/shapelist.cpp (original) +++ sofaswitch/trunk/callflow/src/shapelist.cpp Mon Nov 20 16:02:30 2006 @@ -431,7 +431,7 @@ file.AddLine(" along "); file.AddLine(" "); file.AddLine(" Note that when the timer object was initiated, an entry was put in "); - file.AddLine(" self.pendingEvent list statiing this event name. If the timer sas "); + file.AddLine(" self.pendingEvent list stating this event name. If the timer says "); file.AddLine(" deleted (after starting it) the corresponding event in the pending "); file.AddLine(" list will be absent "); file.AddLine(" \"\"\" ");

1 0

[commit] r213 - sofaswitch/trunk/callflow/tests
by SofaSWITCH SVN 20 Nov '06

20 Nov '06

Author: derek Date: Sun Nov 19 23:02:03 2006 New Revision: 213 Modified: sofaswitch/trunk/callflow/tests/makevoipcall.src Log: Fix connectivity issues, arising from software updates and size changes. Modified: sofaswitch/trunk/callflow/tests/makevoipcall.src ============================================================================== --- sofaswitch/trunk/callflow/tests/makevoipcall.src (original) +++ sofaswitch/trunk/callflow/tests/makevoipcall.src Sun Nov 19 23:02:03 2006 @@ -1,5 +1,4 @@ -14409257 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestsound<ms><special>Python variable to hold event data<ms>self.requestSound<ms><special> <Shape>119019 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>2425333 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>742303 extra <special>Tool Tip<ms>End Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special> <Shape>9506388506,388<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9214353214,353,216,402<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9418359421,359,418,448<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>1119171 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"voip"<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>requestvoip<ms><special>Additional information (Python code)<ms><ms><special> <Shape>10198252 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have a new voip node on ", self.voipNode<ms><special> <Shape>10293279 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print " have a sound node of ", self.soundNode<ms><special> <Shape>15190450 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.voipNode<ms><special>Second SofaSwitch worker (python)<ms>self.soundNode<ms><special> <Shape>5189304 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.voipNode != None) and (self.soundNode != None)<ms><special> <Shape>19216606 extra <special>Tool Tip<ms>Send Dtmf<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>DTMF to send to worker node (python code)<ms>self.dtmfData<ms><special> <Shape>244394 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>5193579 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>self.dtmfData=="9"<ms><special> <Shape>2218330 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>20336255 extra <special>Tool Tip<ms>Death<ms><special> <Shape>2227517 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>2435276 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>2215653 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9248182248,183,308,182<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>11191109 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"sound"<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>requestsound<ms><special>Additional information (Python code)<ms><ms><special> <Shape>1050213 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "hangup, as dtmf 9 has been received"<ms><special> <Shape>14373236 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestvoip<ms><special>Python variable to hold event data<ms>self.requestVoip<ms><special> <Shape>1542257 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>"sound"<ms><special>Second SofaSwitch worker (python)<ms>"sound"<ms><special> <Shape>13284231 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestsound<ms><special> <Shape>9386284386,284,386,313,424,314<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14202162 extra <special>Tool Tip<ms>Catch the creation of -the voip node<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>voipREQ<ms><special>Python variable to hold event data<ms>self.voipNode<ms><special> <Shape>14204496 extra <special>Tool Tip<ms>Catch DTMF events<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable to hold event data<ms>self.dtmfData<ms><special> <Shape>10200531 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "dtmf received of ", self.dtmfData<ms><special> <Shape>965199218,629,124,630,119,203,65,199,69,215<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14295185 extra <special>Tool Tip<ms>Catch the creation -of the sound node<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>soundREQU<ms><special>Python variable to hold event data<ms>self.soundNode<ms><special> <Shape>13189210 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestvoip<ms><special> <Shape>9216573216,573<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>97260418,498,391,731,7,726,18,260,66,260<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14333211 extra <special>Tool Tip<ms>Catch the timer which, when fired, -indicates the end of this call<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>hanguptime<ms><special>Python variable to hold event data<ms>self.hanguptime<ms><special> <Shape>9214307214,307,308,331<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>5397310 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.requestVoip==None) or(self.requestSound==None)<ms><special> <Shape>6189402 extra <special>Tool Tip<ms>Make Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>Call destination (python code)<ms>"h323:h323.voxgratia.org"<ms><special> <Shape>10403444 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "End this as the voip or sound did not respond in time"<ms><special> <Shape>1243349 extra <special>Tool Tip<ms>Initiate a timer, which causes this to -end.<ms><special>Timer period (seconds)<ms>0.1<ms><special>Timer label (string literal)<ms>hanguptime<ms><special> <Shape> +9216573216,573<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>6189402 extra <special>Tool Tip<ms>Make Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>Call destination (python code)<ms>"h323:h323.voxgratia.org"<ms><special> <Shape>119019 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>742303 extra <special>Tool Tip<ms>End Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special> <Shape>14373236 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestvoip<ms><special>Python variable to hold event data<ms>self.requestVoip<ms><special> <Shape>14409257 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestsound<ms><special>Python variable to hold event data<ms>self.requestSound<ms><special> <Shape>5397310 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.requestVoip==None) or(self.requestSound==None)<ms><special> <Shape>244394 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9214307214,307,308,331<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>13284231 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestsound<ms><special> <Shape>2227517 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9506388506,388<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2218330 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>2215653 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>19216606 extra <special>Tool Tip<ms>Send Dtmf<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>DTMF to send to worker node (python code)<ms>self.dtmfData<ms><special> <Shape>1119171 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"voip"<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>requestvoip<ms><special>Additional information (Python code)<ms><ms><special> <Shape>10293279 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print " have a sound node of ", self.soundNode<ms><special> <Shape>13189210 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestvoip<ms><special> <Shape>965199218,629,124,630,119,203,65,199,69,215<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9418359421,359,418,448<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>1542257 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>"sound"<ms><special>Second SofaSwitch worker (python)<ms>"sound"<ms><special> <Shape>1244346 extra <special>Tool Tip<ms>Timer<ms><special>Timer period (seconds, Python code)<ms>1<ms><special>Timer label (Python code)<ms>"hanguptime"<ms><special> <Shape>15190450 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.voipNode<ms><special>Second SofaSwitch worker (python)<ms>self.soundNode<ms><special> <Shape>10403444 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "End this as the voip or sound did not respond in time"<ms><special> <Shape>20336255 extra <special>Tool Tip<ms>Death<ms><special> <Shape>14202162 extra <special>Tool Tip<ms>Catch the creation of +the voip node<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>voipREQ<ms><special>Python variable to hold event data<ms>self.voipNode<ms><special> <Shape>9386284386,284,386,313,424,314<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9248182248,183,308,182<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2435276 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>10198252 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have a new voip node on ", self.voipNode<ms><special> <Shape>1050213 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "hangup, as dtmf 9 has been received"<ms><special> <Shape>14204496 extra <special>Tool Tip<ms>Catch DTMF events<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable to hold event data<ms>self.dtmfData<ms><special> <Shape>11191109 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"sound"<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>requestsound<ms><special>Additional information (Python code)<ms><ms><special> <Shape>5189304 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.voipNode != None) and (self.soundNode != None)<ms><special> <Shape>9214353214,353,216,402<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>97260418,498,391,731,7,726,18,260,66,260<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14333211 extra <special>Tool Tip<ms>Catch the timer which, when fired, +indicates the end of this call<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>hanguptime<ms><special>Python variable to hold event data<ms>self.hanguptime<ms><special> <Shape>5193579 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>self.dtmfData=="9"<ms><special> <Shape>10200531 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "dtmf received of ", self.dtmfData<ms><special> <Shape>2425333 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>14295185 extra <special>Tool Tip<ms>Catch the creation +of the sound node<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>soundREQU<ms><special>Python variable to hold event data<ms>self.soundNode<ms><special> <Shape>

1 0

[commit] r212 - sofaswitch/trunk/callflow/tests
by SofaSWITCH SVN 20 Nov '06

20 Nov '06

Author: derek Date: Sun Nov 19 22:33:10 2006 New Revision: 212 Modified: sofaswitch/trunk/callflow/tests/makevoipcall.src Log: Get the python objects to relink in, following size change. Connect all outputs of the eventer objects. Modified: sofaswitch/trunk/callflow/tests/makevoipcall.src ============================================================================== --- sofaswitch/trunk/callflow/tests/makevoipcall.src (original) +++ sofaswitch/trunk/callflow/tests/makevoipcall.src Sun Nov 19 22:33:10 2006 @@ -1,5 +1,5 @@ -10189255 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have a new voip node on ", self.voipNode<ms><special> <Shape>14333211 extra <special>Tool Tip<ms>Catch the timer which, when fired, -indicates the end of this call<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>hanguptime<ms><special>Python variable to hold event data<ms>self.hanguptime<ms><special> <Shape>9214353214,353,216,402<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10193540 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "dtmf received of ", self.dtmfData<ms><special> <Shape>14370236 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestvoip<ms><special>Python variable to hold event data<ms>self.requestVoip<ms><special> <Shape>1119171 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"voip"<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>requestvoip<ms><special>Additional information (Python code)<ms><ms><special> <Shape>14202162 extra <special>Tool Tip<ms>Catch the creation of -the voip node<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>voipREQ<ms><special>Python variable to hold event data<ms>self.voipNode<ms><special> <Shape>119019 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>2425333 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>10393450 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "End this as the voip or sound did not respond in time"<ms><special> <Shape>9506388506,388<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2215653 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>14295185 extra <special>Tool Tip<ms>Catch the creation -of the sound node<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>soundREQU<ms><special>Python variable to hold event data<ms>self.soundNode<ms><special> <Shape>1243349 extra <special>Tool Tip<ms>Initiate a timer, which causes this to -end.<ms><special>Timer period (seconds)<ms>0.1<ms><special>Timer label (string literal)<ms>hanguptime<ms><special> <Shape>13189210 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestvoip<ms><special> <Shape>965199218,629,124,630,119,203,65,199,69,215<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>15190450 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.voipNode<ms><special>Second SofaSwitch worker (python)<ms>self.soundNode<ms><special> <Shape>1542257 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>"sound"<ms><special>Second SofaSwitch worker (python)<ms>"sound"<ms><special> <Shape>2218330 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>14204496 extra <special>Tool Tip<ms>Catch DTMF events<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable to hold event data<ms>self.dtmfData<ms><special> <Shape>1043211 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "hangup, as dtmf 9 has been received"<ms><special> <Shape>13284231 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestsound<ms><special> <Shape>9214307214,307,308,331<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>742303 extra <special>Tool Tip<ms>End Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special> <Shape>11191109 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"sound"<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>requestsound<ms><special>Additional information (Python code)<ms><ms><special> <Shape>9418359421,359,418,448<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>5193579 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>self.dtmfData=="9"<ms><special> <Shape>19216606 extra <special>Tool Tip<ms>Send Dtmf<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>DTMF to send to worker node (python code)<ms>self.dtmfData<ms><special> <Shape>10282279 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print " have a sound node of ", self.soundNode<ms><special> <Shape>5397310 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.requestVoip==None) or(self.requestSound==None)<ms><special> <Shape>9216573216,573<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14407261 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestsound<ms><special>Python variable to hold event data<ms>self.requestSound<ms><special> <Shape>9248182248,183,308,182<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>6189402 extra <special>Tool Tip<ms>Make Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>Call destination (python code)<ms>"h323:h323.voxgratia.org"<ms><special> <Shape>244394 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>20336255 extra <special>Tool Tip<ms>Death<ms><special> <Shape>9386284386,284,386,313,424,314<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>5189304 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.voipNode != None) and (self.soundNode != None)<ms><special> <Shape>97260418,498,391,731,7,726,18,260,66,260<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape> +14409257 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestsound<ms><special>Python variable to hold event data<ms>self.requestSound<ms><special> <Shape>119019 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>2425333 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>742303 extra <special>Tool Tip<ms>End Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special> <Shape>9506388506,388<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9214353214,353,216,402<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9418359421,359,418,448<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>1119171 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"voip"<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>requestvoip<ms><special>Additional information (Python code)<ms><ms><special> <Shape>10198252 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have a new voip node on ", self.voipNode<ms><special> <Shape>10293279 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print " have a sound node of ", self.soundNode<ms><special> <Shape>15190450 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.voipNode<ms><special>Second SofaSwitch worker (python)<ms>self.soundNode<ms><special> <Shape>5189304 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.voipNode != None) and (self.soundNode != None)<ms><special> <Shape>19216606 extra <special>Tool Tip<ms>Send Dtmf<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>DTMF to send to worker node (python code)<ms>self.dtmfData<ms><special> <Shape>244394 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>5193579 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>self.dtmfData=="9"<ms><special> <Shape>2218330 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>20336255 extra <special>Tool Tip<ms>Death<ms><special> <Shape>2227517 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>2435276 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>2215653 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9248182248,183,308,182<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>11191109 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"sound"<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>requestsound<ms><special>Additional information (Python code)<ms><ms><special> <Shape>1050213 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "hangup, as dtmf 9 has been received"<ms><special> <Shape>14373236 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestvoip<ms><special>Python variable to hold event data<ms>self.requestVoip<ms><special> <Shape>1542257 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>"sound"<ms><special>Second SofaSwitch worker (python)<ms>"sound"<ms><special> <Shape>13284231 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestsound<ms><special> <Shape>9386284386,284,386,313,424,314<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14202162 extra <special>Tool Tip<ms>Catch the creation of +the voip node<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>voipREQ<ms><special>Python variable to hold event data<ms>self.voipNode<ms><special> <Shape>14204496 extra <special>Tool Tip<ms>Catch DTMF events<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable to hold event data<ms>self.dtmfData<ms><special> <Shape>10200531 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "dtmf received of ", self.dtmfData<ms><special> <Shape>965199218,629,124,630,119,203,65,199,69,215<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14295185 extra <special>Tool Tip<ms>Catch the creation +of the sound node<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>soundREQU<ms><special>Python variable to hold event data<ms>self.soundNode<ms><special> <Shape>13189210 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestvoip<ms><special> <Shape>9216573216,573<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>97260418,498,391,731,7,726,18,260,66,260<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14333211 extra <special>Tool Tip<ms>Catch the timer which, when fired, +indicates the end of this call<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>hanguptime<ms><special>Python variable to hold event data<ms>self.hanguptime<ms><special> <Shape>9214307214,307,308,331<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>5397310 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.requestVoip==None) or(self.requestSound==None)<ms><special> <Shape>6189402 extra <special>Tool Tip<ms>Make Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>Call destination (python code)<ms>"h323:h323.voxgratia.org"<ms><special> <Shape>10403444 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "End this as the voip or sound did not respond in time"<ms><special> <Shape>1243349 extra <special>Tool Tip<ms>Initiate a timer, which causes this to +end.<ms><special>Timer period (seconds)<ms>0.1<ms><special>Timer label (string literal)<ms>hanguptime<ms><special> <Shape>

1 0

[commit] r211 - in sofaswitch/trunk: . server sound
by SofaSWITCH SVN 20 Nov '06

20 Nov '06

Author: derek Date: Sun Nov 19 22:28:58 2006 New Revision: 211 Modified: sofaswitch/trunk/allprograms.cxx sofaswitch/trunk/docs.cfg sofaswitch/trunk/message.cxx sofaswitch/trunk/server/docs.cfg sofaswitch/trunk/sound/audio.h sofaswitch/trunk/sound/docs.cfg Log: Add documentation tidyups to get it to work better. Put a link to call flow inside the list of sofa applications. Modified: sofaswitch/trunk/allprograms.cxx ============================================================================== --- sofaswitch/trunk/allprograms.cxx (original) +++ sofaswitch/trunk/allprograms.cxx Sun Nov 19 22:28:58 2006 @@ -30,11 +30,12 @@ /** \page pageSofaSwitchPrograms Current Programs in Sofa Switch -\li <a class="el" href="am/index.html"> answering machine</a> -\li <a class="el" href="mcu/index.html"> conference utility</a> -\li <a class="el" href="server/index.html"> message server</a> -\li <a class="el" href="sofa/index.html"> sofa library</a> -\li <a class="el" href="sound/index.html"> sound card utility</a> -\li <a class="el" href="voip/index.html"> voip handler</a> +\li <a class="el" href="am/index.html"> answering machine</a> +\li <a class="el" href="callflow/index.html"> call control</a> +\li <a class="el" href="mcu/index.html"> conference utility</a> +\li <a class="el" href="server/index.html"> message server</a> +\li <a class="el" href="sofa/index.html"> sofa library</a> +\li <a class="el" href="sound/index.html"> sound card utility</a> +\li <a class="el" href="voip/index.html"> voip handler</a> */ Modified: sofaswitch/trunk/docs.cfg ============================================================================== --- sofaswitch/trunk/docs.cfg (original) +++ sofaswitch/trunk/docs.cfg Sun Nov 19 22:28:58 2006 @@ -68,9 +68,9 @@ # configuration options related to the input files #--------------------------------------------------------------------------- INPUT = . -FILE_PATTERNS = +FILE_PATTERNS = *.dxy *.cxx RECURSIVE = NO -EXCLUDE = +EXCLUDE = *.py EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = EXAMPLE_PATH = Modified: sofaswitch/trunk/message.cxx ============================================================================== --- sofaswitch/trunk/message.cxx (original) +++ sofaswitch/trunk/message.cxx Sun Nov 19 22:28:58 2006 @@ -247,25 +247,29 @@ <center> <table width="600"> <tr><td> - quitnow</td><td> Cause the server to end. On ending, every application + quitnow</td><td> + Cause the server to end. On ending, every application connected to the server will end also. </td></tr> -<tr><td> list</td><td> Cause the server to respond with a list of all the - currently connected nodes. The command "list" is - similar to the notion of presence as used in XMPP, - except that here, presence is driven by the client. +<tr><td> list</td><td> + Cause the server to respond with a list of all the currently + connected nodes. The command "list" is similar to the notion + of presence as used in XMPP, except that here, presence is + driven by the client. </td></tr> -<tr><td> whoami </td><td> A request to the server to advise us who we - are. This command is useful when we are some controller who - has connected to the server and asked the server to generate - a unique Id for us. It is also a debugging tool from the command - prompt case - we can enquire of the server to report our ID. +<tr><td> whoami </td><td> + A request to the server to advise us who we are. This command + is useful when we are some controller who has connected to + the server and asked the server to generate a unique Id for + us. It is also a debugging tool from the command prompt case + - we can enquire of the server to report our ID. </td></tr> -<tr><td>adviseontermination remNode</td><td>This commands the server to (on - this node terminating) send a message to the specified node - (remNode). The message will advise remNode that this this - node has died. Thus, the controller will get a message if the - box running the answer machine (for example) is unplugged. +<tr><td>adviseontermination remNode</td><td> + This commands the server to (on this node terminating) send a + message to the specified node (remNode). The message will + advise remNode that this this node has died. Thus, the + controller will get a message if the box running the answer + machine (for example) is unplugged. </td></tr> </table> </center> Modified: sofaswitch/trunk/server/docs.cfg ============================================================================== --- sofaswitch/trunk/server/docs.cfg (original) +++ sofaswitch/trunk/server/docs.cfg Sun Nov 19 22:28:58 2006 @@ -180,7 +180,7 @@ SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = +PREDEFINED = DOC_PLUS_PLUS EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- Modified: sofaswitch/trunk/sound/audio.h ============================================================================== --- sofaswitch/trunk/sound/audio.h (original) +++ sofaswitch/trunk/sound/audio.h Sun Nov 19 22:28:58 2006 @@ -17,8 +17,6 @@ /**The base class for reading and writing audio from/to the sound device. This class will take audio to/from the PUDPSocket, and transfer it to/from the sound device */ -class PQueueChannel; - class TestAudio : public PThread { PCLASSINFO(TestAudio, PThread); @@ -90,8 +88,7 @@ /**Constructor */ TestAudioWrite(PUDPSocket &_socket, PSoundChannel &_sound); - /**Destructor. This deletes the PQueueChannel we allocated in the - constructor */ + /**Destructor. This does any required tidy ups.*/ ~TestAudioWrite(); /**the main entry point, where this thread starts */ Modified: sofaswitch/trunk/sound/docs.cfg ============================================================================== --- sofaswitch/trunk/sound/docs.cfg (original) +++ sofaswitch/trunk/sound/docs.cfg Sun Nov 19 22:28:58 2006 @@ -109,7 +109,7 @@ HTML_FILE_EXTENSION = .html HTML_HEADER = HTML_FOOTER = -HTML_STYLESHEET = YES +HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = NO CHM_FILE = @@ -180,7 +180,7 @@ SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = +PREDEFINED = DOC_PLUS_PLUS EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #---------------------------------------------------------------------------

1 0

[commit] r210 - in sofaswitch/trunk/callflow: docs/current src tests
by SofaSWITCH SVN 20 Nov '06

20 Nov '06

Author: derek Date: Sun Nov 19 19:37:21 2006 New Revision: 210 Added: sofaswitch/trunk/callflow/tests/child.src sofaswitch/trunk/callflow/tests/parent.src Modified: sofaswitch/trunk/callflow/docs/current/eachicon.dxy sofaswitch/trunk/callflow/src/loadnewgraph.cpp sofaswitch/trunk/callflow/src/shapelist.cpp Log: Add a child and parent file, which illustrate the load new graph item. Add code to the loadnewgraph functions to do the things described in the documentation. Add to the documentation so that it describes correctly how loadnewgraph works. Add to the generated python code the notion of self.parentId, and the ability to pass variable data from the parent to the child. Modified: sofaswitch/trunk/callflow/docs/current/eachicon.dxy ============================================================================== --- sofaswitch/trunk/callflow/docs/current/eachicon.dxy (original) +++ sofaswitch/trunk/callflow/docs/current/eachicon.dxy Sun Nov 19 19:37:21 2006 @@ -363,8 +363,15 @@ As a convenience, the child process always has a Python variable, "self.parentId" defined, which contains the id of the child process. The child -may send a message (via the server) to the parent Id indicating status. +may send a message (via the server) to the parent Id indicating status. The +variable "self.parentId" is None, if there is no parent. +The data (or Python variable) specified in the bottom rectangle of the +properties window is contained in Python variable, "self.userData" of the +child graph. This variable is None, if no data was specified. If there is an +error in processing the specified variable, None will be assigned to +"self.userData" + The graph in the figure \image html exloadnewgraph.png illustrates the operation of this item. There are two event handlers setup, @@ -380,7 +387,11 @@ \li if the parent graph is itself a child graph, only the processing of the parent graph is terminated. - +As a convenience, when the child dies, the server will automatically send an +"Advise on termination message" to the parent. Thus, the parent has a way of +knowing when a child graph terminates. There is no error if the parent has +died before the child. In this case, the "advice on termination" mesasge is +never sent - the server has nowhere to send it. Modified: sofaswitch/trunk/callflow/src/loadnewgraph.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/loadnewgraph.cpp (original) +++ sofaswitch/trunk/callflow/src/loadnewgraph.cpp Sun Nov 19 19:37:21 2006 @@ -29,6 +29,9 @@ displayData[displayData.size()] = InformationSection(wxT("new graph file (Python code)"), wxT("\"file_graph\"")); + displayData[displayData.size()] = + InformationSection(wxT("Python variable to pass to child"), wxT("self.data[a]")); + AdjustIoPoints(); } @@ -69,14 +72,20 @@ file.AddLine(" def Load_New_Graph(self, sTuple): "); file.AddLine(" a,b,c = sTuple "); file.AddLine(" try: "); - file.AddLine(" self.fname = eval(self.data[a][\"new graph file\"]) "); + file.AddLine(" self.udata = (self.myId, eval(self.data[a][\"user variable\"]) )"); file.AddLine(" except: "); + file.AddLine(" self.udata = (self.myId, None) "); + file.AddLine(" "); + file.AddLine(" try: "); + file.AddLine(" self.fname = eval(self.data[a][\"new graph file\"]) "); + file.AddLine(" except: "); file.AddLine(" print \"The new graph file \", self.data[a][\"new graph file\"], \" is not a valid Python string\" "); file.AddLine(" self.fname = None "); file.AddLine(" f = MyFactory() "); file.AddLine(" f.isMaster = False "); file.AddLine(" f.setGraph(self.fname) "); file.AddLine(" f.setMaster(False) "); + file.AddLine(" f.setUserData(self.udata) "); file.AddLine(" reactor.connectTCP(sofaServer, 5000, f) "); file.AddLine(" return self.data[a][\"Output\"] "); file.AddLine(""); @@ -100,6 +109,10 @@ file.AddLine(wxString::Format(" \"new graph file\" : ")); wxString dest = ProtectString(displayData[1].data); + file.AddLine(wxString::Format(" \"%s\", ", dest.c_str())); + + file.AddLine(wxString::Format(" \"user variable\" : ")); + dest = ProtectString(displayData[2].data); file.AddLine(wxString::Format(" \"%s\", ", dest.c_str())); file.AddLine(wxString::Format(" },")); Modified: sofaswitch/trunk/callflow/src/shapelist.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/shapelist.cpp (original) +++ sofaswitch/trunk/callflow/src/shapelist.cpp Sun Nov 19 19:37:21 2006 @@ -310,6 +310,7 @@ file.AddLine(" self.knownNetworkMessages= [] "); file.AddLine(" self.knownNetworkMessages.append(\"REQUESTNEWID\") "); file.AddLine(" self.knownNetworkMessages.append(\"RECEIVEDDTMF\") "); + file.AddLine(" self.knownNetworkMessages.append(\"Terminating\") "); // file.AddLine(" self.knownNetworkMessages.append(\"\") "); char c= 34; wxString tString = wxString::Format(" self.quote = \"\\%c\"", c); @@ -322,6 +323,16 @@ file.AddLine(" process that was invoked from the command line. "); file.AddLine(" \"\"\" "); file.AddLine(" self.isMaster = newIsMaster "); + file.AddLine(" "); + file.AddLine(" def setUserData(self, newData): "); + file.AddLine(" \"\"\"transfer data process, which is required when we "); + file.AddLine(" create a child graph of a parent graph, when we have "); + file.AddLine(" spawned a new process. The variable self.parentId is "); + file.AddLine(" the id of the parent, or None, if there is no parent "); + file.AddLine(" The variable self.userData contains the data transferred, "); + file.AddLine(" or None, if there is no data data transferred. "); + file.AddLine(" \"\"\" "); + file.AddLine(" self.parentId, self.userData = newData "); file.AddLine(" "); file.AddLine(" def setGraphData(self, graphFile): "); file.AddLine(" \"\"\"Read in the file which describes where the flow "); @@ -493,6 +504,11 @@ file.AddLine(" if self.countReceived == 1: "); file.AddLine(" self.myId = oneMessage; "); file.AddLine(" self.timeout2 = reactor.callLater(0, self.startTimerExpired, \"connected\")"); + file.AddLine(" try: "); + file.AddLine(" self.tmsg= \"AdviseOnTermination \" + self.parentId + \"\\0\" "); + file.AddLine(" self.transport.write(self.tmsg) "); + file.AddLine(" except: "); + file.AddLine(" self.tmsg = None "); file.AddLine(" else: "); file.AddLine(" self.processReceivedMessage(oneMessage)"); file.AddLine(" "); @@ -555,6 +571,7 @@ file.AddLine(" self.myController = p "); file.AddLine(" self.myController.setGraphData(self.myGraphName) "); file.AddLine(" self.myController.setMaster(self.isMaster) "); + file.AddLine(" self.myController.setUserData(self.userData) "); file.AddLine(" return p "); file.AddLine(" "); file.AddLine(" def setGraph(self, newName): "); @@ -563,10 +580,14 @@ file.AddLine(" def setMaster(self, newMaster): "); file.AddLine(" self.isMaster = newMaster "); file.AddLine(" "); + file.AddLine(" def setUserData(self, newData): "); + file.AddLine(" self.userData = newData "); file.AddLine(" "); + file.AddLine(" "); file.AddLine("f = MyFactory() "); file.AddLine(wxString::Format("f.setGraph(\"%s\") ", graphFileName.c_str())); file.AddLine("f.setMaster(True) "); + file.AddLine("f.setUserData((None, None)) "); file.AddLine("reactor.connectTCP(sofaServer, 5000, f) "); file.AddLine("reactor.run() "); file.AddLine(" "); Added: sofaswitch/trunk/callflow/tests/child.src ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/tests/child.src Sun Nov 19 19:37:21 2006 @@ -0,0 +1 @@ +20531142 extra <special>Tool Tip<ms>Death<ms><special> <Shape>151850 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>1052893 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "CHILD says::: parent id is ", self.parentId, " user data is ", self.userData<ms><special> <Shape> Added: sofaswitch/trunk/callflow/tests/parent.src ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/tests/parent.src Sun Nov 19 19:37:21 2006 @@ -0,0 +1 @@ +14574226 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>Terminating<ms><special>Python variable to hold event data<ms>self.termTime<ms><special> <Shape>14533200 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>timer<ms><special>Python variable to hold event data<ms>self.eventData<ms><special> <Shape>1851899 extra <special>Tool Tip<ms>Load New Graph<ms><special>new graph file (Python code)<ms>"child.graph"<ms><special>Python variable to pass to child<ms>self.data[a]<ms><special> <Shape>2564314 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>151850 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>2599249 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>20534247 extra <special>Tool Tip<ms>Death<ms><special> <Shape>10572265 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "child has terminated", self.termTime<ms><special> <Shape>12519146 extra <special>Tool Tip<ms>Timer<ms><special>Timer period (seconds, Python code)<ms>10<ms><special>Timer label (Python code)<ms>self.myId + "thistimer"<ms><special> <Shape>

1 0

[commit] r209 - sofaswitch/trunk/server
by SofaSWITCH SVN 19 Nov '06

19 Nov '06

Author: derek Date: Sun Nov 19 18:20:19 2006 New Revision: 209 Modified: sofaswitch/trunk/server/main.cxx Log: Remove a message to the console. Modified: sofaswitch/trunk/server/main.cxx ============================================================================== --- sofaswitch/trunk/server/main.cxx (original) +++ sofaswitch/trunk/server/main.cxx Sun Nov 19 18:20:19 2006 @@ -360,8 +360,6 @@ if (!adviseOnTermination.IsEmpty()) { PStringStream msg; - cerr << "send terminating message to "<< adviseOnTermination << " from " - << sourceId << endl; msg << sourceId << ":Terminating"; PSafePtr <TcpConnection> conn = manager.GetConnectionWithLock(adviseOnTermination, PSafeReadOnly);

1 0

[commit] r208 - sofaswitch/trunk/callflow/docs
by SofaSWITCH SVN 19 Nov '06

19 Nov '06

Author: derek Date: Sun Nov 19 17:02:21 2006 New Revision: 208 Added: sofaswitch/trunk/callflow/docs/deathexample.png (contents, props changed) Log: Add an example to illustrate the operation of the death icon Added: sofaswitch/trunk/callflow/docs/deathexample.png ============================================================================== Binary file. No diff available.

1 0