November 2006 - sofaswitch-svn@lists.freeswitch.org

[Sofaswitch-svn] [commit] r187 - sofaswitch/trunk/callflow/docs/current
by SofaSWITCH SVN 13 Nov '06

13 Nov '06

Author: derek Date: Mon Nov 13 16:54:43 2006 New Revision: 187 Added: sofaswitch/trunk/callflow/docs/current/ sofaswitch/trunk/callflow/docs/current/conditional.png (contents, props changed) sofaswitch/trunk/callflow/docs/current/death.png (contents, props changed) sofaswitch/trunk/callflow/docs/current/endcall.png (contents, props changed) sofaswitch/trunk/callflow/docs/current/endflow.png (contents, props changed) sofaswitch/trunk/callflow/docs/current/endfor.png (contents, props changed) sofaswitch/trunk/callflow/docs/current/eventer.png (contents, props changed) sofaswitch/trunk/callflow/docs/current/joinlines.png (contents, props changed) sofaswitch/trunk/callflow/docs/current/loadnewgraph.png (contents, props changed) sofaswitch/trunk/callflow/docs/current/makecall.png (contents, props changed) sofaswitch/trunk/callflow/docs/current/playfromfile.png (contents, props changed) sofaswitch/trunk/callflow/docs/current/python.png (contents, props changed) sofaswitch/trunk/callflow/docs/current/recordtofile.png (contents, props changed) sofaswitch/trunk/callflow/docs/current/requestnode.png (contents, props changed) sofaswitch/trunk/callflow/docs/current/senddtmf.png (contents, props changed) sofaswitch/trunk/callflow/docs/current/startflow.png (contents, props changed) sofaswitch/trunk/callflow/docs/current/startfor.png (contents, props changed) sofaswitch/trunk/callflow/docs/current/starttimer.png (contents, props changed) sofaswitch/trunk/callflow/docs/current/transfermedia.png (contents, props changed) Log: Add images of each shape, as it is shown on the drawing area. Added: sofaswitch/trunk/callflow/docs/current/conditional.png ============================================================================== Binary file. No diff available. Added: sofaswitch/trunk/callflow/docs/current/death.png ============================================================================== Binary file. No diff available. Added: sofaswitch/trunk/callflow/docs/current/endcall.png ============================================================================== Binary file. No diff available. Added: sofaswitch/trunk/callflow/docs/current/endflow.png ============================================================================== Binary file. No diff available. Added: sofaswitch/trunk/callflow/docs/current/endfor.png ============================================================================== Binary file. No diff available. Added: sofaswitch/trunk/callflow/docs/current/eventer.png ============================================================================== Binary file. No diff available. Added: sofaswitch/trunk/callflow/docs/current/joinlines.png ============================================================================== Binary file. No diff available. Added: sofaswitch/trunk/callflow/docs/current/loadnewgraph.png ============================================================================== Binary file. No diff available. Added: sofaswitch/trunk/callflow/docs/current/makecall.png ============================================================================== Binary file. No diff available. Added: sofaswitch/trunk/callflow/docs/current/playfromfile.png ============================================================================== Binary file. No diff available. Added: sofaswitch/trunk/callflow/docs/current/python.png ============================================================================== Binary file. No diff available. Added: sofaswitch/trunk/callflow/docs/current/recordtofile.png ============================================================================== Binary file. No diff available. Added: sofaswitch/trunk/callflow/docs/current/requestnode.png ============================================================================== Binary file. No diff available. Added: sofaswitch/trunk/callflow/docs/current/senddtmf.png ============================================================================== Binary file. No diff available. Added: sofaswitch/trunk/callflow/docs/current/startflow.png ============================================================================== Binary file. No diff available. Added: sofaswitch/trunk/callflow/docs/current/startfor.png ============================================================================== Binary file. No diff available. Added: sofaswitch/trunk/callflow/docs/current/starttimer.png ============================================================================== Binary file. No diff available. Added: sofaswitch/trunk/callflow/docs/current/transfermedia.png ============================================================================== Binary file. No diff available.

1 0

[Sofaswitch-svn] [commit] r186 - sofaswitch/trunk/callflow/docs
by SofaSWITCH SVN 13 Nov '06

13 Nov '06

