- sofaswitch-svn@lists.freeswitch.org - FreeSWITCH Mailing Lists

[Sofaswitch-svn] [commit] r413 - sofaswitch/trunk/voip
by SofaSWITCH SVN 20 May '08

20 May '08

Author: derek Date: Tue May 20 17:59:53 2008 New Revision: 413 Modified: sofaswitch/trunk/voip/main.cxx Log: Add calls to mtrace for memory usage checking.. Modified: sofaswitch/trunk/voip/main.cxx ============================================================================== --- sofaswitch/trunk/voip/main.cxx (original) +++ sofaswitch/trunk/voip/main.cxx Tue May 20 17:59:53 2008 @@ -27,6 +27,7 @@ * */ #include <ptlib.h> +#include <mcheck.h> #include <opal/buildopts.h> @@ -79,6 +80,7 @@ void VoipProcess::Main() { + void mtrace(void); cout << GetName() << " Version " << GetVersion(true) << " by " << GetManufacturer() @@ -285,6 +287,8 @@ PTRACE(3, "Now end the opal thing"); delete opal; + void muntrace(void); + }

1 0

[Sofaswitch-svn] [commit] r412 - in sofaswitch/trunk/sofa: include/sofa src
by SofaSWITCH SVN 20 May '08

20 May '08

Author: derek Date: Tue May 20 17:59:05 2008 New Revision: 412 Modified: sofaswitch/trunk/sofa/include/sofa/messages.h sofaswitch/trunk/sofa/src/messages.cxx Log: Tidy up the dumping of memory while a sofa utility is running.. Modified: sofaswitch/trunk/sofa/include/sofa/messages.h ============================================================================== --- sofaswitch/trunk/sofa/include/sofa/messages.h (original) +++ sofaswitch/trunk/sofa/include/sofa/messages.h Tue May 20 17:59:05 2008 @@ -373,6 +373,12 @@ /**Flag to indicate it is time to end this thread. It is only set by the MessageFrame::Terminate() method */ bool keepGoing; + +#ifdef PMEMORY_CHECK + /**The state of the memory at which we last did a dump. This variable is updated + each time we do a memory dump */ + static PMemoryHeap::State memoryState; +#endif }; //////////////////////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/sofa/src/messages.cxx ============================================================================== --- sofaswitch/trunk/sofa/src/messages.cxx (original) +++ sofaswitch/trunk/sofa/src/messages.cxx Tue May 20 17:59:05 2008 @@ -809,9 +809,12 @@ void MessageFrame::ProcessSetWriteFile(PStringArray &cmds, const PString & sender) { if (cmds.GetSize() != 2) { - PTRACE(3, cmds[0] << " Failed - Read file not correctly specified" - << sender); - return; + PStringStream error; + error << cmds[0] + << " Failed - Read file not correctly specified"; + PTRACE(3, error << sender); + SendThisMessageTo(error, sender); + return; } PTRACE(3, "Set the write file to be \"" << cmds[1] << "\""); SetWriteFile(cmds[1]); @@ -822,9 +825,11 @@ void MessageFrame::ProcessMemoryDump(PStringArray &cmds, PString & sender) { if (cmds.GetSize() != 2) { - PTRACE(3, cmds[0] << " Failed - Output file not specified" - << sender); - return; + PStringStream error; + error << cmds[0] << " Failed - Output file not specified"; + PTRACE(3, error << sender); + SendThisMessageTo(error, sender); + return; } PTRACE(3, "Dump current memory usage to \"" << cmds[1] << "\""); @@ -832,20 +837,29 @@ PTextFile outputFile; if (!outputFile.Open(cmds[1], PFile::WriteOnly, PFile::Create + PFile::Truncate)) { - PTRACE(3, "Failed to open the specified file " << cmds[1] << " to dump memory to"); - return; + PStringStream error; + error << "Failed to open the specified file " + << cmds[1] + << " to dump memory to"; + SendThisMessageTo(error, sender); + PTRACE(3, error); + return; } - - cerr << "Dump statistics to the file " << cmds[1] << endl; + PStringStream status; + status << "Dump memory usage info to the file " << cmds[1]; + cerr << status << endl; + SendThisMessageTo(status, sender); PMemoryHeap::DumpStatistics(); PStringStream result; - PMemoryHeap::State state; - PMemoryHeap::DumpObjectsSince(state, result); + PMemoryHeap::DumpObjectsSince(memoryState, result); outputFile.WriteLine(result); outputFile.Close(); + PMemoryHeap::GetState(memoryState); return; } + +PMemoryHeap::State MessageFrame::memoryState; #endif bool MessageFrame::SendDtmf(const PString & dtmfVals)

1 0

[Sofaswitch-svn] [commit] r411 - in sofaswitch/trunk/sofa: include/sofa src
by SofaSWITCH SVN 14 May '08

14 May '08

