diff options
Diffstat (limited to 'TAO/performance-tests/CSD_Strategy/TestInf')
8 files changed, 44 insertions, 90 deletions
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.h b/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.h index 492f680bd22..42d19f1090a 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.h +++ b/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file ClientEngine.h @@ -18,19 +16,16 @@ #include "ace/Synch.h" #include "ace/CORBA_macros.h" - class ClientEngine; typedef TAO_Intrusive_Ref_Count_Handle<ClientEngine> ClientEngine_Handle; - class CSD_PT_TestInf_Export ClientEngine : public TAO_Intrusive_Ref_Count_Base<TAO_SYNCH_MUTEX> { - public: - - ClientEngine(); - virtual ~ClientEngine(); +public: + ClientEngine(); + virtual ~ClientEngine(); - virtual bool execute(unsigned num_loops) = 0; + virtual bool execute(unsigned num_loops) = 0; }; #endif diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp index 5141f3eede0..ebe2b95e756 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp +++ b/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - #include "ClientTask.h" #include "tao/Exception.h" #include "ace/SString.h" diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.h b/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.h index 2cfb52cbde2..0cdb53fbafd 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.h +++ b/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file ClientTask.h @@ -17,31 +15,28 @@ #include "ace/Vector_T.h" #include "ace/Synch.h" - class CSD_PT_TestInf_Export ClientTask : public ACE_Task_Base { - public: - - ClientTask(); - virtual ~ClientTask(); - - void add_engine(ClientEngine* engine); - void num_loops(unsigned num_loops); +public: + ClientTask(); + virtual ~ClientTask(); - virtual int open(void* arg = 0); - virtual int svc(); - virtual int close(u_long); + void add_engine(ClientEngine* engine); + void num_loops(unsigned num_loops); - unsigned failure_count() const; + virtual int open(void* arg = 0); + virtual int svc(); + virtual int close(u_long); + unsigned failure_count() const; - private: - typedef ACE_Vector<ClientEngine_Handle> EngineVector; +private: + typedef ACE_Vector<ClientEngine_Handle> EngineVector; - TAO_SYNCH_MUTEX lock_; - EngineVector engines_; - unsigned failure_count_; - unsigned num_loops_; + TAO_SYNCH_MUTEX lock_; + EngineVector engines_; + unsigned failure_count_; + unsigned num_loops_; }; #endif diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h index eab4b7b7013..12847b0a9de 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h +++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h @@ -6,18 +6,15 @@ class CSD_PT_TestInf_Export OrbRunner { - public: +public: + OrbRunner(CORBA::ORB_ptr orb, unsigned num_orb_threads = 1); + virtual ~OrbRunner(); - OrbRunner(CORBA::ORB_ptr orb, unsigned num_orb_threads = 1); - virtual ~OrbRunner(); + void run(); - void run(void); - - - private: - - CORBA::ORB_var orb_; - unsigned num_orb_threads_; +private: + CORBA::ORB_var orb_; + unsigned num_orb_threads_; }; #endif diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.cpp index e0932bd4c38..e97050db4a0 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.cpp +++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.cpp @@ -12,24 +10,16 @@ #include "ace/CORBA_macros.h" #include "ace/OS_NS_unistd.h" - OrbShutdownTask::OrbShutdownTask() { } - -OrbShutdownTask::~OrbShutdownTask() -{ -} - - void OrbShutdownTask::orb(CORBA::ORB_ptr orb) { this->orb_ = CORBA::ORB::_duplicate(orb); } - int OrbShutdownTask::open(void*) { diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.h b/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.h index b42abe6f910..c07fa9c1355 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.h +++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.h @@ -15,24 +13,20 @@ #include "ace/Task.h" #include "tao/ORB.h" - class CSD_PT_TestInf_Export OrbShutdownTask : public ACE_Task_Base { - public: - - OrbShutdownTask(); - virtual ~OrbShutdownTask(); - - void orb(CORBA::ORB_ptr orb); - - virtual int open(void*); - virtual int svc(); - virtual int close(u_long); +public: + OrbShutdownTask(); + virtual ~OrbShutdownTask() = default; + void orb(CORBA::ORB_ptr orb); - private: + virtual int open(void*); + virtual int svc(); + virtual int close(u_long); - CORBA::ORB_var orb_; +private: + CORBA::ORB_var orb_; }; #endif diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.cpp index cc48ab3ef5c..5dc1b8901c5 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.cpp +++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbTask.cpp @@ -12,19 +10,12 @@ namespace { enum { MAX_ORB_TASK_WORKER_THREADS = 20 }; } - OrbTask::OrbTask(CORBA::ORB_ptr orb, unsigned num_threads) : orb_(CORBA::ORB::_duplicate(orb)), num_threads_(num_threads) { } - -OrbTask::~OrbTask() -{ -} - - int OrbTask::open(void*) { diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.h b/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.h index c81e4212793..104ac15ca69 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.h +++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbTask.h @@ -15,23 +13,19 @@ #include "ace/Task.h" #include "tao/ORB.h" - class CSD_PT_TestInf_Export OrbTask : public ACE_Task_Base { - public: - - OrbTask(CORBA::ORB_ptr orb, unsigned num_threads = 1); - virtual ~OrbTask(); - - virtual int open(void*); - virtual int svc(); - virtual int close(u_long); - +public: + OrbTask(CORBA::ORB_ptr orb, unsigned num_threads = 1); + virtual ~OrbTask() = default; - private: + virtual int open(void*); + virtual int svc(); + virtual int close(u_long); - CORBA::ORB_var orb_; - unsigned num_threads_; +private: + CORBA::ORB_var orb_; + unsigned num_threads_; }; #endif |