diff options
Diffstat (limited to 'TAO/tests/CSD_Strategy_Tests/Broken')
| -rw-r--r-- | TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp | 12 | ||||
| -rw-r--r-- | TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h | 15 | ||||
| -rw-r--r-- | TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp | 22 | ||||
| -rw-r--r-- | TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h | 22 |
4 files changed, 28 insertions, 43 deletions
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp index b9ae2cb7e37..9890f024599 100644 --- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp @@ -78,7 +78,7 @@ ClientApp::init(int argc, ACE_TCHAR* argv[]) void -ClientApp::poa_setup(void) +ClientApp::poa_setup() { this->poa_ = this->create_poa(this->orb_.in(), "ChildPoa"); @@ -86,7 +86,7 @@ ClientApp::poa_setup(void) void -ClientApp::csd_setup(void) +ClientApp::csd_setup() { this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_); @@ -100,7 +100,7 @@ ClientApp::csd_setup(void) void -ClientApp::client_setup(void) +ClientApp::client_setup() { // Turn the ior_ into a Foo_B obj ref. Foo_B_var foo = RefHelper<Foo_B>::string_to_ref(this->orb_.in(), @@ -119,7 +119,7 @@ ClientApp::client_setup(void) void -ClientApp::poa_activate(void) +ClientApp::poa_activate() { PortableServer::POAManager_var poa_manager = this->poa_->the_POAManager(); @@ -128,7 +128,7 @@ ClientApp::poa_activate(void) void -ClientApp::run_clients(void) +ClientApp::run_clients() { if (this->client_task_.open() != 0) { @@ -138,7 +138,7 @@ ClientApp::run_clients(void) void -ClientApp::run_orb_event_loop(void) +ClientApp::run_orb_event_loop() { OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_); orb_runner.run(); diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h index fa005fdda5c..8160a063995 100644 --- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h @@ -14,25 +14,22 @@ class ClientApp : public TestAppBase { public: - ClientApp(); virtual ~ClientApp(); protected: - virtual int run_i(int argc, ACE_TCHAR* argv[]); private: - // These are all called, in order, by the run_i() method. int init(int argc, ACE_TCHAR* argv[]); - void poa_setup(void); - void csd_setup(void); - void client_setup(void); - void poa_activate(void); - void run_clients(void); - void run_orb_event_loop(void); + void poa_setup(); + void csd_setup(); + void client_setup(); + void poa_activate(); + void run_clients(); + void run_orb_event_loop(); bool check_validity (); void cleanup(); diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp index ea45b56328d..97724f5a5e9 100644 --- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp @@ -23,12 +23,6 @@ ServerApp::ServerApp() { } - -ServerApp::~ServerApp() -{ -} - - int ServerApp::run_i(int argc, ACE_TCHAR* argv[]) { @@ -82,7 +76,7 @@ ServerApp::init(int argc, ACE_TCHAR* argv[]) void -ServerApp::poa_setup(void) +ServerApp::poa_setup() { this->poa_ = this->create_poa(this->orb_.in(), "ChildPoa"); @@ -95,7 +89,7 @@ ServerApp::poa_setup(void) } void -ServerApp::csd_setup(void) +ServerApp::csd_setup() { this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_); @@ -131,7 +125,7 @@ ServerApp::csd_setup(void) void -ServerApp::servant_setup(void) +ServerApp::servant_setup() { this->foo_servants_.create_and_activate(this->num_servants_, this->orb_.in (), @@ -141,7 +135,7 @@ ServerApp::servant_setup(void) void -ServerApp::collocated_setup(void) +ServerApp::collocated_setup() { if (this->num_collocated_clients_ == 0) return; @@ -162,14 +156,14 @@ ServerApp::collocated_setup(void) FooServantListType::T_stub_var foo = this->foo_servants_.objref(servant_index); ClientEngine_Handle engine - = new Foo_B_SimpleClientEngine(foo.in(), cb.in (), client_id, true); + = new Foo_B_SimpleClientEngine(foo.in(), cb.in (), client_id); this->collocated_client_task_.add_engine(engine.in()); } } void -ServerApp::poa_activate(void) +ServerApp::poa_activate() { PortableServer::POAManager_var poa_manager = this->poa_->the_POAManager(); @@ -178,7 +172,7 @@ ServerApp::poa_activate(void) void -ServerApp::run_collocated_clients(void) +ServerApp::run_collocated_clients() { if (this->num_collocated_clients_ > 0) { @@ -191,7 +185,7 @@ ServerApp::run_collocated_clients(void) void -ServerApp::run_orb_event_loop(void) +ServerApp::run_orb_event_loop() { OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_); orb_runner.run(); diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h index 3141df7fde7..4285af45932 100644 --- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h @@ -13,31 +13,25 @@ class ServerApp : public TestAppBase { public: - ServerApp(); - virtual ~ServerApp(); - + virtual ~ServerApp() = default; protected: - virtual int run_i(int argc, ACE_TCHAR* argv[]); - private: - // These are all called, in order, by the run_i() method. int init(int argc, ACE_TCHAR* argv[]); - void poa_setup(void); - void csd_setup(void); - void servant_setup(void); - void collocated_setup(void); - void poa_activate(void); - void run_collocated_clients(void); - void run_orb_event_loop(void); + void poa_setup(); + void csd_setup(); + void servant_setup(); + void collocated_setup(); + void poa_activate(); + void run_collocated_clients(); + void run_orb_event_loop(); bool check_validity (); void cleanup(); - // Helper methods used by the methods above. int parse_args(int argc, ACE_TCHAR* argv[]); |