Author: derek Date: Tue May 13 22:51:20 2008 New Revision: 411 Modified: sofaswitch/trunk/sofa/include/sofa/messlist.h sofaswitch/trunk/sofa/src/messlist.cxx Log: The building of MessageFrame instances in the library now checks the message frames created. Those that are terminated (for whatever reason) are automatically deleted. New ones are then built. Modified: sofaswitch/trunk/sofa/include/sofa/messlist.h ============================================================================== --- sofaswitch/trunk/sofa/include/sofa/messlist.h (original) +++ sofaswitch/trunk/sofa/include/sofa/messlist.h Tue May 13 22:51:20 2008 @@ -185,6 +185,10 @@ PDECLARE_NOTIFIER(PThread, MessageFrameListProvider, MakeNewMessageFrames); #endif + /**Go through the list of frames. Any that have terminated are dead, and so + delete them */ + void RemoveDeadEntries(); + /**The thread which will create new instances of MessageFrame structures, as required */ PThread *makeNewMessageFrame; Modified: sofaswitch/trunk/sofa/src/messlist.cxx ============================================================================== --- sofaswitch/trunk/sofa/src/messlist.cxx (original) +++ sofaswitch/trunk/sofa/src/messlist.cxx Tue May 13 22:51:20 2008 @@ -140,6 +140,7 @@ } + void MessageFrameList::AddNewMessageFrame(MessageFrame *newEntry) { if (newEntry == NULL) { @@ -168,6 +169,30 @@ PTRACE(3, "Create new MessageFrame provider."); } +void MessageFrameListProvider::RemoveDeadEntries() +{ + MessageFrameList deads; + + { + PWaitAndSignal m(mutex); + for(PINDEX i = PAbstractList::GetSize(); i > 0; i--) { + PObject *p = PAbstractList::GetAt(i - 1); + MessageFrame * c = (MessageFrame *)p; + if (c == NULL) + continue; + if (c->IsTerminated()) { + deads.AddNewMessageFrame(c); + RemoveAt(i - 1); + } + } + } + while(deads.GetSize() > 0) { + PObject *f = deads.RemoveAt(0); + delete f; + } +} + + MessageFrameListProvider::~MessageFrameListProvider() { Terminate(); @@ -188,19 +213,19 @@ void MessageFrameListProvider::MakeNewMessageFrames(PThread &, INT ) { for( ;keepGoing; ) { - /**Put more nodes into the list */ - while ((GetSize() < requiredSize) && keepGoing) { - PTRACE(3, "We have to build a new message frame "); - MessageFrame *mf = BuildMessageFrame(); - if (mf != NULL) { - PTRACE(3, "reqeustnewid Add message frame to list of " << *mf); - AddNewMessageFrame(mf); - } else { - PTRACE(3, "We had an error in buildmessageframe - null returned"); + RemoveDeadEntries(); + while ((GetSize() < requiredSize) && keepGoing) { + PTRACE(3, "We have to build a new message frame "); + MessageFrame *mf = BuildMessageFrame(); + if (mf != NULL) { + PTRACE(3, "reqeustnewid Add message frame to list of " << *mf); + AddNewMessageFrame(mf); + } else { + PTRACE(3, "We had an error in buildmessageframe - null returned"); + } } - } - if (keepGoing) - makeAnother.Wait(); + if (keepGoing) + makeAnother.Wait(1000); } PTRACE(3, "End of message frame list provider thread "); }

1 0

[Sofaswitch-svn] [commit] r410 - in sofaswitch/trunk: am mcu server sound voip
by SofaSWITCH SVN 13 May '08

13 May '08

