Author: derek Date: Sun Aug 13 21:22:15 2006 New Revision: 65 Modified: sofaswitch/trunk/Makefile sofaswitch/trunk/controller/testoneam.py sofaswitch/trunk/controller/testserver.py sofaswitch/trunk/server/main.cxx sofaswitch/trunk/server/main.h Log: Minor tidyups. Modified: sofaswitch/trunk/Makefile ============================================================================== --- sofaswitch/trunk/Makefile (original) +++ sofaswitch/trunk/Makefile Sun Aug 13 21:22:15 2006 @@ -36,6 +36,14 @@ @cd server ; make both @cd sound ; make both +all2: + @cd sofa ; make -j 2 both + @cd am ; make -j 2 both + @cd voip ; make -j 2 both + @cd mcu ; make -j 2 both + @cd server ; make -j 2 both + @cd sound ; make -j 2 both + doc: Modified: sofaswitch/trunk/controller/testoneam.py ============================================================================== --- sofaswitch/trunk/controller/testoneam.py (original) +++ sofaswitch/trunk/controller/testoneam.py Sun Aug 13 21:22:15 2006 @@ -23,7 +23,7 @@ ## each iteration is done in a new fork. expstart = time.time() -maxcalls = 200 +maxcalls = 20 calls = range(maxcalls) for i in calls: @@ -34,7 +34,7 @@ controller.connect_socket_start_threads() # print 'now start a call pair on iteration ', i - am1Node = controller.request_new_id("ssam", 2) + am1Node = controller.request_new_id("am", 2) if am1Node == None: print 'am 1 node is null - exit' Modified: sofaswitch/trunk/controller/testserver.py ============================================================================== --- sofaswitch/trunk/controller/testserver.py (original) +++ sofaswitch/trunk/controller/testserver.py Sun Aug 13 21:22:15 2006 @@ -20,7 +20,7 @@ controller.LaunchGetUniqueIds() -numMessages = 10000 +numMessages = 100 ## We get five instances of nodes, controller, cont1, cont2, cont3, and cont4 @@ -50,7 +50,7 @@ for k in range(numMessages): for f in others: controller.send_message_to('hello from ' + controller.myId, f) - time.sleep(r.randint(2,100)/1000) + time.sleep(r.randint(100,1000)/1000) print 'END of me' time.sleep(1) Modified: sofaswitch/trunk/server/main.cxx ============================================================================== --- sofaswitch/trunk/server/main.cxx (original) +++ sofaswitch/trunk/server/main.cxx Sun Aug 13 21:22:15 2006 @@ -131,16 +131,16 @@ Manager::Manager() { - connectionCount = 0; - bogusCount= 0; - keepRunning = TRUE; - connectionsActive.SetAutoDeleteObjects(); - isQuitting = FALSE; + connectionCount = 0; + bogusCount= 0; + keepRunning = TRUE; + connectionsActive.SetAutoDeleteObjects(); + isQuitting = FALSE; } Manager::~Manager() { - PTRACE(3, "Manager\tDestructor"); + PTRACE(3, "Manager\tDestructor"); } void Manager::WaitForEmpty() Modified: sofaswitch/trunk/server/main.h ============================================================================== --- sofaswitch/trunk/server/main.h (original) +++ sofaswitch/trunk/server/main.h Sun Aug 13 21:22:15 2006 @@ -358,6 +358,7 @@ the object to be deleted from the list. We simply need to delete it. */ virtual void DeleteObject(PObject * object) const; + } connectionsActive; #ifdef DOC_PLUS_PLUS