ThreadedSocketConnection does not need a reference to an application.

Kill all running instances of ut and at before running tests.
w3stling · Mar 22, 2014 · ebc0f9d · ebc0f9d
1 parent d42d13e
commit ebc0f9d
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/src/C++/ThreadedSocketAcceptor.cpp b/src/C++/ThreadedSocketAcceptor.cpp
@@ -213,7 +213,7 @@ THREAD_PROC ThreadedSocketAcceptor::socketAcceptorThread( void* p )
 
     ThreadedSocketConnection * pConnection =
       new ThreadedSocketConnection
-        ( socket, sessions, pAcceptor->getApplication(), pAcceptor->getLog() );
+        ( socket, sessions, pAcceptor->getLog() );
 
     ConnectionThreadInfo* info = new ConnectionThreadInfo( pAcceptor, pConnection );
 

diff --git a/src/C++/ThreadedSocketConnection.cpp b/src/C++/ThreadedSocketConnection.cpp
@@ -32,8 +32,8 @@
 namespace FIX
 {
 ThreadedSocketConnection::ThreadedSocketConnection
-( int s, Sessions sessions, Application& application, Log* pLog )
-: m_socket( s ), m_application( application ), m_pLog( pLog ),
+( int s, Sessions sessions, Log* pLog )
+: m_socket( s ), m_pLog( pLog ),
   m_sessions( sessions ), m_pSession( 0 ),
   m_disconnect( false )
 {
@@ -44,9 +44,9 @@ ThreadedSocketConnection::ThreadedSocketConnection
 ThreadedSocketConnection::ThreadedSocketConnection
 ( const SessionID& sessionID, int s,
   const std::string& address, short port, 
-  Application& application, Log* pLog )
+  Log* pLog )
   : m_socket( s ), m_address( address ), m_port( port ),
-    m_application( application ), m_pLog( pLog ),
+    m_pLog( pLog ),
     m_pSession( Session::lookupSession( sessionID ) ),
     m_disconnect( false )
 {

diff --git a/src/C++/ThreadedSocketConnection.h b/src/C++/ThreadedSocketConnection.h
@@ -46,10 +46,10 @@ class ThreadedSocketConnection : Responder
 public:
   typedef std::set<SessionID> Sessions;
 
-  ThreadedSocketConnection( int s, Sessions sessions, Application& application, Log* pLog );
+  ThreadedSocketConnection( int s, Sessions sessions, Log* pLog );
   ThreadedSocketConnection( const SessionID&, int s, 
                             const std::string& address, short port, 
-                            Application&, Log* pLog );
+                            Log* pLog );
   virtual ~ThreadedSocketConnection() ;
 
   Session* getSession() const { return m_pSession; }
@@ -70,7 +70,6 @@ class ThreadedSocketConnection : Responder
   std::string m_address;
   int m_port;
 
-  Application& m_application;
   Log* m_pLog;
   Parser m_parser;
   Sessions m_sessions;

diff --git a/src/C++/ThreadedSocketInitiator.cpp b/src/C++/ThreadedSocketInitiator.cpp
@@ -155,7 +155,7 @@ void ThreadedSocketInitiator::doConnect( const SessionID& s, const Dictionary& d
     log->onEvent( "Connecting to " + address + " on port " + IntConvertor::convert((unsigned short)port) );
 
     ThreadedSocketConnection* pConnection =
-      new ThreadedSocketConnection( s, socket, address, port, getApplication(), getLog() );
+      new ThreadedSocketConnection( s, socket, address, port, getLog() );
 
     ThreadPair* pair = new ThreadPair( this, pConnection );
 

diff --git a/test/runat.sh b/test/runat.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+killall ut at
+
 RUBY="ruby -I."
 DIR=`pwd`
 PORT=$1

diff --git a/test/runat_threaded.sh b/test/runat_threaded.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+killall ut at
+
 DIR=`pwd`
 PORT=$1
 ./setup.sh $PORT

diff --git a/test/runut.sh b/test/runut.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+killall ut at
+
 DIR=`pwd`
 
 ./ut -p $1 -f cfg/ut.cfg