Author: derek Date: Tue May 13 00:51:52 2008 New Revision: 410 Modified: sofaswitch/trunk/am/audio.cxx sofaswitch/trunk/am/audio.h sofaswitch/trunk/am/comms.cxx sofaswitch/trunk/am/comms.h sofaswitch/trunk/am/counts.cxx sofaswitch/trunk/am/counts.h sofaswitch/trunk/am/main.cxx sofaswitch/trunk/am/main.h sofaswitch/trunk/am/manager.cxx sofaswitch/trunk/am/manager.h sofaswitch/trunk/am/supervisor.cxx sofaswitch/trunk/am/supervisor.h sofaswitch/trunk/am/version.h sofaswitch/trunk/mcu/audio.cxx sofaswitch/trunk/mcu/audio.h sofaswitch/trunk/mcu/comms.cxx sofaswitch/trunk/mcu/comms.h sofaswitch/trunk/mcu/conferenceroom.cxx sofaswitch/trunk/mcu/conferenceroom.h sofaswitch/trunk/mcu/counts.cxx sofaswitch/trunk/mcu/counts.h sofaswitch/trunk/mcu/main.cxx sofaswitch/trunk/mcu/main.h sofaswitch/trunk/mcu/manager.cxx sofaswitch/trunk/mcu/manager.h sofaswitch/trunk/mcu/member.cxx sofaswitch/trunk/mcu/member.h sofaswitch/trunk/mcu/participant.cxx sofaswitch/trunk/mcu/participant.h sofaswitch/trunk/mcu/supervisor.cxx sofaswitch/trunk/mcu/supervisor.h sofaswitch/trunk/mcu/version.h sofaswitch/trunk/server/counts.cxx sofaswitch/trunk/server/counts.h sofaswitch/trunk/server/main.cxx sofaswitch/trunk/server/main.h sofaswitch/trunk/server/version.h sofaswitch/trunk/sound/audio.cxx sofaswitch/trunk/sound/audio.h sofaswitch/trunk/sound/comms.cxx sofaswitch/trunk/sound/comms.h sofaswitch/trunk/sound/main.cxx sofaswitch/trunk/sound/main.h sofaswitch/trunk/sound/version.h sofaswitch/trunk/voip/comms.cxx sofaswitch/trunk/voip/comms.h sofaswitch/trunk/voip/counts.cxx sofaswitch/trunk/voip/counts.h sofaswitch/trunk/voip/jocall.cxx sofaswitch/trunk/voip/jocall.h sofaswitch/trunk/voip/main.cxx sofaswitch/trunk/voip/main.h sofaswitch/trunk/voip/mymanager.cxx sofaswitch/trunk/voip/mymanager.h sofaswitch/trunk/voip/supervisor.cxx sofaswitch/trunk/voip/supervisor.h sofaswitch/trunk/voip/udpconnection.cxx sofaswitch/trunk/voip/udpconnection.h sofaswitch/trunk/voip/udpep.cxx sofaswitch/trunk/voip/udpep.h sofaswitch/trunk/voip/udpsound.cxx sofaswitch/trunk/voip/udpsound.h sofaswitch/trunk/voip/version.h Log: tidy up emacs strings at end of the files soas to make Emacs editing consistant. Work on the building of new comms identities for voip.. Modified: sofaswitch/trunk/am/audio.cxx ============================================================================== --- sofaswitch/trunk/am/audio.cxx (original) +++ sofaswitch/trunk/am/audio.cxx Tue May 13 00:51:52 2008 @@ -333,5 +333,15 @@ //////////////////////////////////////////////////////////////////////////////// +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of audio.cxx Modified: sofaswitch/trunk/am/audio.h ============================================================================== --- sofaswitch/trunk/am/audio.h (original) +++ sofaswitch/trunk/am/audio.h Tue May 13 00:51:52 2008 @@ -174,5 +174,15 @@ +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + #endif // _AUDIO_MAIN_H Modified: sofaswitch/trunk/am/comms.cxx ============================================================================== --- sofaswitch/trunk/am/comms.cxx (original) +++ sofaswitch/trunk/am/comms.cxx Tue May 13 00:51:52 2008 @@ -327,3 +327,13 @@ } } + +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ Modified: sofaswitch/trunk/am/comms.h ============================================================================== --- sofaswitch/trunk/am/comms.h (original) +++ sofaswitch/trunk/am/comms.h Tue May 13 00:51:52 2008 @@ -271,4 +271,14 @@ +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/am/counts.cxx ============================================================================== --- sofaswitch/trunk/am/counts.cxx (original) +++ sofaswitch/trunk/am/counts.cxx Tue May 13 00:51:52 2008 @@ -86,4 +86,14 @@ void IncCountCommsConsumers() { ++countNewCommsConsumers; } +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + ///////////////////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/am/counts.h ============================================================================== --- sofaswitch/trunk/am/counts.h (original) +++ sofaswitch/trunk/am/counts.h Tue May 13 00:51:52 2008 @@ -61,4 +61,14 @@ #endif // _COUNTS_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/am/main.cxx ============================================================================== --- sofaswitch/trunk/am/main.cxx (original) +++ sofaswitch/trunk/am/main.cxx Tue May 13 00:51:52 2008 @@ -148,4 +148,14 @@ +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/am/main.h ============================================================================== --- sofaswitch/trunk/am/main.h (original) +++ sofaswitch/trunk/am/main.h Tue May 13 00:51:52 2008 @@ -69,4 +69,14 @@ #endif // _Am_MAIN_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/am/manager.cxx ============================================================================== --- sofaswitch/trunk/am/manager.cxx (original) +++ sofaswitch/trunk/am/manager.cxx Tue May 13 00:51:52 2008 @@ -210,4 +210,14 @@ return result; } +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/am/manager.h ============================================================================== --- sofaswitch/trunk/am/manager.h (original) +++ sofaswitch/trunk/am/manager.h Tue May 13 00:51:52 2008 @@ -198,4 +198,14 @@ #endif // _SsAm_MANAGER_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/am/supervisor.cxx ============================================================================== --- sofaswitch/trunk/am/supervisor.cxx (original) +++ sofaswitch/trunk/am/supervisor.cxx Tue May 13 00:51:52 2008 @@ -134,4 +134,17 @@ sleep(2); AmProcess::Current().GetManager()->EndEverything(); } + +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + + + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/am/supervisor.h ============================================================================== --- sofaswitch/trunk/am/supervisor.h (original) +++ sofaswitch/trunk/am/supervisor.h Tue May 13 00:51:52 2008 @@ -121,5 +121,15 @@ #endif // _SUPERVISOR_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/am/version.h ============================================================================== --- sofaswitch/trunk/am/version.h (original) +++ sofaswitch/trunk/am/version.h Tue May 13 00:51:52 2008 @@ -37,5 +37,15 @@ #endif // _SsAm_VERSION_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/audio.cxx ============================================================================== --- sofaswitch/trunk/mcu/audio.cxx (original) +++ sofaswitch/trunk/mcu/audio.cxx Tue May 13 00:51:52 2008 @@ -189,5 +189,15 @@ //////////////////////////////////////////////////////////////////////////////// +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of audio.cxx Modified: sofaswitch/trunk/mcu/audio.h ============================================================================== --- sofaswitch/trunk/mcu/audio.h (original) +++ sofaswitch/trunk/mcu/audio.h Tue May 13 00:51:52 2008 @@ -126,6 +126,16 @@ }; +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + #endif // _Mcu_AUDIO_MAIN_H Modified: sofaswitch/trunk/mcu/comms.cxx ============================================================================== --- sofaswitch/trunk/mcu/comms.cxx (original) +++ sofaswitch/trunk/mcu/comms.cxx Tue May 13 00:51:52 2008 @@ -292,5 +292,15 @@ } +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + ///////////////////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/comms.h ============================================================================== --- sofaswitch/trunk/mcu/comms.h (original) +++ sofaswitch/trunk/mcu/comms.h Tue May 13 00:51:52 2008 @@ -230,5 +230,15 @@ #endif // _Mcu_COMMS_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/conferenceroom.cxx ============================================================================== --- sofaswitch/trunk/mcu/conferenceroom.cxx (original) +++ sofaswitch/trunk/mcu/conferenceroom.cxx Tue May 13 00:51:52 2008 @@ -148,6 +148,16 @@ +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + ///////////////////////////////////////////////////////////////////////////// // End of conferenceroom.cxx Modified: sofaswitch/trunk/mcu/conferenceroom.h ============================================================================== --- sofaswitch/trunk/mcu/conferenceroom.h (original) +++ sofaswitch/trunk/mcu/conferenceroom.h Tue May 13 00:51:52 2008 @@ -152,5 +152,15 @@ #endif // _Mcu_CONFERENCE_ROOM_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/counts.cxx ============================================================================== --- sofaswitch/trunk/mcu/counts.cxx (original) +++ sofaswitch/trunk/mcu/counts.cxx Tue May 13 00:51:52 2008 @@ -109,5 +109,15 @@ void IncCountParticipants() { ++countNewParticipants; } +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + ///////////////////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/counts.h ============================================================================== --- sofaswitch/trunk/mcu/counts.h (original) +++ sofaswitch/trunk/mcu/counts.h Tue May 13 00:51:52 2008 @@ -71,5 +71,15 @@ #endif // _COUNTS_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/main.cxx ============================================================================== --- sofaswitch/trunk/mcu/main.cxx (original) +++ sofaswitch/trunk/mcu/main.cxx Tue May 13 00:51:52 2008 @@ -152,5 +152,15 @@ +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/main.h ============================================================================== --- sofaswitch/trunk/mcu/main.h (original) +++ sofaswitch/trunk/mcu/main.h Tue May 13 00:51:52 2008 @@ -71,4 +71,14 @@ #endif // _Mcu_MAIN_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/manager.cxx ============================================================================== --- sofaswitch/trunk/mcu/manager.cxx (original) +++ sofaswitch/trunk/mcu/manager.cxx Tue May 13 00:51:52 2008 @@ -350,5 +350,15 @@ } +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/manager.h ============================================================================== --- sofaswitch/trunk/mcu/manager.h (original) +++ sofaswitch/trunk/mcu/manager.h Tue May 13 00:51:52 2008 @@ -252,4 +252,14 @@ #endif // _Mcu_MANAGER_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/member.cxx ============================================================================== --- sofaswitch/trunk/mcu/member.cxx (original) +++ sofaswitch/trunk/mcu/member.cxx Tue May 13 00:51:52 2008 @@ -399,5 +399,15 @@ PTRACE(3, "Append Done " << *this); } +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + //////////////////////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/member.h ============================================================================== --- sofaswitch/trunk/mcu/member.h (original) +++ sofaswitch/trunk/mcu/member.h Tue May 13 00:51:52 2008 @@ -292,4 +292,14 @@ #endif // _Mcu_MEMBER_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/participant.cxx ============================================================================== --- sofaswitch/trunk/mcu/participant.cxx (original) +++ sofaswitch/trunk/mcu/participant.cxx Tue May 13 00:51:52 2008 @@ -270,3 +270,14 @@ RemoveAt(partKey); } } + + +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ Modified: sofaswitch/trunk/mcu/participant.h ============================================================================== --- sofaswitch/trunk/mcu/participant.h (original) +++ sofaswitch/trunk/mcu/participant.h Tue May 13 00:51:52 2008 @@ -330,4 +330,14 @@ #endif // _Mcu_Participant_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/supervisor.cxx ============================================================================== --- sofaswitch/trunk/mcu/supervisor.cxx (original) +++ sofaswitch/trunk/mcu/supervisor.cxx Tue May 13 00:51:52 2008 @@ -122,4 +122,16 @@ sleep(2); McuProcess::Current().GetManager()->EndEverything(); } + +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/supervisor.h ============================================================================== --- sofaswitch/trunk/mcu/supervisor.h (original) +++ sofaswitch/trunk/mcu/supervisor.h Tue May 13 00:51:52 2008 @@ -121,4 +121,14 @@ +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/version.h ============================================================================== --- sofaswitch/trunk/mcu/version.h (original) +++ sofaswitch/trunk/mcu/version.h Tue May 13 00:51:52 2008 @@ -34,5 +34,15 @@ #endif // _Mcu_VERSION_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/server/counts.cxx ============================================================================== --- sofaswitch/trunk/server/counts.cxx (original) +++ sofaswitch/trunk/server/counts.cxx Tue May 13 00:51:52 2008 @@ -103,5 +103,15 @@ } +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + ///////////////////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/server/counts.h ============================================================================== --- sofaswitch/trunk/server/counts.h (original) +++ sofaswitch/trunk/server/counts.h Tue May 13 00:51:52 2008 @@ -65,6 +65,16 @@ PString GetCountReceivedSentDropped(); +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + #endif // _COUNTS_H Modified: sofaswitch/trunk/server/main.cxx ============================================================================== --- sofaswitch/trunk/server/main.cxx (original) +++ sofaswitch/trunk/server/main.cxx Tue May 13 00:51:52 2008 @@ -951,3 +951,13 @@ // End of main.cxx + +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ Modified: sofaswitch/trunk/server/main.h ============================================================================== --- sofaswitch/trunk/server/main.h (original) +++ sofaswitch/trunk/server/main.h Tue May 13 00:51:52 2008 @@ -446,3 +446,13 @@ ///////////////////////////////////////////////////////////////////////////// #endif // _MAIN_H + +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ Modified: sofaswitch/trunk/server/version.h ============================================================================== --- sofaswitch/trunk/server/version.h (original) +++ sofaswitch/trunk/server/version.h Tue May 13 00:51:52 2008 @@ -41,5 +41,15 @@ #endif // _Server_VERSION_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/sound/audio.cxx ============================================================================== --- sofaswitch/trunk/sound/audio.cxx (original) +++ sofaswitch/trunk/sound/audio.cxx Tue May 13 00:51:52 2008 @@ -211,5 +211,15 @@ //////////////////////////////////////////////////////////////////////////////// +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of audio.cxx Modified: sofaswitch/trunk/sound/audio.h ============================================================================== --- sofaswitch/trunk/sound/audio.h (original) +++ sofaswitch/trunk/sound/audio.h Tue May 13 00:51:52 2008 @@ -153,5 +153,15 @@ +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + #endif // _AUDIO_MAIN_H Modified: sofaswitch/trunk/sound/comms.cxx ============================================================================== --- sofaswitch/trunk/sound/comms.cxx (original) +++ sofaswitch/trunk/sound/comms.cxx Tue May 13 00:51:52 2008 @@ -195,5 +195,15 @@ } +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/sound/comms.h ============================================================================== --- sofaswitch/trunk/sound/comms.h (original) +++ sofaswitch/trunk/sound/comms.h Tue May 13 00:51:52 2008 @@ -163,5 +163,15 @@ #endif +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/sound/main.cxx ============================================================================== --- sofaswitch/trunk/sound/main.cxx (original) +++ sofaswitch/trunk/sound/main.cxx Tue May 13 00:51:52 2008 @@ -354,5 +354,15 @@ //////////////////////////////////////////////////////////////////////////////// +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of main.cxx Modified: sofaswitch/trunk/sound/main.h ============================================================================== --- sofaswitch/trunk/sound/main.h (original) +++ sofaswitch/trunk/sound/main.h Tue May 13 00:51:52 2008 @@ -103,5 +103,15 @@ +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + #endif // _MAIN_H Modified: sofaswitch/trunk/sound/version.h ============================================================================== --- sofaswitch/trunk/sound/version.h (original) +++ sofaswitch/trunk/sound/version.h Tue May 13 00:51:52 2008 @@ -44,5 +44,15 @@ #endif // _Audio_VERSION_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/voip/comms.cxx ============================================================================== --- sofaswitch/trunk/voip/comms.cxx (original) +++ sofaswitch/trunk/voip/comms.cxx Tue May 13 00:51:52 2008 @@ -259,6 +259,11 @@ mf->Resume(); mf->WaitUntilInitialised(); PTRACE(3, "Built message frame " << *mf); + + if (mf->IsTerminated()) { + delete mf; + mf = NULL; + } return mf; } @@ -278,12 +283,15 @@ PTRACE(3, "GetNextComms from CommsProvider"); for(;;) { Comms *c = (Comms *)GetTheNextMessageFrame(); + if (c == NULL) + return NULL; if (c->IsTerminated()) { delete c; - c = NULL; + } else { + return c; } - return c; } + return NULL; } @@ -326,8 +334,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/comms.h ============================================================================== --- sofaswitch/trunk/voip/comms.h (original) +++ sofaswitch/trunk/voip/comms.h Tue May 13 00:51:52 2008 @@ -251,8 +251,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/counts.cxx ============================================================================== --- sofaswitch/trunk/voip/counts.cxx (original) +++ sofaswitch/trunk/voip/counts.cxx Tue May 13 00:51:52 2008 @@ -140,8 +140,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/counts.h ============================================================================== --- sofaswitch/trunk/voip/counts.h (original) +++ sofaswitch/trunk/voip/counts.h Tue May 13 00:51:52 2008 @@ -83,8 +83,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/jocall.cxx ============================================================================== --- sofaswitch/trunk/voip/jocall.cxx (original) +++ sofaswitch/trunk/voip/jocall.cxx Tue May 13 00:51:52 2008 @@ -247,8 +247,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/jocall.h ============================================================================== --- sofaswitch/trunk/voip/jocall.h (original) +++ sofaswitch/trunk/voip/jocall.h Tue May 13 00:51:52 2008 @@ -217,8 +217,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/main.cxx ============================================================================== --- sofaswitch/trunk/voip/main.cxx (original) +++ sofaswitch/trunk/voip/main.cxx Tue May 13 00:51:52 2008 @@ -296,8 +296,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/main.h ============================================================================== --- sofaswitch/trunk/voip/main.h (original) +++ sofaswitch/trunk/voip/main.h Tue May 13 00:51:52 2008 @@ -83,8 +83,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/mymanager.cxx ============================================================================== --- sofaswitch/trunk/voip/mymanager.cxx (original) +++ sofaswitch/trunk/voip/mymanager.cxx Tue May 13 00:51:52 2008 @@ -926,8 +926,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/mymanager.h ============================================================================== --- sofaswitch/trunk/voip/mymanager.h (original) +++ sofaswitch/trunk/voip/mymanager.h Tue May 13 00:51:52 2008 @@ -290,8 +290,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/supervisor.cxx ============================================================================== --- sofaswitch/trunk/voip/supervisor.cxx (original) +++ sofaswitch/trunk/voip/supervisor.cxx Tue May 13 00:51:52 2008 @@ -140,8 +140,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/supervisor.h ============================================================================== --- sofaswitch/trunk/voip/supervisor.h (original) +++ sofaswitch/trunk/voip/supervisor.h Tue May 13 00:51:52 2008 @@ -125,8 +125,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/udpconnection.cxx ============================================================================== --- sofaswitch/trunk/voip/udpconnection.cxx (original) +++ sofaswitch/trunk/voip/udpconnection.cxx Tue May 13 00:51:52 2008 @@ -315,8 +315,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/udpconnection.h ============================================================================== --- sofaswitch/trunk/voip/udpconnection.h (original) +++ sofaswitch/trunk/voip/udpconnection.h Tue May 13 00:51:52 2008 @@ -221,8 +221,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/udpep.cxx ============================================================================== --- sofaswitch/trunk/voip/udpep.cxx (original) +++ sofaswitch/trunk/voip/udpep.cxx Tue May 13 00:51:52 2008 @@ -191,8 +191,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/udpep.h ============================================================================== --- sofaswitch/trunk/voip/udpep.h (original) +++ sofaswitch/trunk/voip/udpep.h Tue May 13 00:51:52 2008 @@ -216,8 +216,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/udpsound.cxx ============================================================================== --- sofaswitch/trunk/voip/udpsound.cxx (original) +++ sofaswitch/trunk/voip/udpsound.cxx Tue May 13 00:51:52 2008 @@ -288,8 +288,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/udpsound.h ============================================================================== --- sofaswitch/trunk/voip/udpsound.h (original) +++ sofaswitch/trunk/voip/udpsound.h Tue May 13 00:51:52 2008 @@ -257,8 +257,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/version.h ============================================================================== --- sofaswitch/trunk/voip/version.h (original) +++ sofaswitch/trunk/voip/version.h Tue May 13 00:51:52 2008 @@ -52,8 +52,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */

