summaryrefslogtreecommitdiff
path: root/TAO/performance-tests
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/performance-tests')
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h74
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h128
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.h13
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp2
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.h35
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h17
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.cpp10
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.h24
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.cpp9
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.h24
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h22
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h2
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h2
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h2
-rw-r--r--TAO/performance-tests/Latency/AMI/Server_Task.h2
-rw-r--r--TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h2
-rw-r--r--TAO/performance-tests/Latency/Thread_Pool/Client_Task.h2
-rw-r--r--TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.h2
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp2
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp2
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMI/Server_Task.h2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.h2
25 files changed, 158 insertions, 228 deletions
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h
index 8914549880c..75c8e5a09ee 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-
//=============================================================================
/**
* @file ClientApp.h
@@ -15,47 +13,41 @@
#include "tao/ORB.h"
#include "ace/SString.h"
-
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 client_setup(void);
- int run_engine(void);
- void cleanup();
-
- // Helper methods used by the methods above.
- int parse_args(int argc, ACE_TCHAR* argv[]);
-
- int set_arg(unsigned& value,
- const ACE_TCHAR* arg,
- char opt,
- const char* name,
- int min = 0);
-
- void usage_statement();
- int arg_dependency_checks();
-
-
- CORBA::ORB_var orb_;
- ACE_TString exe_name_;
- ACE_TString ior_;
- ClientEngine_Handle engine_;
- unsigned client_id_;
- unsigned num_loops_;
+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 client_setup(void);
+ int run_engine(void);
+ void cleanup();
+
+ // Helper methods used by the methods above.
+ int parse_args(int argc, ACE_TCHAR* argv[]);
+
+ int set_arg(unsigned& value,
+ const ACE_TCHAR* arg,
+ char opt,
+ const char* name,
+ int min = 0);
+
+ void usage_statement();
+ int arg_dependency_checks();
+
+
+ CORBA::ORB_var orb_;
+ ACE_TString exe_name_;
+ ACE_TString ior_;
+ ClientEngine_Handle engine_;
+ unsigned client_id_;
+ unsigned num_loops_;
};
#endif
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h
index 23a617750be..455ace71f21 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-
//=============================================================================
/**
* @file ServerApp.h
@@ -18,75 +16,67 @@
#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
#include "ace/SString.h"
-
class ServerApp : public TestAppBase
{
- public:
-
- ServerApp();
- virtual ~ServerApp();
-
-
- 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 poa_activate(void);
- void run_collocated_clients(void);
- void run_orb_event_loop(void);
- bool check_results();
- void cleanup();
-
-
- // Helper methods used by the methods above.
- int parse_args(int argc, ACE_TCHAR* argv[]);
-
- int set_arg(unsigned& value,
- const ACE_TCHAR* arg,
- char opt,
- const char* name,
- int min = 0);
-
- void usage_statement();
- int arg_dependency_checks();
-
-
- PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb,
- const char* poa_name);
-
- typedef ServantList<Foo_i> ServantListType;
-
- CORBA::ORB_var orb_;
- PortableServer::POA_var poa_;
- TAO::CSD::TP_Strategy_Handle tp_strategy_;
-
- ServantListType servants_;
-
- ClientTask collocated_client_task_;
-
- ACE_TString exe_name_;
- ACE_TString ior_filename_prefix_;
- unsigned num_servants_;
- unsigned num_csd_threads_;
- unsigned num_orb_threads_;
- unsigned num_remote_clients_;
- unsigned num_collocated_clients_;
- unsigned num_loops_;
- unsigned use_csd_;
-
- ACE_CString scenario_id_;
- unsigned trial_id_;
-
- Foo_Statistics stats_;
+public:
+ ServerApp();
+ virtual ~ServerApp();
+
+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 poa_activate(void);
+ void run_collocated_clients(void);
+ void run_orb_event_loop(void);
+ bool check_results();
+ void cleanup();
+
+ // Helper methods used by the methods above.
+ int parse_args(int argc, ACE_TCHAR* argv[]);
+
+ int set_arg(unsigned& value,
+ const ACE_TCHAR* arg,
+ char opt,
+ const char* name,
+ int min = 0);
+
+ void usage_statement();
+ int arg_dependency_checks();
+
+ PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb,
+ const char* poa_name);
+
+ typedef ServantList<Foo_i> ServantListType;
+
+ CORBA::ORB_var orb_;
+ PortableServer::POA_var poa_;
+ TAO::CSD::TP_Strategy_Handle tp_strategy_;
+
+ ServantListType servants_;
+
+ ClientTask collocated_client_task_;
+
+ ACE_TString exe_name_;
+ ACE_TString ior_filename_prefix_;
+ unsigned num_servants_;
+ unsigned num_csd_threads_;
+ unsigned num_orb_threads_;
+ unsigned num_remote_clients_;
+ unsigned num_collocated_clients_;
+ unsigned num_loops_;
+ unsigned use_csd_;
+
+ ACE_CString scenario_id_;
+ unsigned trial_id_;
+
+ Foo_Statistics stats_;
};
#endif
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
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h
index 233c9f7bcdf..07f5e9fcaca 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h
@@ -1,5 +1,3 @@
-// This may look like C, but it's really -*- C++ -*-
-
//=============================================================================
/**
* @file Foo_ClientEngine.h
@@ -17,23 +15,19 @@
class Foo_Statistics;
-
class CSD_PT_TestServant_Export Foo_ClientEngine : public ClientEngine
{
- public:
-
- Foo_ClientEngine(Foo_ptr obj, unsigned client_id = 0);
- virtual ~Foo_ClientEngine();
-
- virtual bool execute(unsigned num_loops);
-
- static void expected_results(Foo_Statistics& stats);
+public:
+ Foo_ClientEngine(Foo_ptr obj, unsigned client_id = 0);
+ virtual ~Foo_ClientEngine();
+ virtual bool execute(unsigned num_loops);
- private:
+ static void expected_results(Foo_Statistics& stats);
- Foo_var obj_;
- unsigned client_id_;
+private:
+ Foo_var obj_;
+ unsigned client_id_;
};
#endif
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
index 0c2cf288240..72e6a106a17 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
@@ -41,7 +41,7 @@ public:
u_int task_id);
/// Active Object entry point.
- virtual int svc (void);
+ virtual int svc ();
/// Gets the ior of the cubit servant in this task.
char* get_servant_ior (u_int index);
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
index 67d58aec398..818ccc448f5 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
@@ -252,7 +252,7 @@ public:
~Client (void);
/// The thread function.
- virtual int svc (void);
+ virtual int svc ();
/// Returns the latency of the high priority thread in usecs.
ACE_timer_t get_high_priority_latency (void);
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
index 15448fc7f99..e71393dd7a8 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
@@ -29,7 +29,7 @@ public:
ACE_Thread_Manager *thr_mgr);
/// The thread entry point function.
- virtual int svc (void);
+ virtual int svc ();
/// Gets the number of computations the thread was able to perform.
u_long get_number_of_computations (void);
diff --git a/TAO/performance-tests/Latency/AMI/Server_Task.h b/TAO/performance-tests/Latency/AMI/Server_Task.h
index cfc9d76bc37..bd12b2c757a 100644
--- a/TAO/performance-tests/Latency/AMI/Server_Task.h
+++ b/TAO/performance-tests/Latency/AMI/Server_Task.h
@@ -17,7 +17,7 @@ public:
Server_Task (CORBA::ORB_ptr orb);
/// The thread entry point
- virtual int svc (void);
+ virtual int svc ();
private:
/// Keep a reference to the ORB
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
index 07a0fbaf7b1..5848a4a8771 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
@@ -22,7 +22,7 @@ public:
ACE_High_Res_Timer::global_scale_factor_type gsf);
/// The service method
- virtual int svc (void);
+ virtual int svc ();
private:
/// Make sure that the current thread has a connection available.
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
index 07a0fbaf7b1..5848a4a8771 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
+++ b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
@@ -22,7 +22,7 @@ public:
ACE_High_Res_Timer::global_scale_factor_type gsf);
/// The service method
- virtual int svc (void);
+ virtual int svc ();
private:
/// Make sure that the current thread has a connection available.
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.h b/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.h
index 394be338714..5375d260165 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.h
+++ b/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.h
@@ -14,7 +14,7 @@ public:
Worker_Thread (CORBA::ORB_ptr orb);
// = The service method
- virtual int svc (void);
+ virtual int svc ();
private:
CORBA::ORB_var orb_;
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
index 3466ec9ced1..2dab4dd836c 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
@@ -39,7 +39,7 @@ public:
// Accumulate the throughput statistics into <throughput>
// = The ACE_Task_Base methods....
- virtual int svc (void);
+ virtual int svc ();
private:
CORBA::ORB_ptr orb_;
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
index cbca89d0e78..958b597b92b 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
@@ -24,7 +24,7 @@ public:
// Set the test attributes.
// = The ACE_Task_Base methods....
- virtual int svc (void);
+ virtual int svc ();
private:
Test_i *server_;
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
index 3f499bffaba..a0046475528 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
@@ -38,7 +38,7 @@ public:
// Output the accumulated statistics.
// = The ACE_Task_Base methods....
- virtual int svc (void);
+ virtual int svc ();
private:
CORBA::ORB_ptr orb_;
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.h b/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.h
index cfc9d76bc37..bd12b2c757a 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.h
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.h
@@ -17,7 +17,7 @@ public:
Server_Task (CORBA::ORB_ptr orb);
/// The thread entry point
- virtual int svc (void);
+ virtual int svc ();
private:
/// Keep a reference to the ORB
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
index 79f1c7eb6e3..0bd8f60bd15 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
@@ -24,7 +24,7 @@ public:
ACE_High_Res_Timer::global_scale_factor_type gsf);
/// The service method
- virtual int svc (void);
+ virtual int svc ();
private:
/// Make sure that the current thread has a connection available.
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
index 79f1c7eb6e3..0bd8f60bd15 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
@@ -24,7 +24,7 @@ public:
ACE_High_Res_Timer::global_scale_factor_type gsf);
/// The service method
- virtual int svc (void);
+ virtual int svc ();
private:
/// Make sure that the current thread has a connection available.
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.h
index 8c7084b5d82..c6d03785ebe 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.h
@@ -13,7 +13,7 @@ public:
Worker_Thread (CORBA::ORB_ptr orb);
// = The service method
- virtual int svc (void);
+ virtual int svc ();
private:
CORBA::ORB_var orb_;