Author: derek Date: Mon Nov 13 16:29:28 2006 New Revision: 186 Modified: sofaswitch/trunk/callflow/docs/forloop.png sofaswitch/trunk/callflow/docs/helloworld.png sofaswitch/trunk/callflow/docs/simpleevent.png Log: Change pictures, cause we use a different icon to indicate python code now. Modified: sofaswitch/trunk/callflow/docs/forloop.png ============================================================================== Binary files. No diff available. Modified: sofaswitch/trunk/callflow/docs/helloworld.png ============================================================================== Binary files. No diff available. Modified: sofaswitch/trunk/callflow/docs/simpleevent.png ============================================================================== Binary files. No diff available.

1 0

[Sofaswitch-svn] [commit] r185 - sofaswitch/trunk/callflow/src
by SofaSWITCH SVN 13 Nov '06

13 Nov '06

Author: derek Date: Mon Nov 13 16:22:10 2006 New Revision: 185 Modified: sofaswitch/trunk/callflow/src/callstartstop.cpp sofaswitch/trunk/callflow/src/eventer.cpp sofaswitch/trunk/callflow/src/loadnewgraph.cpp sofaswitch/trunk/callflow/src/python.cpp sofaswitch/trunk/callflow/src/requestnode.cpp sofaswitch/trunk/callflow/src/senddtmf.cpp sofaswitch/trunk/callflow/src/shapelist.cpp sofaswitch/trunk/callflow/src/transfermedia.cpp Log: Protect every usage of the Python eval and exec with a try/except clause. Thus, the user cannot terminate execution of everything with a minor syntax error. Further, we get a more useful printout of what is wrong. Modified: sofaswitch/trunk/callflow/src/callstartstop.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/callstartstop.cpp (original) +++ sofaswitch/trunk/callflow/src/callstartstop.cpp Mon Nov 13 16:22:10 2006 @@ -41,15 +41,25 @@ { wxString header = wxString::Format(" def %s(self, sTuple):", (kind == MakeCall ? "Make_Call" : "End_Call")); file.AddLine(header); - file.AddLine(" a,b,c = sTuple "); - file.AddLine(" rhost = eval(self.data[a][\"worker node\"]) "); + file.AddLine(" a,b,c = sTuple "); + file.AddLine(" try: "); + file.AddLine(" self.rhost = eval(self.data[a][\"worker node\"]) "); + file.AddLine(" except: "); + file.AddLine(" print \"The worker node string \", self.data[a][\"worker node\"], \" could not be evaluated as a python string\" "); + file.AddLine(" self.rhost = None "); + file.AddLine(" try: "); + file.AddLine(" self.dest = eval(self.data[a][\"call destination\"]) "); + file.AddLine(" except: "); + file.AddLine(" print \"The destination string \", self.data[a][\"call destination\"], \" could not be evaluated as a python string\" "); + file.AddLine(" self.dest = None "); + if (kind == MakeCall) - file.AddLine(" rhost += \":CALLNODE \" + eval(self.data[a][\"call destination\"]) + \"\\0\" "); + file.AddLine(" self.rhost += \":CALLNODE \" + self.dest + \"\\0\" "); else - file.AddLine(" rhost += \":HANGUP \\0\" "); - file.AddLine(" self.transport.write(rhost) "); - file.AddLine(" return self.data[a][\"Output\"] "); - file.AddLine(""); + file.AddLine(" self.rhost += \":HANGUP \\0\" "); + file.AddLine(" self.transport.write(self.rhost) "); + file.AddLine(" return self.data[a][\"Output\"] "); + file.AddLine(" "); return true; } Modified: sofaswitch/trunk/callflow/src/eventer.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/eventer.cpp (original) +++ sofaswitch/trunk/callflow/src/eventer.cpp Mon Nov 13 16:22:10 2006 @@ -124,7 +124,11 @@ file.AddLine(" a,b,c = sTuple "); file.AddLine(" pVbl = self.data[a][\"Event Variable\"] "); file.AddLine(" pVbl += \" = None\" "); - file.AddLine(" exec(pVbl) "); + file.AddLine(" try: "); + file.AddLine(" exec(pVbl) "); + file.AddLine(" except: "); + file.AddLine(" pVbl = self.data[a][\"Event Variable\"] "); + file.AddLine(" print \"The Python variable \", pVbl, \" to hold event output could not be initialisd\" "); file.AddLine(" ePyn = self.data[a][\"Event Python\"] "); file.AddLine(" eReg = self.data[a][\"Event RegExp\"] "); file.AddLine(" if len(ePyn) > 0: "); Modified: sofaswitch/trunk/callflow/src/loadnewgraph.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/loadnewgraph.cpp (original) +++ sofaswitch/trunk/callflow/src/loadnewgraph.cpp Mon Nov 13 16:22:10 2006 @@ -68,10 +68,14 @@ { file.AddLine(" def Load_New_Graph(self, sTuple): "); file.AddLine(" a,b,c = sTuple "); - file.AddLine(" fname = eval(self.data[a][\"new graph file\"]) "); + 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(fname) "); + file.AddLine(" f.setGraph(self.fname) "); file.AddLine(" f.setMaster(False) "); file.AddLine(" reactor.connectTCP(sofaServer, 5000, f) "); file.AddLine(" return self.data[a][\"Output\"] "); Modified: sofaswitch/trunk/callflow/src/python.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/python.cpp (original) +++ sofaswitch/trunk/callflow/src/python.cpp Mon Nov 13 16:22:10 2006 @@ -56,10 +56,13 @@ bool DndShapePython::WriteSystemCode(wxTextFile & file) { - file.AddLine(" def Python(self, sTuple): "); - file.AddLine(" a,b,c = sTuple"); - file.AddLine(" exec(self.data[a][\"Python Code\"])"); - file.AddLine(" return self.data[a][\"Output\"]"); + file.AddLine(" def Python(self, sTuple): "); + file.AddLine(" a,b,c = sTuple "); + file.AddLine(" try: "); + file.AddLine(" exec(self.data[a][\"Python Code\"]) "); + file.AddLine(" except: "); + file.AddLine(" print \"Python code \", self.data[a][\"Python Code\"], \" could not be executed\" "); + file.AddLine(" return self.data[a][\"Output\"] "); file.AddLine(""); return true; Modified: sofaswitch/trunk/callflow/src/requestnode.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/requestnode.cpp (original) +++ sofaswitch/trunk/callflow/src/requestnode.cpp Mon Nov 13 16:22:10 2006 @@ -81,10 +81,18 @@ file.AddLine(" self.pendingEvents[eName] = a "); file.AddLine(" reactor.callLater(self.data[a][\"Timer period\"], self.timerObjectExpired, eName)"); file.AddLine(" rhost = self.data[a][\"Request node from\"] "); - file.AddLine(" rhost = eval(rhost) + \":REQUESTNEWID \" "); + file.AddLine(" try: "); + file.AddLine(" rhost = eval(rhost) + \":REQUESTNEWID \" "); + file.AddLine(" except: "); + file.AddLine(" print \"Could not process \", self.data[a][\"Request node from\"], \" as a python string\" "); + file.AddLine(" return self.data[a][\"Output\"] "); file.AddLine(" additional = self.data[a][\"Additional info\"] "); file.AddLine(" if len(additional) > 0: "); - file.AddLine(" rhost += eval(additional) "); + file.AddLine(" try: "); + file.AddLine(" rhost += eval(additional) "); + file.AddLine(" except: "); + file.AddLine(" print \"Could not process \", additional, \" as a Python string \" "); + file.AddLine(" return self.data[a][\"Output\"] "); file.AddLine(" rhost += \"\\0\" "); file.AddLine(" self.transport.write(rhost) "); file.AddLine(" return self.data[a][\"Output\"] "); Modified: sofaswitch/trunk/callflow/src/senddtmf.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/senddtmf.cpp (original) +++ sofaswitch/trunk/callflow/src/senddtmf.cpp Mon Nov 13 16:22:10 2006 @@ -39,8 +39,19 @@ { file.AddLine(" def Send_Dtmf(self, sTuple): "); file.AddLine(" a,b,c = sTuple "); - file.AddLine(" rhost = eval(self.data[a][\"worker node\"]) "); - file.AddLine(" rhost += \":SENDDTMF \" + eval(self.data[a][\"dtmf to send\"]) + \"\\0\" "); + file.AddLine(" try: "); + file.AddLine(" rhost = eval(self.data[a][\"worker node\"]) "); + file.AddLine(" except: "); + file.AddLine(" print \"Could not process \", self.data[a][\"worker node\"], \" as a Python string\" "); + file.AddLine(" return self.data[a][\"Output\"] "); + + file.AddLine(" self.sendDtmf= self.data[a][\"dtmf to send\"] "); + file.AddLine(" try: "); + file.AddLine(" rhost += \":SENDDTMF \" + eval(self.sendDtmf) + \"\\0\" "); + file.AddLine(" except: "); + file.AddLine(" print \"Could not process \", self.sendDtmf, \" as a Python string\" "); + file.AddLine(" return self.data[a][\"Output\"] "); + file.AddLine(" self.transport.write(rhost) "); file.AddLine(" return self.data[a][\"Output\"] "); file.AddLine(""); Modified: sofaswitch/trunk/callflow/src/shapelist.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/shapelist.cpp (original) +++ sofaswitch/trunk/callflow/src/shapelist.cpp Mon Nov 13 16:22:10 2006 @@ -388,7 +388,10 @@ file.AddLine(" eHandler = self.data[eventNode][\"Event Handler\"] "); file.AddLine(" pVbl = self.data[eventNode][\"Event Variable\"] "); file.AddLine(" pVbl += \" = \" + self.quote + eventData + self.quote "); - file.AddLine(" exec(pVbl) "); + file.AddLine(" try: "); + file.AddLine(" exec(pVbl) "); + file.AddLine(" except: "); + file.AddLine(" print \"An internal error processing \", pVbl "); file.AddLine(" self.DoWork(eHandler) "); file.AddLine(" self.generatedEvents.clear() "); file.AddLine(" "); Modified: sofaswitch/trunk/callflow/src/transfermedia.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/transfermedia.cpp (original) +++ sofaswitch/trunk/callflow/src/transfermedia.cpp Mon Nov 13 16:22:10 2006 @@ -69,12 +69,24 @@ bool DndShapeTransferMedia::WriteSystemCode(wxTextFile & file) { - file.AddLine(" def Transfer_Media(self, sTuple): "); - file.AddLine(" a,b,c = sTuple "); - file.AddLine(" rhost = eval(self.data[a][\"worker node\"]) "); - file.AddLine(" rhost += \":TRANSFERUDP \" + eval(self.data[a][\"worker receiver\"]) + \"\\0\" "); - file.AddLine(" self.transport.write(rhost) "); - file.AddLine(" return self.data[a][\"Output\"] "); + file.AddLine(" def Transfer_Media(self, sTuple): "); + file.AddLine(" a,b,c = sTuple "); + file.AddLine(" self.tMedia = self.data[a][\"worker node\"] "); + file.AddLine(" try: "); + file.AddLine(" self.rhost = eval(self.tMedia) "); + file.AddLine(" except: "); + file.AddLine(" print \"The Worker node Python \", self.tMedia, \" could not be evaluated\" "); + file.AddLine(" return self.data[a][\"Output\"] "); + + file.AddLine(" self.wNode = self.data[a][\"worker receiver\"] "); + file.AddLine(" try: "); + file.AddLine(" self.rhost += \":TRANSFERUDP \" + eval(self.wNode) + \"\\0\" "); + file.AddLine(" except: "); + file.AddLine(" print \"The node to transfer media to \", self.wNode, \" could not be evaluated\" "); + file.AddLine(" return self.data[a][\"Output\"] "); + + file.AddLine(" self.transport.write(self.rhost) "); + file.AddLine(" return self.data[a][\"Output\"] "); file.AddLine(""); return true;

1 0

[Sofaswitch-svn] [commit] r184 - sofaswitch/trunk/callflow/src
by SofaSWITCH SVN 13 Nov '06

13 Nov '06

Author: derek Date: Mon Nov 13 15:27:02 2006 New Revision: 184 Modified: sofaswitch/trunk/callflow/src/conditional.cpp sofaswitch/trunk/callflow/src/startfor.cpp Log: Protect calls to eval with try except statements. Thus, incorrect code prints out a warning when the user supplied code with cause a Python exception. Modified: sofaswitch/trunk/callflow/src/conditional.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/conditional.cpp (original) +++ sofaswitch/trunk/callflow/src/conditional.cpp Mon Nov 13 15:27:02 2006 @@ -84,7 +84,12 @@ file.AddLine(" def Conditional(self, aTuple): "); file.AddLine(" a,b,c = aTuple "); file.AddLine(" test = self.data[a][\"Test\"] "); - file.AddLine(" if eval(test) : "); + file.AddLine(" try: "); + file.AddLine(" self.conditional= eval(test) "); + file.AddLine(" except: "); + file.AddLine(" self.conditional=False "); + file.AddLine(" print \"Condition of \", test, \" was not valid Python code\" "); + file.AddLine(" if self.conditional : "); file.AddLine(" return self.data[a][\"OutputTrue\"] "); file.AddLine(" return self.data[a][\"OutputFalse\"] "); file.AddLine(" "); Modified: sofaswitch/trunk/callflow/src/startfor.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/startfor.cpp (original) +++ sofaswitch/trunk/callflow/src/startfor.cpp Mon Nov 13 15:27:02 2006 @@ -76,19 +76,30 @@ bool DndShapeStartFor::WriteSystemCode(wxTextFile & file) { - file.AddLine(" def Start_For(self, aTuple): "); - file.AddLine(" a,b,c = aTuple"); - - file.AddLine(" if b==0:"); - file.AddLine(" exec(self.data[a][\"Initialise\"])"); - file.AddLine(" else:"); - file.AddLine(" exec(self.data[a][\"Increment\"])"); - file.AddLine(" "); - file.AddLine(" if eval(self.data[a][\"Test\"]):"); - file.AddLine(" return self.data[a][\"Output\"]"); - file.AddLine(" "); - file.AddLine(" next = self.data[a][\"EndForLoop\"]"); - file.AddLine(" return self.data[next][\"AllDone\"]"); + file.AddLine(" def Start_For(self, aTuple): "); + file.AddLine(" a,b,c = aTuple "); + file.AddLine(" if b==0: "); + file.AddLine(" try: "); + file.AddLine(" exec(self.data[a][\"Initialise\"]) "); + file.AddLine(" except: "); + file.AddLine(" print \"The initialise statement of \", self.data[a][\"Initialise\"], \" was not valid Python\" "); + file.AddLine(" else: "); + file.AddLine(" try: "); + file.AddLine(" exec(self.data[a][\"Increment\"]) "); + file.AddLine(" except: "); + file.AddLine(" print \"The increment statement of \", self.data[a][\"Increment\"], \" was not valid Python\" "); + file.AddLine(" "); + file.AddLine(" try: "); + file.AddLine(" self.forCondition = eval(self.data[a][\"Test\"]) "); + file.AddLine(" except: "); + file.AddLine(" print \"The Test statement of \", self.data[a][\"Test\"], \" was not valid Python\" "); + file.AddLine(" self.forCondition = False "); + file.AddLine(" "); + file.AddLine(" if self.forCondition: "); + file.AddLine(" return self.data[a][\"Output\"] "); + file.AddLine(" "); + file.AddLine(" next = self.data[a][\"EndForLoop\"] "); + file.AddLine(" return self.data[next][\"AllDone\"] "); file.AddLine(" "); return true;

1 0

[Sofaswitch-svn] [commit] r183 - sofaswitch/trunk/server
by SofaSWITCH SVN 13 Nov '06

13 Nov '06

Author: derek Date: Mon Nov 13 15:06:42 2006 New Revision: 183 Modified: sofaswitch/trunk/server/main.cxx Log: Fix a compile issue resulting from a new version of pwlib. Modified: sofaswitch/trunk/server/main.cxx ============================================================================== --- sofaswitch/trunk/server/main.cxx (original) +++ sofaswitch/trunk/server/main.cxx Mon Nov 13 15:06:42 2006 @@ -131,8 +131,8 @@ Manager::Manager() { - connectionCount = 0; - bogusCount= 0; + connectionCount.SetValue(0); + bogusCount.SetValue(0); keepRunning = TRUE; connectionsActive.SetAutoDeleteObjects(); isQuitting = FALSE;

1 0

[Sofaswitch-svn] [commit] r182 - sofaswitch/trunk/callflow/docs
by SofaSWITCH SVN 13 Nov '06

13 Nov '06

Author: derek Date: Mon Nov 13 02:03:42 2006 New Revision: 182 Modified: sofaswitch/trunk/callflow/docs/description.dxy Log: Fix a typo. Modified: sofaswitch/trunk/callflow/docs/description.dxy ============================================================================== --- sofaswitch/trunk/callflow/docs/description.dxy (original) +++ sofaswitch/trunk/callflow/docs/description.dxy Mon Nov 13 02:03:42 2006 @@ -49,7 +49,7 @@ <a href="http://twistedmatrix.com/trac">Twisted,</a> \endhtmlonly an event driven network framework written in Python. Using Twisted solved the -handling of the any number of asynchronous events.. Further could have one +handling of the any number of asynchronous events.. Further, we could have one psuedo thread per call, but in reality there is one thread in operation. One psuedo thread per call makes things much simpler to analyse.

1 0

[Sofaswitch-svn] [commit] r181 - sofaswitch/trunk/callflow/src
by SofaSWITCH SVN 13 Nov '06

13 Nov '06

Author: derek Date: Mon Nov 13 02:02:08 2006 New Revision: 181 Modified: sofaswitch/trunk/callflow/src/fileio.h Log: Fix a typo. Modified: sofaswitch/trunk/callflow/src/fileio.h ============================================================================== --- sofaswitch/trunk/callflow/src/fileio.h (original) +++ sofaswitch/trunk/callflow/src/fileio.h Mon Nov 13 02:02:08 2006 @@ -6,7 +6,7 @@ /////////////////////////////////////////////////////////////////////////// /**Define a "audio to/from file" shape. Well, not quite. This shape is created - solely for the benefit of the DndShapeWriteToFile and DndShapeReadFromfile + solely for the benefit of the DndShapeWriteToFile and DndShapeReadFromFile shapes. This class is used in rendering the WriteToFile and ReadFromFile shapes to the drawing area on screen. */ class DndShapeFileIo : public DndShape

1 0

[Sofaswitch-svn] [commit] r180 - sofaswitch/trunk/callflow/docs
by SofaSWITCH SVN 13 Nov '06

13 Nov '06

Author: derek Date: Mon Nov 13 01:57:45 2006 New Revision: 180 Modified: sofaswitch/trunk/callflow/docs/description.dxy Log: add comments describing how it works. Modified: sofaswitch/trunk/callflow/docs/description.dxy ============================================================================== --- sofaswitch/trunk/callflow/docs/description.dxy (original) +++ sofaswitch/trunk/callflow/docs/description.dxy Mon Nov 13 01:57:45 2006 @@ -24,7 +24,7 @@ graph file. Prior to execution of the python file, it is expected the server and relevant -SofaSwitch applications are running Separately, in a console, the user will +SofaSwitch applications are running. Separately, in a console, the user will invoke Python on the python file, and the desired actions happen. Each python file invokes the handling of variables for all items on the screen @@ -35,7 +35,38 @@ databases should be used. \section secPython Python internals -One difficulty +One difficulty with Python is the inability to handle threads well. They are +available, but are very heavyweight in terms of system load, but provide +limited gain. To illustrate, a multi threaded python application will run at +the same speed on a multiprocessor box as on a single cpu box. Worse, each new +thread running in Python is a whole new running interpreter, which consumes +system resources. This posed a problem - if the controller is going to handle +lots of concurrent calls, it would be poor practice to place each controller +handled call into a separate Python thread. + +We therefore base this code around +\htmlonly +<a href="http://twistedmatrix.com/trac">Twisted,</a> +\endhtmlonly +an event driven network framework written in Python. Using Twisted solved the +handling of the any number of asynchronous events.. Further could have one +psuedo thread per call, but in reality there is one thread in operation. One +psuedo thread per call makes things much simpler to analyse. + +The Python code will process the items on the graph, until it reaches the end +of the current graph. Execution then waits for a event to happen, +which move the current point of execution back to the relevant event handler. +Thus, a call flow graph in this system will only have one start point, but may +have many different endpoints. + +A particular graph is handled by a mixture of native Python code and machine +generated Python code. Native code is used to evaluate conditional statement, +increment statements etc. Machine generated code is used to do things such as +handle & record events,and move between items on the graph. + +To evaluate a conditional, the string is passed to the python command "eval", +which returns a True or False value. + \section secHelloWorld Hello World example Perhaps the simplest example of a graph you can create is the standard "Hello

1 0

[Sofaswitch-svn] [commit] r179 - in sofaswitch/trunk: callflow/src voip
by SofaSWITCH SVN 13 Nov '06

13 Nov '06

Author: derek Date: Mon Nov 13 00:59:55 2006 New Revision: 179 Modified: sofaswitch/trunk/callflow/src/python.cpp sofaswitch/trunk/voip/comms.cxx Log: Change gtraphics. Modified: sofaswitch/trunk/callflow/src/python.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/python.cpp (original) +++ sofaswitch/trunk/callflow/src/python.cpp Mon Nov 13 00:59:55 2006 @@ -14,8 +14,8 @@ #include "python.h" +#include "bitmaps/Python.xpm" - ///////////////////////////////////////////////////////////////////////////// DndShapePython::DndShapePython() : DndShape(Python) @@ -39,34 +39,17 @@ dc.SetPen(*wxBLACK_PEN); wxPoint p1(m_rect.GetPosition()); - wxPoint pA(p1.x + 25, p1.y + 15); + wxPoint pA(p1.x + 25, p1.y + 9); wxPoint pB(p1.x + 25, p1.y + 0); wxPoint pC(p1.x + 25, p1.y + 50); + wxPoint pD(p1.x + 25, p1.y + 41); DrawArrow(dc, pA, ArrowDown, InputPointConnected(0) ? Connected : Loose); DrawArrow(dc, pC, ArrowDown, OutputPointConnected(0) ? Connected : Loose); - dc.DrawLine(pC, pB); + dc.DrawLine(pA, pB); + dc.DrawLine(pD, pC); - DrawBox(dc, 0, 10, 21, 21); - DrawBox(dc, 29, 10, 21, 21); - - wxString text("Pyt"); - dc.SetFont(*wxITALIC_FONT); - wxCoord w, h; - dc.GetTextExtent(text, &w, &h); - int xPos = m_rect.x + 0 + ((21 - w)/2); - int yPos = m_rect.y + 10 + ((21 - h)/2); - dc.DrawText(text, xPos, yPos); - - text = "hon"; - dc.GetTextExtent(text, &w, &h); - xPos = m_rect.x + 29 + ((21 - w)/2); - yPos = m_rect.y + 10 + ((21 - h)/2); - dc.DrawText(text, xPos, yPos); - - - DrawBox(dc, 0, 35, 13, 13); - DrawBox(dc, 37, 35, 13, 13); + dc.DrawBitmap(Python_xpm, p1.x + 9, p1.y + 9, true); DndShape::Draw(dc); } Modified: sofaswitch/trunk/voip/comms.cxx ============================================================================== --- sofaswitch/trunk/voip/comms.cxx (original) +++ sofaswitch/trunk/voip/comms.cxx Mon Nov 13 00:59:55 2006 @@ -23,6 +23,9 @@ #include <ptlib.h> +#include <opal/mediafmt.h> +//#include <codec/allcodecs.h> + #ifdef __GNUC__ #pragma implementation "comms.h" #endif

1 0

[Sofaswitch-svn] [commit] r178 - sofaswitch/trunk/callflow/tests
by SofaSWITCH SVN 13 Nov '06

13 Nov '06

Author: derek Date: Sun Nov 12 23:18:36 2006 New Revision: 178 Modified: sofaswitch/trunk/callflow/tests/recordmessage.src Log: Fix it, so it will always register the timer indicating death of this system. Modified: sofaswitch/trunk/callflow/tests/recordmessage.src ============================================================================== --- sofaswitch/trunk/callflow/tests/recordmessage.src (original) +++ sofaswitch/trunk/callflow/tests/recordmessage.src Sun Nov 12 23:18:36 2006 @@ -1,3 +1,4 @@ -9248182248,183,308,182<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>20670423 extra <special>Tool Tip<ms>Death<ms><special> <Shape>11191109 extra <special>Tool Tip<ms>Request Node from sound module<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>2307394 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>2507362 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>5605324 extra <special>Tool Tip<ms>End the recording..<ms><special>Test (Python code)<ms>self.dtmfData=="9"<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>9214304214,304,262,356<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9266329308,329,266,359<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14295185 extra <special>Tool Tip<ms>Eventer<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>15240412 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.amNode<ms><special>Second SofaSwitch worker (python)<ms>self.soundNode<ms><special> <Shape>17695537 extra <special>Tool Tip<ms>Write To File<ms><special>Filename to contain new audio (Python code)<ms>" "<ms><special>answering machine node (Python code)<ms>self.amNode<ms><special> <Shape>2274529 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>14202162 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>amREQ<ms><special>Python variable to hold event data<ms>self.amNode<ms><special> <Shape>2604618 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>16275484 extra <special>Tool Tip<ms>Play the instructions<ms><special>Filename to read audio from (Python code)<ms>"../prompts/record.c"<ms><special>answering machine node (Python code)<ms>self.amNode<ms><special> <Shape>9555290555,290,600,293<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9300346601,346,581,447,300,483<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>15605522 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>7605474 extra <special>Tool Tip<ms>End Call<ms><special>Worker node to activate (python code)<ms>self.amNode<ms><special> <Shape>5241359 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.amNode != None) and (self.soundNode != None)<ms><special> <Shape>9265199265,513,265,635,427,639,429,199,533,202,533,262<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10190254 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have a new am node on ", self.amNode<ms><special> <Shape>119019 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>14251461 extra <special>Tool Tip<ms>Eventer<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>14667376 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>9656401656,401,666,535,721,536,721,534<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>12605571 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>5576297 extra <special>Tool Tip<ms>Repeat instructions<ms><special>Test (Python code)<ms>self.dtmfData=="3"<ms><special> <Shape>16694585 extra <special>Tool Tip<ms>Read From File<ms><special>Filename to read audio from (Python code)<ms>"record.wav"<ms><special>answering machine node (Python code)<ms>self.amNode<ms><special> <Shape>5507264 extra <special>Tool Tip<ms>Start recording now<ms><special>Test (Python code)<ms>self.dtmfData=="1"<ms><special> <Shape>2694626 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>1119167 extra <special>Tool Tip<ms>Request Node from AM module<ms><special>Request node from (Python code)<ms>"am"<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>requestam<ms><special>Additional information (Python code)<ms><ms><special> <Shape>9291382291,386,334,382,332,395<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9630374630,374,631,473<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>13284231 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>request sound<ms><special> <Shape>17508310 extra <special>Tool Tip<ms>Write To File<ms><special>Filename to contain new audio (Python code)<ms>"message.wav"<ms><special>answering machine node<ms>self.amNode<ms><special> <Shape>13190210 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>request voip<ms><special> <Shape>5628347 extra <special>Tool Tip<ms>hear the recording<ms><special>Test (Python code)<ms>self.dtmfData="2"<ms><special> <Shape> +14291535 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>9248182248,183,308,182<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>15605522 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>9555290555,290,600,293<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>5605324 extra <special>Tool Tip<ms>End the recording..<ms><special>Test (Python code)<ms>self.dtmfData=="9"<ms><special> <Shape>9266329308,329,266,359<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14295185 extra <special>Tool Tip<ms>Eventer<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>11191109 extra <special>Tool Tip<ms>Request Node from sound module<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>16275484 extra <special>Tool Tip<ms>Play the instructions<ms><special>Filename to read audio from (Python code)<ms>"../prompts/record.wav"<ms><special>answering machine node (Python code)<ms>self.amNode<ms><special> <Shape>14202162 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>amREQ<ms><special>Python variable to hold event data<ms>self.amNode<ms><special> <Shape>15240412 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.amNode<ms><special>Second SofaSwitch worker (python)<ms>self.soundNode<ms><special> <Shape>2604618 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>13190210 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>request voip<ms><special> <Shape>7605474 extra <special>Tool Tip<ms>End Call<ms><special>Worker node to activate (python code)<ms>self.amNode<ms><special> <Shape>119019 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>13284231 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>request sound<ms><special> <Shape>5576297 extra <special>Tool Tip<ms>Repeat instructions<ms><special>Test (Python code)<ms>self.dtmfData=="3"<ms><special> <Shape>9300346601,346,581,447,300,483<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2307394 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>5507264 extra <special>Tool Tip<ms>Start recording now<ms><special>Test (Python code)<ms>self.dtmfData=="1"<ms><special> <Shape>17695537 extra <special>Tool Tip<ms>Stop writing to the file +while we play it back<ms><special>Filename to contain new audio (Python code)<ms>" "<ms><special>answering machine node (Python code)<ms>self.amNode<ms><special> <Shape>16694585 extra <special>Tool Tip<ms>Play the message just recorded back<ms><special>Filename to read audio from (Python code)<ms>"message.wav"<ms><special>answering machine node (Python code)<ms>self.amNode<ms><special> <Shape>20296625 extra <special>Tool Tip<ms>Death<ms><special> <Shape>9630374630,374,631,473<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9265199265,513,265,635,427,639,429,199,533,202,533,262<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10280579 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "DEATH NOW."<ms><special> <Shape>1119167 extra <special>Tool Tip<ms>Request Node from AM module<ms><special>Request node from (Python code)<ms>"am"<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>requestam<ms><special>Additional information (Python code)<ms><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>2507362 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>12605571 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>9291382291,386,334,382,332,395<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9656401656,401,666,535,721,536,721,534<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>5241359 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.amNode != None) and (self.soundNode != None)<ms><special> <Shape>2694626 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>2808362 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>10190254 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have a new am node on ", self.amNode<ms><special> <Shape>9214304214,304,262,356<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>5628347 extra <special>Tool Tip<ms>hear the recording<ms><special>Test (Python code)<ms>self.dtmfData=="2"<ms><special> <Shape>17508310 extra <special>Tool Tip<ms>Write To File<ms><special>Filename to contain new audio (Python code)<ms>"message.wav"<ms><special>answering machine node<ms>self.amNode<ms><special> <Shape>14251461 extra <special>Tool Tip<ms>Eventer<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>9676363676,371,834,363<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>

1 0