1 0

[Sofaswitch-svn] [commit] r409 - in sofaswitch/trunk/sofa: include/sofa src
by SofaSWITCH SVN 06 May '08

06 May '08

Author: derek Date: Tue May 6 00:44:14 2008 New Revision: 409 Modified: sofaswitch/trunk/sofa/include/sofa/messlist.h sofaswitch/trunk/sofa/src/messages.cxx sofaswitch/trunk/sofa/src/messlist.cxx Log: fix logic in handling frames that initiate, but never go anywhere. These frames are now correctly deleted, and the leaks are fixed... Modified: sofaswitch/trunk/sofa/include/sofa/messlist.h ============================================================================== --- sofaswitch/trunk/sofa/include/sofa/messlist.h (original) +++ sofaswitch/trunk/sofa/include/sofa/messlist.h Tue May 6 00:44:14 2008 @@ -237,9 +237,10 @@ protected: #ifdef DOC_PLUS_PLUS /**The thread, which runs to destroy old and unwanted MessageFrame instances */ - void RemoveOldMessageFrames(PThread &, INT param); + void RemoveOldMessageFrameMain(PThread &, INT param); #else - PDECLARE_NOTIFIER(PThread, MessageFrameListPending, RemoveOldMessageFrames); + PDECLARE_NOTIFIER(PThread, MessageFrameListPending, + RemoveOldMessageFrameMain); #endif /**Do the work of the purger of old message frames */ Modified: sofaswitch/trunk/sofa/src/messages.cxx ============================================================================== --- sofaswitch/trunk/sofa/src/messages.cxx (original) +++ sofaswitch/trunk/sofa/src/messages.cxx Tue May 6 00:44:14 2008 @@ -367,7 +367,7 @@ void MessageFrame::OnTermination() { - PTRACE(5, " End of the emssage frame thread.for " << GetOurId()); + PTRACE(5, " End of the message frame thread.for " << GetOurId()); } void MessageFrame::ProcessIncomingMessages(PBYTEArray & block, Modified: sofaswitch/trunk/sofa/src/messlist.cxx ============================================================================== --- sofaswitch/trunk/sofa/src/messlist.cxx (original) +++ sofaswitch/trunk/sofa/src/messlist.cxx Tue May 6 00:44:14 2008 @@ -275,7 +275,7 @@ MessageFrameListPending::MessageFrameListPending() { MessageFrameList::Initialise(); - removeOldMessageFrame = PThread::Create(PCREATE_NOTIFIER(RemoveOldMessageFrames), 0, + removeOldMessageFrame = PThread::Create(PCREATE_NOTIFIER(RemoveOldMessageFrameMain), 0, PThread::NoAutoDeleteThread, PThread::LowPriority, PString("%X OldMessageFrame")); @@ -288,9 +288,9 @@ Terminate(); WaitForTermination(); - PTRACE(1, "Delete old message frame thread pending thread"); + PTRACE(5, "Delete old message frame thread pending thread"); delete removeOldMessageFrame; - PTRACE(1, "old Message Frame Pending collector now deleted. "); + PTRACE(5, "old Message Frame Pending collector now deleted. "); } void MessageFrameListPending::WaitForTermination() @@ -309,36 +309,52 @@ MessageFrameList::AddNewMessageFrame(src); } -void MessageFrameListPending::RemoveOldMessageFrames(PThread &, INT) +void MessageFrameListPending::RemoveOldMessageFrameMain(PThread &, INT) { + PTRACE(5, "old Message Frame Pending collector now START."); while(!removeAnother.Wait(delayPurgePeriod)) PurgeOldMessageFrameBody(10 * 1000); /* Pending frames can last for 10 seconds */ PurgeOldMessageFrameBody(0); - PTRACE(1, "old Message Frame Pending collector now start to exit "); + PTRACE(5, "old Message Frame Pending collector now start to exit "); } void MessageFrameListPending::PurgeOldMessageFrameBody(PINDEX maxTimeInterval) { PTimeInterval maxTime(maxTimeInterval); PWaitAndSignal m(mutex); - PTRACE(6, " One iteration of Message Frame garbage. Remove " << PAbstractList::GetSize()); + PTRACE(5, " One iteration of Message Frame garbage. Remove " << PAbstractList::GetSize()); - for (PINDEX i = PAbstractList::GetSize(); i > 0; i--) - if (((MessageFrame *)PAbstractList::GetAt(i - 1))->TimeSinceCreation() > maxTime) { - MessageFrame *dead = (MessageFrame *)PAbstractList::GetAt(i - 1); - PTRACE(3, " Message Frame pending delete " << dead->GetOurId()); - dead->Terminate(); + for (PINDEX i = PAbstractList::GetSize(); i > 0; i--) { + MessageFrame *possible = (MessageFrame *)PAbstractList::GetAt(i - 1); + PTRACE(5, possible->GetOurId() << " has been alive for " << possible->TimeSinceCreation()); + if (possible->TimeSinceCreation() > maxTime) { + PTRACE(5, " Message Frame pending delete " << possible->GetOurId()); + possible->Terminate(); + possible->WaitForTermination(); + PAbstractList::RemoveAt(i - 1); + delete possible; + continue; + } + PTRACE(5, "Message frame pending delete for " << possible->GetOurId() << " still alive"); + if (possible->IsTerminated()) { + PAbstractList::RemoveAt(i - 1); + delete possible; + } else { + PTRACE(5, "Message frame pending delete for " << possible->GetOurId() << " skipped as still alive"); } + } if (PAbstractList::GetSize() > 0) { - PTRACE(6, " One iteration of Message Frame pending. Remaining " + PTRACE(5, " One iteration of Message Frame pending. Remaining " << PAbstractList::GetSize()); } } + + void MessageFrameListPending::SetPurgeInterval(PINDEX newInterval) { delayPurgePeriod = newInterval;

1 0

[Sofaswitch-svn] [commit] r408 - sofaswitch/trunk/voip
by SofaSWITCH SVN 06 May '08

06 May '08

Author: derek Date: Tue May 6 00:43:07 2008 New Revision: 408 Modified: sofaswitch/trunk/voip/comms.cxx sofaswitch/trunk/voip/mymanager.cxx Log: Fix leaks and issues with message instances not closing correctly. Modified: sofaswitch/trunk/voip/comms.cxx ============================================================================== --- sofaswitch/trunk/voip/comms.cxx (original) +++ sofaswitch/trunk/voip/comms.cxx Tue May 6 00:43:07 2008 @@ -280,6 +280,7 @@ Comms *c = (Comms *)GetTheNextMessageFrame(); if (c->IsTerminated()) { delete c; + c = NULL; } return c; } Modified: sofaswitch/trunk/voip/mymanager.cxx ============================================================================== --- sofaswitch/trunk/voip/mymanager.cxx (original) +++ sofaswitch/trunk/voip/mymanager.cxx Tue May 6 00:43:07 2008 @@ -108,7 +108,7 @@ nodesMakingCalls.Initialise(); nodesFinishedCalls.Initialise(); - runningComms.SetPreAllocatedSize(20); + runningComms.SetPreAllocatedSize(10); runningComms.Initialise(); } @@ -596,10 +596,20 @@ void MyManager::RequestNewId(PString & requester) { - Comms *c = runningComms.GetNextComms(); - if (c == NULL) + Comms *c; + PINDEX attempt = 0; + while (attempt < 10) { + c = runningComms.GetNextComms(); + if (c != NULL) + break; + attempt++; + } + if (attempt >= 10) { + cerr << "not good - tried hard to make a running comms" << endl; + cerr << "Give up now" << endl; return; - + } + c->SetRemoteController(requester); nodesMakingCalls.AddNewMessageFrame(c); supervisor.SendThisMessageTo(PString("REQUESTNEWID ") + c->GetOurId(), requester);

1 0

[Sofaswitch-svn] [commit] r407 - sofaswitch/trunk/voip
by SofaSWITCH SVN 04 May '08

04 May '08

Author: derek Date: Sun May 4 17:47:26 2008 New Revision: 407 Modified: sofaswitch/trunk/voip/mymanager.cxx Log: Cure memory leak on exit. Modified: sofaswitch/trunk/voip/mymanager.cxx ============================================================================== --- sofaswitch/trunk/voip/mymanager.cxx (original) +++ sofaswitch/trunk/voip/mymanager.cxx Sun May 4 17:47:26 2008 @@ -108,7 +108,7 @@ nodesMakingCalls.Initialise(); nodesFinishedCalls.Initialise(); - runningComms.SetPreAllocatedSize(10); + runningComms.SetPreAllocatedSize(20); runningComms.Initialise(); } @@ -118,6 +118,7 @@ supervisor.Terminate(); supervisor.WaitForTermination(); delete & supervisor; + delete & runningComms; PTRACE(3, "destroy the manager"); DecMyManager();

1 0

[Sofaswitch-svn] [commit] r406 - sofaswitch/trunk/server
by SofaSWITCH SVN 02 May '08

02 May '08

Author: derek Date: Fri May 2 01:08:14 2008 New Revision: 406 Modified: sofaswitch/trunk/server/main.cxx Log: Bring up to date with current ptlib code for memory tracking. Modified: sofaswitch/trunk/server/main.cxx ============================================================================== --- sofaswitch/trunk/server/main.cxx (original) +++ sofaswitch/trunk/server/main.cxx Fri May 2 01:08:14 2008 @@ -796,8 +796,10 @@ PMemoryHeap::DumpStatistics(); - PStringStream result; - PMemoryHeap::DumpObjectsSince(0, result); + PStringStream result; + PMemoryHeap::State state; + + PMemoryHeap::DumpObjectsSince(state, result); outputFile.WriteLine(result); outputFile.Close(); return true; @@ -905,7 +907,7 @@ void TcpConnectionList::FillListWithTcpConnections(PThread &, INT param) { - PINDEX fillCount = 10; + PINDEX fillCount = 200; checkListContents.Signal(); while(!endNow) {

1 0

[Sofaswitch-svn] [commit] r405 - sofaswitch/trunk/sofa/src
by SofaSWITCH SVN 23 Apr '08

23 Apr '08

Author: derek Date: Wed Apr 23 00:38:52 2008 New Revision: 405 Modified: sofaswitch/trunk/sofa/src/messages.cxx Log: Make current with ptlib. Modified: sofaswitch/trunk/sofa/src/messages.cxx ============================================================================== --- sofaswitch/trunk/sofa/src/messages.cxx (original) +++ sofaswitch/trunk/sofa/src/messages.cxx Wed Apr 23 00:38:52 2008 @@ -840,7 +840,8 @@ PMemoryHeap::DumpStatistics(); PStringStream result; - PMemoryHeap::DumpObjectsSince(0, result); + PMemoryHeap::State state; + PMemoryHeap::DumpObjectsSince(state, result); outputFile.WriteLine(result); outputFile.Close(); return;

1 0

[Sofaswitch-svn] [commit] r404 - sofaswitch/trunk/callflow/src
by SofaSWITCH SVN 04 Apr '08

04 Apr '08

Author: derek Date: Fri Apr 4 00:19:38 2008 New Revision: 404 Modified: sofaswitch/trunk/callflow/src/callflow.cpp Log: Allways compile to a .py file Modified: sofaswitch/trunk/callflow/src/callflow.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/callflow.cpp (original) +++ sofaswitch/trunk/callflow/src/callflow.cpp Fri Apr 4 00:19:38 2008 @@ -662,20 +662,24 @@ if (filedlg.ShowModal() != wxID_OK) return; - wxTextFile file(filedlg.GetPath()); + wxString name = filedlg.GetPath(); + if (name.Right(3) != wxString(".py")) + name = name + wxString(".py"); + + wxTextFile file(name); if (!file.Exists()) file.Create(); file.Open(); if (!file.IsOpened()) { - wxMessageBox(wxString::Format("Unable to open the file %s to write data to", filedlg.GetFilename().c_str())); + wxMessageBox(wxString::Format("Unable to open the file %s to write data to", name.c_str())); return; } if (canvas->Compile(file)) - SetStatusText(wxString::Format("wrote compiled code to %s", filedlg.GetFilename().c_str())); + SetStatusText(wxString::Format("wrote compiled code to %s", name.c_str())); else - wxMessageBox(wxString::Format("failed - could not compile code to %s", filedlg.GetFilename().c_str())); + wxMessageBox(wxString::Format("failed - could not compile code to %s", name.c_str())); file.Close(); }

1 0