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.cpp4
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h4
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp13
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h12
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h2
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp2
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h2
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h3
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h2
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp6
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h8
-rw-r--r--TAO/performance-tests/Callback/Callback_i.cpp2
-rw-r--r--TAO/performance-tests/Callback/Callback_i.h4
-rw-r--r--TAO/performance-tests/Callback/Callback_i.inl2
-rw-r--r--TAO/performance-tests/Callback/Server_i.cpp2
-rw-r--r--TAO/performance-tests/Callback/Server_i.h6
-rw-r--r--TAO/performance-tests/Callback/Server_i.inl4
-rw-r--r--TAO/performance-tests/Callback/client.cpp8
-rw-r--r--TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp60
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp7
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h6
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp8
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h8
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp17
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h16
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp8
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h6
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp14
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h15
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp37
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h36
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp6
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h6
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp8
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h6
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp36
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h38
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp8
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h8
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp16
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h18
-rw-r--r--TAO/performance-tests/Latency/AMI/Roundtrip.cpp2
-rw-r--r--TAO/performance-tests/Latency/AMI/Roundtrip.h2
-rw-r--r--TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp2
-rw-r--r--TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h2
-rw-r--r--TAO/performance-tests/Latency/AMI/Server_Task.cpp2
-rw-r--r--TAO/performance-tests/Latency/AMI/client.cpp1
-rw-r--r--TAO/performance-tests/Latency/Collocation/Client_Task.cpp3
-rw-r--r--TAO/performance-tests/Latency/Collocation/Client_Task.h5
-rw-r--r--TAO/performance-tests/Latency/Collocation/Roundtrip.cpp2
-rw-r--r--TAO/performance-tests/Latency/Collocation/Roundtrip.h2
-rw-r--r--TAO/performance-tests/Latency/Collocation/Server_Task.cpp2
-rw-r--r--TAO/performance-tests/Latency/Collocation/Server_Task.h1
-rw-r--r--TAO/performance-tests/Latency/DII/Roundtrip.cpp2
-rw-r--r--TAO/performance-tests/Latency/DII/Roundtrip.h2
-rw-r--r--TAO/performance-tests/Latency/DII/client.cpp1
-rw-r--r--TAO/performance-tests/Latency/Deferred/Roundtrip.cpp2
-rw-r--r--TAO/performance-tests/Latency/Deferred/Roundtrip.h2
-rw-r--r--TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp2
-rw-r--r--TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h2
-rw-r--r--TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp4
-rw-r--r--TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h2
-rw-r--r--TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp2
-rw-r--r--TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h2
-rw-r--r--TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp4
-rw-r--r--TAO/performance-tests/Latency/Thread_Pool/Client_Task.h2
-rw-r--r--TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp2
-rw-r--r--TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h2
-rw-r--r--TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp2
-rw-r--r--TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp2
-rw-r--r--TAO/performance-tests/Memory/IORsize/Memory_Growth.h2
-rw-r--r--TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp4
-rw-r--r--TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h4
-rw-r--r--TAO/performance-tests/POA/Create_Reference/create_reference.cpp2
-rw-r--r--TAO/performance-tests/POA/Demux/client.cpp2
-rw-r--r--TAO/performance-tests/POA/Demux/demux_stats.cpp8
-rw-r--r--TAO/performance-tests/POA/Demux/demux_test_client.cpp20
-rw-r--r--TAO/performance-tests/POA/Demux/demux_test_client.h23
-rw-r--r--TAO/performance-tests/POA/Demux/demux_test_client.inl2
-rw-r--r--TAO/performance-tests/POA/Demux/demux_test_i.cpp8
-rw-r--r--TAO/performance-tests/POA/Demux/demux_test_i.h10
-rw-r--r--TAO/performance-tests/POA/Demux/demux_test_server.cpp16
-rw-r--r--TAO/performance-tests/POA/Demux/demux_test_server.h14
-rw-r--r--TAO/performance-tests/POA/Demux/write_names.cpp1
-rw-r--r--TAO/performance-tests/POA/Implicit_Activation/Factory.cpp4
-rw-r--r--TAO/performance-tests/POA/Implicit_Activation/Factory.h4
-rw-r--r--TAO/performance-tests/POA/Implicit_Activation/Simple.cpp4
-rw-r--r--TAO/performance-tests/POA/Implicit_Activation/Simple.h4
-rw-r--r--TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp3
-rw-r--r--TAO/performance-tests/Pluggable/PP_Test_Client.cpp17
-rw-r--r--TAO/performance-tests/Pluggable/PP_Test_Client.h14
-rw-r--r--TAO/performance-tests/Pluggable/PP_Test_Server.cpp6
-rw-r--r--TAO/performance-tests/Pluggable/PP_Test_Server.h8
-rw-r--r--TAO/performance-tests/Pluggable/PP_Test_i.cpp12
-rw-r--r--TAO/performance-tests/Pluggable/PP_Test_i.h12
-rw-r--r--TAO/performance-tests/Protocols/distributor.cpp26
-rw-r--r--TAO/performance-tests/Protocols/receiver.cpp24
-rw-r--r--TAO/performance-tests/Protocols/sender.cpp15
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h2
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl2
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp6
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp7
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp7
-rw-r--r--TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp4
-rw-r--r--TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp2
-rw-r--r--TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h2
-rw-r--r--TAO/performance-tests/RTCorba/Thread_Pool/client.cpp32
-rw-r--r--TAO/performance-tests/RTCorba/Thread_Pool/server.cpp14
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h1
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp1
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h2
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMI/client.cpp6
-rw-r--r--TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Sequence_Latency/DSI/client.cpp1
-rw-r--r--TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Sequence_Latency/Deferred/client.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp22
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h14
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp22
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h14
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp2
-rw-r--r--TAO/performance-tests/Throughput/Receiver.cpp4
-rw-r--r--TAO/performance-tests/Throughput/Receiver.h4
-rw-r--r--TAO/performance-tests/Throughput/Receiver_Factory.cpp4
-rw-r--r--TAO/performance-tests/Throughput/Receiver_Factory.h4
139 files changed, 464 insertions, 558 deletions
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
index 10a1933687a..b751465096f 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
@@ -51,7 +51,7 @@ ClientApp::init(int argc, ACE_TCHAR* argv[])
void
-ClientApp::client_setup(void)
+ClientApp::client_setup()
{
// Turn the ior_ into a Foo obj ref.
Foo_var foo = RefHelper<Foo>::string_to_ref(this->orb_.in(),
@@ -63,7 +63,7 @@ ClientApp::client_setup(void)
int
-ClientApp::run_engine(void)
+ClientApp::run_engine()
{
bool result = this->engine_->execute(this->num_loops_);
return result ? 0 : -1;
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h
index 75c8e5a09ee..2fbb239cde0 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h
@@ -25,8 +25,8 @@ protected:
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 client_setup();
+ int run_engine();
void cleanup();
// Helper methods used by the methods above.
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
index 423ad03312a..489fb1d558a 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
@@ -107,7 +107,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");
@@ -115,7 +115,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_);
@@ -132,7 +132,7 @@ ServerApp::csd_setup(void)
void
-ServerApp::servant_setup(void)
+ServerApp::servant_setup()
{
this->servants_.create_and_activate(this->num_servants_,
this->orb_.in (),
@@ -165,7 +165,7 @@ ServerApp::collocated_setup()
void
-ServerApp::poa_activate(void)
+ServerApp::poa_activate()
{
PortableServer::POAManager_var poa_manager
= this->poa_->the_POAManager();
@@ -175,7 +175,7 @@ ServerApp::poa_activate(void)
void
-ServerApp::run_collocated_clients(void)
+ServerApp::run_collocated_clients()
{
if (this->num_collocated_clients_ > 0)
{
@@ -188,7 +188,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();
@@ -386,7 +386,6 @@ ServerApp::create_poa(CORBA::ORB_ptr orb,
bool
ServerApp::check_results()
{
-
this->stats_.init(this->num_remote_clients_ +
this->num_collocated_clients_,
this->num_loops_);
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h
index 455ace71f21..075a5b5a3b4 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h
@@ -28,13 +28,13 @@ protected:
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 poa_setup();
+ void csd_setup();
+ void servant_setup();
void collocated_setup();
- void poa_activate(void);
- void run_collocated_clients(void);
- void run_orb_event_loop(void);
+ void poa_activate();
+ void run_collocated_clients();
+ void run_orb_event_loop();
bool check_results();
void cleanup();
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h
index 2aa73b80583..816486a8d6c 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h
@@ -64,12 +64,10 @@ struct RefHelper
return t_obj._retn();
}
-
};
struct CSD_PT_TestInf_Export AppHelper
{
-
static void ref_to_file(CORBA::ORB_ptr orb,
CORBA::Object_ptr obj,
const ACE_TCHAR* filename);
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
index 03e04037a86..41baeabb066 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
@@ -8,7 +8,6 @@
class CSD_PT_TestInf_Export AppShutdown
{
public:
-
AppShutdown();
virtual ~AppShutdown();
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp
index 0e2dd6c9749..5594914a6cb 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp
@@ -16,7 +16,7 @@ OrbRunner::~OrbRunner()
void
-OrbRunner::run(void)
+OrbRunner::run()
{
ACE_ASSERT(this->num_orb_threads_ > 0);
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h
index f7f5c727648..be09dae14cd 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h
@@ -11,7 +11,6 @@ template <class T>
class ServantList
{
public:
-
typedef typename T::_stub_type T_stub;
typedef typename T::_stub_ptr_type T_stub_ptr;
typedef typename T::_stub_var_type T_stub_var;
@@ -38,7 +37,6 @@ class ServantList
private:
-
struct ServantRecord
{
T* servant_;
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h
index a3e2d64be32..f92e3b8e849 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h
@@ -10,7 +10,6 @@
class CSD_PT_TestInf_Export TestAppBase
{
public:
-
virtual ~TestAppBase();
// Returns 0 for success, and -1 for failure.
@@ -20,7 +19,6 @@ class CSD_PT_TestInf_Export TestAppBase
protected:
-
TestAppBase(const char* name);
// Returns -1 for failure, 0 for success
@@ -28,7 +26,6 @@ class CSD_PT_TestInf_Export TestAppBase
private:
-
ACE_CString name_;
};
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h
index 8dd569d1543..287fb68ab80 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h
@@ -7,7 +7,6 @@
class CSD_PT_TestServant_Export Foo_Statistics
{
public:
-
Foo_Statistics();
virtual ~Foo_Statistics();
@@ -22,7 +21,6 @@ class CSD_PT_TestServant_Export Foo_Statistics
private:
-
unsigned num_clients_;
unsigned num_loops_;
unsigned expected_[5];
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
index 5aa94864344..5d32033e6bd 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
@@ -17,7 +17,7 @@ Foo_i::~Foo_i()
void
-Foo_i::op1(void)
+Foo_i::op1()
{
this->op_count_[0]++;
}
@@ -48,7 +48,7 @@ Foo_i::op4(CORBA::Long value)
void
-Foo_i::op5(void)
+Foo_i::op5()
{
this->op_count_[4]++;
throw FooException();
@@ -56,7 +56,7 @@ Foo_i::op5(void)
void
-Foo_i::done(void)
+Foo_i::done()
{
TheAppShutdown->client_done();
}
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
index 476b9e238cb..6aac17c5a51 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
@@ -9,11 +9,10 @@
class CSD_PT_TestServant_Export Foo_i : public virtual POA_Foo
{
public:
-
Foo_i();
virtual ~Foo_i();
- virtual void op1(void);
+ virtual void op1();
virtual void op2(CORBA::Long value);
@@ -21,16 +20,15 @@ class CSD_PT_TestServant_Export Foo_i : public virtual POA_Foo
virtual void op4(CORBA::Long value);
- virtual void op5(void);
+ virtual void op5();
- virtual void done(void);
+ virtual void done();
void gather_stats(Foo_Statistics& stats);
private:
-
unsigned op_count_[5];
};
diff --git a/TAO/performance-tests/Callback/Callback_i.cpp b/TAO/performance-tests/Callback/Callback_i.cpp
index 6c8b0a5a997..2a6f4ba31e2 100644
--- a/TAO/performance-tests/Callback/Callback_i.cpp
+++ b/TAO/performance-tests/Callback/Callback_i.cpp
@@ -7,7 +7,7 @@
#include "ace/OS_NS_time.h"
int
-Callback_i::done (void)
+Callback_i::done ()
{
ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
return this->remaining_samples_ == 0;
diff --git a/TAO/performance-tests/Callback/Callback_i.h b/TAO/performance-tests/Callback/Callback_i.h
index e646e2e3416..4b519cc5468 100644
--- a/TAO/performance-tests/Callback/Callback_i.h
+++ b/TAO/performance-tests/Callback/Callback_i.h
@@ -12,10 +12,10 @@ public:
Callback_i (int expected_samples);
/// Return 1 when all the samples have been received
- int done (void);
+ int done ();
/// Get access to the history
- ACE_Sample_History &sample_history (void);
+ ACE_Sample_History &sample_history ();
/// Implement the CORBA methods
//@{
diff --git a/TAO/performance-tests/Callback/Callback_i.inl b/TAO/performance-tests/Callback/Callback_i.inl
index 18c2c0cad06..2b5f88582dd 100644
--- a/TAO/performance-tests/Callback/Callback_i.inl
+++ b/TAO/performance-tests/Callback/Callback_i.inl
@@ -6,7 +6,7 @@ Callback_i::Callback_i (int expected_samples)
}
ACE_INLINE ACE_Sample_History&
-Callback_i::sample_history (void)
+Callback_i::sample_history ()
{
return this->history_;
}
diff --git a/TAO/performance-tests/Callback/Server_i.cpp b/TAO/performance-tests/Callback/Server_i.cpp
index 7751da4e5b8..de5cd14c3dd 100644
--- a/TAO/performance-tests/Callback/Server_i.cpp
+++ b/TAO/performance-tests/Callback/Server_i.cpp
@@ -21,7 +21,7 @@ Server_i::request (Test::TimeStamp time_stamp,
}
void
-Server_i::shutdown (void)
+Server_i::shutdown ()
{
this->done_ = 1;
}
diff --git a/TAO/performance-tests/Callback/Server_i.h b/TAO/performance-tests/Callback/Server_i.h
index 06948665fc2..2c67802f8f4 100644
--- a/TAO/performance-tests/Callback/Server_i.h
+++ b/TAO/performance-tests/Callback/Server_i.h
@@ -8,10 +8,10 @@ class Server_i : public POA_Test::Server
{
public:
/// Constructor.
- Server_i (void);
+ Server_i ();
/// Return 1 when the shutdown method has been invoked.
- int done (void);
+ int done ();
/// Implement the CORBA methods
//@{
@@ -20,7 +20,7 @@ public:
void request (Test::TimeStamp,
const Test::Payload &);
- void shutdown (void);
+ void shutdown ();
//@}
diff --git a/TAO/performance-tests/Callback/Server_i.inl b/TAO/performance-tests/Callback/Server_i.inl
index e162f536d0a..d772f2523d3 100644
--- a/TAO/performance-tests/Callback/Server_i.inl
+++ b/TAO/performance-tests/Callback/Server_i.inl
@@ -1,11 +1,11 @@
ACE_INLINE
-Server_i::Server_i (void)
+Server_i::Server_i ()
: done_ (0)
{
}
ACE_INLINE int
-Server_i::done (void)
+Server_i::done ()
{
return this->done_;
}
diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp
index 069c566552f..87e5d3a9e8b 100644
--- a/TAO/performance-tests/Callback/client.cpp
+++ b/TAO/performance-tests/Callback/client.cpp
@@ -28,10 +28,10 @@ public:
Task (Test::Server_ptr server, int iterations);
/// Return 1 when all the messages have been sent
- int done (void);
+ int done ();
/// Run the experiment
- int svc (void);
+ int svc ();
private:
/// The consumer
@@ -232,14 +232,14 @@ Task::Task (Test::Server_ptr server,
}
int
-Task::done (void)
+Task::done ()
{
ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 1);
return this->remaining_messages_ == 0;
}
int
-Task::svc (void)
+Task::svc ()
{
Test::Payload payload(1024); payload.length(1024);
try
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
index 1e1c519b9d9..cc37438aab2 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
@@ -50,23 +50,23 @@ class DII_Cubit_Client
public:
// = Constructor and destructor.
/// Constructor.
- DII_Cubit_Client (void);
+ DII_Cubit_Client ();
/// Destructor.
- ~DII_Cubit_Client (void);
+ ~DII_Cubit_Client ();
/// Initialize the ORB and gets the Cubit objref.
int init (int argc, ACE_TCHAR **argv);
/// Execute client example code.
- int run (void);
+ int run ();
private:
/// Gets objref through naming service.
- int init_naming_service (void);
+ int init_naming_service ();
/// Parses the arguments passed on the command line.
- int parse_args (void);
+ int parse_args ();
/// Function to read the cubit factory IOR from a file.
int read_ior (ACE_TCHAR *filename);
@@ -77,25 +77,25 @@ private:
// = DII versions of Cubit operations:
- void cube_short_dii (void);
- void cube_long_dii (void);
- void cube_octet_dii (void);
- void cube_union_dii (void);
- void cube_struct_dii (void);
+ void cube_short_dii ();
+ void cube_long_dii ();
+ void cube_octet_dii ();
+ void cube_union_dii ();
+ void cube_struct_dii ();
void cube_octet_seq_dii (int length);
void cube_long_seq_dii (int length);
// = Wrappers for cubing small and large sequences w/o args:
/// Wrapper for the mixin call, just to be neat.
- void cube_small_long_seq (void);
- void cube_large_long_seq (void);
- void cube_small_octet_seq (void);
- void cube_large_octet_seq (void);
- void cube_mixin (void);
+ void cube_small_long_seq ();
+ void cube_large_long_seq ();
+ void cube_small_octet_seq ();
+ void cube_large_octet_seq ();
+ void cube_mixin ();
/// Array of pointers to the operation functions.
- void (DII_Cubit_Client::*op_array_[NUMBER_OF_TESTS])(void);
+ void (DII_Cubit_Client::*op_array_[NUMBER_OF_TESTS])();
/// Array of labels for passing to print_stats.
static const char *stats_messages_[];
@@ -138,7 +138,7 @@ private:
};
// Constructor
-DII_Cubit_Client::DII_Cubit_Client (void)
+DII_Cubit_Client::DII_Cubit_Client ()
: loop_count_ (DEFAULT_LOOP_COUNT),
shutdown_ (0),
orb_var_ (0),
@@ -162,7 +162,7 @@ DII_Cubit_Client::DII_Cubit_Client (void)
}
// Destructor
-DII_Cubit_Client::~DII_Cubit_Client (void)
+DII_Cubit_Client::~DII_Cubit_Client ()
{
}
@@ -243,7 +243,7 @@ DII_Cubit_Client::init (int argc, ACE_TCHAR **argv)
// Sort out the args in the command line.
int
-DII_Cubit_Client::parse_args (void)
+DII_Cubit_Client::parse_args ()
{
ACE_Get_Opt opts (argc_, argv_, ACE_TEXT("dn:i:f:x"));
int c;
@@ -356,7 +356,7 @@ DII_Cubit_Client::print_stats (const char *call_name,
}
void
-DII_Cubit_Client::cube_short_dii (void)
+DII_Cubit_Client::cube_short_dii ()
{
try
{
@@ -395,7 +395,7 @@ DII_Cubit_Client::cube_short_dii (void)
}
void
-DII_Cubit_Client::cube_long_dii (void)
+DII_Cubit_Client::cube_long_dii ()
{
try
{
@@ -435,7 +435,7 @@ DII_Cubit_Client::cube_long_dii (void)
}
void
-DII_Cubit_Client::cube_octet_dii (void)
+DII_Cubit_Client::cube_octet_dii ()
{
try
{
@@ -478,7 +478,7 @@ DII_Cubit_Client::cube_octet_dii (void)
}
void
-DII_Cubit_Client::cube_union_dii (void)
+DII_Cubit_Client::cube_union_dii ()
{
try
{
@@ -528,7 +528,7 @@ DII_Cubit_Client::cube_union_dii (void)
}
void
-DII_Cubit_Client::cube_struct_dii (void)
+DII_Cubit_Client::cube_struct_dii ()
{
try
{
@@ -691,31 +691,31 @@ DII_Cubit_Client::cube_long_seq_dii (int length)
// through in run ().
void
-DII_Cubit_Client::cube_small_long_seq (void)
+DII_Cubit_Client::cube_small_long_seq ()
{
this->cube_long_seq_dii (SMALL_LONG_SEQ_LENGTH);
}
void
-DII_Cubit_Client::cube_large_long_seq (void)
+DII_Cubit_Client::cube_large_long_seq ()
{
this->cube_long_seq_dii (LARGE_LONG_SEQ_LENGTH);
}
void
-DII_Cubit_Client::cube_small_octet_seq (void)
+DII_Cubit_Client::cube_small_octet_seq ()
{
this->cube_octet_seq_dii (SMALL_OCTET_SEQ_LENGTH);
}
void
-DII_Cubit_Client::cube_large_octet_seq (void)
+DII_Cubit_Client::cube_large_octet_seq ()
{
this->cube_octet_seq_dii (LARGE_OCTET_SEQ_LENGTH);
}
void
-DII_Cubit_Client::cube_mixin (void)
+DII_Cubit_Client::cube_mixin ()
{
this->cube_short_dii ();
this->cube_octet_dii ();
@@ -723,7 +723,7 @@ DII_Cubit_Client::cube_mixin (void)
}
int
-DII_Cubit_Client::run (void)
+DII_Cubit_Client::run ()
{
// loop counter.
CORBA::ULong i;
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index c64c7a5b63a..68f35ad1147 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -208,7 +208,7 @@ Cubit_Client::read_ior (const ACE_TCHAR *filename)
// Parses the command line arguments and returns an error status.
int
-Cubit_Client::parse_args (void)
+Cubit_Client::parse_args ()
{
ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("b:t:z:ovdn:f:k:xsq"));
int c = 0;
@@ -383,7 +383,7 @@ Cubit_Client::check_enabled (u_int mask) const
// Exercise the union. Cube a union.
void
-Cubit_Client::cube_union (void)
+Cubit_Client::cube_union ()
{
try
{
@@ -1513,7 +1513,6 @@ Cubit_Client::run ()
for (i = 0; i < this->loop_count_; ++i)
{
this->cube_any_struct (i);
-
}
timer.stop ();
@@ -1563,7 +1562,7 @@ Cubit_Client::shutdown_server (int do_shutdown)
return 0;
}
-Cubit_Client::~Cubit_Client (void)
+Cubit_Client::~Cubit_Client ()
{
// Free resources and close the IOR files.
if (this->cubit_factory_ior_file_)
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
index 2ba154c271c..54bcff3eae4 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
@@ -43,7 +43,7 @@ public:
// = Constructor and destructor.
Cubit_Client (int shutdown = 0);
- ~Cubit_Client (void);
+ ~Cubit_Client ();
/// Execute client example code.
int run ();
@@ -61,7 +61,7 @@ private:
int read_ior (const ACE_TCHAR *filename);
/// Parses the arguments passed on the command line.
- int parse_args (void);
+ int parse_args ();
/// Obtain the bit mask representation of the specified test
u_int opt_to_mask (const ACE_TCHAR *opt);
@@ -80,7 +80,7 @@ private:
ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time);
/// Exercise the union. Cube a union.
- void cube_union (void);
+ void cube_union ();
/// calculate the cube from a struct.
void cube_struct (int i);
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
index b52869dc434..236066ddb28 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
@@ -3,7 +3,7 @@
#include "tao/debug.h"
#include "ace/OS_NS_stdio.h"
-Cubit_Server::Cubit_Server (void)
+Cubit_Server::Cubit_Server ()
: ior_output_file_ (0),
orb_manager_ (),
factory_impl_ (0),
@@ -14,7 +14,7 @@ Cubit_Server::Cubit_Server (void)
}
int
-Cubit_Server::parse_args (void)
+Cubit_Server::parse_args ()
{
ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("df:"));
int c;
@@ -100,7 +100,7 @@ Cubit_Server::init (int argc,
}
int
-Cubit_Server::run (void)
+Cubit_Server::run ()
{
if (this->orb_manager_.run () == -1)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -109,7 +109,7 @@ Cubit_Server::run (void)
return 0;
}
-Cubit_Server::~Cubit_Server (void)
+Cubit_Server::~Cubit_Server ()
{
delete this->factory_impl_;
}
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
index 8aa6e7ec341..eabf76a991c 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
@@ -39,21 +39,21 @@ class Cubit_Server
{
public:
/// Default constructor
- Cubit_Server (void);
+ Cubit_Server ();
/// Destructor
- ~Cubit_Server (void);
+ ~Cubit_Server ();
/// Initialize the Cubit_Server state - parsing arguments and ...
int init (int argc,
ACE_TCHAR **argv);
/// Run the orb
- int run (void);
+ int run ();
private:
/// Parses the commandline arguments.
- int parse_args (void);
+ int parse_args ();
/// File to output the cubit factory IOR.
FILE* ior_output_file_;
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
index 80f56b7c9f8..84176f01398 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
@@ -115,12 +115,12 @@ Cubit_Factory_i::Cubit_Factory_i (CORBA::ORB_ptr orb)
// Destructor
-Cubit_Factory_i::~Cubit_Factory_i (void)
+Cubit_Factory_i::~Cubit_Factory_i ()
{
}
Cubit_ptr
-Cubit_Factory_i::make_cubit (void)
+Cubit_Factory_i::make_cubit ()
{
return my_cubit_._this ();
}
@@ -140,12 +140,12 @@ Cubit_i::Cubit_i (CORBA::ORB_ptr orb)
// Destructor
-Cubit_i::~Cubit_i (void)
+Cubit_i::~Cubit_i ()
{
}
PortableServer::POA_ptr
-Cubit_i::_default_POA (void)
+Cubit_i::_default_POA ()
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
@@ -157,13 +157,13 @@ Cubit_i::set_default_poa (PortableServer::POA_ptr poa)
}
void
-Cubit_i::cube_oneway (void)
+Cubit_i::cube_oneway ()
{
ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ONEWAY_START);
}
void
-Cubit_i::cube_void (void)
+Cubit_i::cube_void ()
{
ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_VOID_START);
}
@@ -241,7 +241,6 @@ Cubit_i::cube_union (const Cubit::oneof &values)
temp.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o;
temp.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s;
temp.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l;
-
}
return temp;
}
@@ -408,7 +407,7 @@ Cubit_i::cube_any_struct (const CORBA::Any & any)
// Shutdown.
-void Cubit_i::shutdown (void)
+void Cubit_i::shutdown ()
{
ACE_DEBUG ((LM_DEBUG,
"%C\n",
@@ -419,7 +418,7 @@ void Cubit_i::shutdown (void)
void
-Cubit_i::ping (void)
+Cubit_i::ping ()
{
// do nothing
}
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
index 09a3d31852d..bf400140179 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
@@ -32,16 +32,16 @@ public:
Cubit_i (CORBA::ORB_ptr orb);
/// Destructor
- ~Cubit_i (void);
+ ~Cubit_i ();
/// Returns the default POA for this servant.
- virtual PortableServer::POA_ptr _default_POA (void);
+ virtual PortableServer::POA_ptr _default_POA ();
/// Test a oneway call.
- virtual void cube_oneway (void);
+ virtual void cube_oneway ();
/// Test a twoway call.
- virtual void cube_void (void);
+ virtual void cube_void ();
/// Cube an octet
virtual CORBA::Octet cube_octet (CORBA::Octet o);
@@ -81,11 +81,11 @@ public:
virtual CORBA::Any * cube_any_struct (const CORBA::Any & any);
/// Shutdown routine.
- virtual void shutdown (void);
+ virtual void shutdown ();
/// A ping. Please see the idl file for details.
- virtual void ping (void);
+ virtual void ping ();
/// Set default poa.
@@ -112,10 +112,10 @@ public:
Cubit_Factory_i (CORBA::ORB_ptr orb);
/// Destructor.
- ~Cubit_Factory_i (void);
+ ~Cubit_Factory_i ();
/// Make a cubit object.
- virtual Cubit_ptr make_cubit (void);
+ virtual Cubit_ptr make_cubit ();
void set_default_poa (PortableServer::POA_ptr poa);
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
index 6e0750d7838..b8be38daee3 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
@@ -4,7 +4,7 @@
#include "tao/TAO_Internal.h"
#include "ace/Barrier.h"
-Cubit_Task::Cubit_Task (void)
+Cubit_Task::Cubit_Task ()
{
// No-op.
}
@@ -26,7 +26,7 @@ Cubit_Task::Cubit_Task (const ACE_TCHAR *args,
}
int
-Cubit_Task::svc (void)
+Cubit_Task::svc ()
{
ACE_hthread_t thr_handle;
ACE_Thread::self (thr_handle);
@@ -97,7 +97,7 @@ Cubit_Task::svc (void)
}
int
-Cubit_Task::initialize_orb (void)
+Cubit_Task::initialize_orb ()
{
try
{
@@ -154,7 +154,7 @@ Cubit_Task::get_servant_ior (u_int index)
}
int
-Cubit_Task::create_servants (void)
+Cubit_Task::create_servants ()
{
try
{
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 72e6a106a17..a30ac90de96 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
@@ -48,14 +48,14 @@ public:
protected:
/// No-op constructor.
- Cubit_Task (void);
+ Cubit_Task ();
private:
/// Initialize the ORB, and POA.
- int initialize_orb (void);
+ int initialize_orb ();
/// Create the servants.
- int create_servants (void);
+ int create_servants ();
/// All cubit objects will have this as prefix to its key.
const char *key_;
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
index 2a7be3a0ac0..9c2afdb429c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
@@ -4,7 +4,7 @@
#include "ace/OS_NS_errno.h"
#include "ace/Null_Mutex.h"
-Globals::Globals (void)
+Globals::Globals ()
: thr_create_flags (0),
default_priority (0),
ior_file (0),
@@ -73,7 +73,7 @@ Globals::parse_args (int argc, ACE_TCHAR *argv[])
}
int
-Globals::sched_fifo_init (void)
+Globals::sched_fifo_init ()
{
#if defined (ACE_HAS_THREADS)
// Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
@@ -115,18 +115,18 @@ Globals::sched_fifo_init (void)
#endif /* ACE_HAS_THREADS */
}
-MT_Priority::MT_Priority (void)
+MT_Priority::MT_Priority ()
: num_priorities_ (0),
grain_ (0)
{
}
-MT_Priority::~MT_Priority (void)
+MT_Priority::~MT_Priority ()
{
}
ACE_Sched_Priority
-MT_Priority::get_high_priority (void)
+MT_Priority::get_high_priority ()
{
ACE_Sched_Priority high_priority;
@@ -208,13 +208,13 @@ MT_Priority::get_low_priority (u_int num_low_priority,
}
u_int
-MT_Priority::number_of_priorities (void)
+MT_Priority::number_of_priorities ()
{
return this->num_priorities_;
}
u_int
-MT_Priority::grain (void)
+MT_Priority::grain ()
{
return this->grain_;
}
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
index cf92ee54115..3f116926ccd 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
@@ -104,7 +104,7 @@ class Globals
{
public:
/// default constructor.
- Globals (void);
+ Globals ();
/// parse the arguments.
int parse_args (int argc, ACE_TCHAR **argv);
@@ -115,7 +115,7 @@ public:
* for other failure. As a side effect, sets thr_create_flags
* appropriately.
*/
- static int sched_fifo_init (void);
+ static int sched_fifo_init ();
/// Thread creation flags. Must call sched_fifo_init () before
/// accessing.
@@ -173,16 +173,15 @@ typedef ACE_Singleton<Globals,ACE_Null_Mutex> GLOBALS;
*/
class MT_Priority
{
-
public:
/// constructor.
- MT_Priority (void);
+ MT_Priority ();
/// Destructor.
- virtual ~MT_Priority (void);
+ virtual ~MT_Priority ();
/// Sets the priority of the high priority thread.
- virtual ACE_Sched_Priority get_high_priority (void);
+ virtual ACE_Sched_Priority get_high_priority ();
/// Sets the priority to be used for the low priority thread.
virtual ACE_Sched_Priority get_low_priority
@@ -191,10 +190,10 @@ public:
u_int use_multiple_priority);
/// Accessor for num_priorities_.
- u_int number_of_priorities (void);
+ u_int number_of_priorities ();
/// Accessor for grain_.
- u_int grain (void);
+ u_int grain ();
protected:
/// Number of priorities used.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
index 10da30b572c..27bf5ed9d23 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -17,7 +17,7 @@ ACE_round (ACE_timer_t t)
return static_cast<ACE_UINT32> (t);
}
-Task_State::Task_State (void)
+Task_State::Task_State ()
: barrier_ (0),
key_ ("Cubit"),
loop_count_ (1000),
@@ -230,7 +230,7 @@ Task_State::parse_args (int argc,ACE_TCHAR *argv[])
return 0;
}
-Task_State::~Task_State (void)
+Task_State::~Task_State ()
{
int i;
@@ -274,7 +274,7 @@ Client::Client (ACE_Thread_Manager *thread_manager,
{
}
-Client::~Client (void)
+Client::~Client ()
{
delete this->my_jitter_array_;
delete this->timer_;
@@ -305,14 +305,14 @@ Client::put_latency (JITTER_ARRAY *jitter,
// Returns the latency in usecs.
ACE_timer_t
-Client::get_high_priority_latency (void)
+Client::get_high_priority_latency ()
{
return (ACE_timer_t) this->ts_->latency_ [0];
}
// Returns the latency in usecs.
ACE_timer_t
-Client::get_low_priority_latency (void)
+Client::get_low_priority_latency ()
{
if (this->ts_->thread_count_ == 1)
return 0;
@@ -336,7 +336,7 @@ Client::get_latency (u_int thread_id)
// Returns the jitter in usecs.
ACE_timer_t
-Client::get_high_priority_jitter (void)
+Client::get_high_priority_jitter ()
{
ACE_timer_t jitter = 0.0;
ACE_timer_t average = get_high_priority_latency ();
@@ -367,7 +367,6 @@ Client::get_high_priority_jitter (void)
if (stats.sample (ACE_round (*latency)) == -1)
ACE_DEBUG ((LM_DEBUG, "Error: stats.sample returned -1\n"));
-
}
// Return the square root of the sum of the differences computed
@@ -385,7 +384,7 @@ Client::get_high_priority_jitter (void)
// Returns the jitter in usecs.
ACE_timer_t
-Client::get_low_priority_jitter (void)
+Client::get_low_priority_jitter ()
{
if (this->ts_->thread_count_ == 1)
return 0;
@@ -485,7 +484,7 @@ Client::get_jitter (u_int id)
}
void
-Client::find_frequency (void)
+Client::find_frequency ()
{
if (this->ts_->thread_per_rate_ == 0)
{
@@ -547,7 +546,7 @@ Client::find_frequency (void)
}
CORBA::ORB_ptr
-Client::init_orb (void)
+Client::init_orb ()
{
ACE_DEBUG ((LM_DEBUG,
"I'm thread %t\n"));
@@ -654,7 +653,7 @@ Client::get_cubit (CORBA::ORB_ptr orb)
}
int
-Client::svc (void)
+Client::svc ()
{
try
{
@@ -724,7 +723,7 @@ Client::svc (void)
}
int
-Client::cube_octet (void)
+Client::cube_octet ()
{
try
{
@@ -765,7 +764,7 @@ Client::cube_octet (void)
}
int
-Client::cube_short (void)
+Client::cube_short ()
{
try
{
@@ -798,7 +797,7 @@ Client::cube_short (void)
}
int
-Client::cube_long (void)
+Client::cube_long ()
{
try
{
@@ -831,7 +830,7 @@ Client::cube_long (void)
}
int
-Client::cube_struct (void)
+Client::cube_struct ()
{
try
{
@@ -870,7 +869,7 @@ Client::cube_struct (void)
}
int
-Client::make_request (void)
+Client::make_request ()
{
int result;
@@ -921,7 +920,7 @@ Client::make_request (void)
}
void
-Client::print_stats (void)
+Client::print_stats ()
{
// Perform latency stats only if we are not running the utilization
// tests.
@@ -979,7 +978,7 @@ Client::calc_delta (ACE_timer_t real_time,
}
int
-Client::do_test (void)
+Client::do_test ()
{
ACE_timer_t delta = 0;
u_int low_priority_client_count = this->ts_->thread_count_ - 1;
@@ -1066,7 +1065,7 @@ Client::do_test (void)
}
int
-Client::run_tests (void)
+Client::run_tests ()
{
int result;
ACE_NEW_RETURN (this->my_jitter_array_,
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 17f2d06f537..76e13e676d6 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
@@ -99,13 +99,13 @@ class Task_State
{
public:
/// Constructor.
- Task_State (void);
+ Task_State ();
/// parses the arguments with the provided argc and argv.
int parse_args (int argc,ACE_TCHAR **argv);
/// Destructor
- ~Task_State (void);
+ ~Task_State ();
/// Barrier for the multiple clients to synchronize after binding to
/// the servants.
@@ -249,24 +249,24 @@ public:
u_int id);
/// destructor.
- ~Client (void);
+ ~Client ();
/// The thread function.
virtual int svc ();
/// Returns the latency of the high priority thread in usecs.
- ACE_timer_t get_high_priority_latency (void);
+ ACE_timer_t get_high_priority_latency ();
/// Returns the average latency found for the low
/// priority threads in usecs.
- ACE_timer_t get_low_priority_latency (void);
+ ACE_timer_t get_low_priority_latency ();
/// Returns the high priority jitter in usecs.
- ACE_timer_t get_high_priority_jitter (void);
+ ACE_timer_t get_high_priority_jitter ();
/// Returns the jitter for all the low priority
/// thread request in usecs.
- ACE_timer_t get_low_priority_jitter (void);
+ ACE_timer_t get_low_priority_jitter ();
/// gets the average latency for that thread.
ACE_timer_t get_latency (u_int thread_id);
@@ -280,37 +280,37 @@ public:
private:
/// initialize the ORB.
- CORBA::ORB_ptr init_orb (void);
+ CORBA::ORB_ptr init_orb ();
/// reads the cubit ior from a file.
- void read_ior (void);
+ void read_ior ();
/// gets the cubit object.
int get_cubit (CORBA::ORB_ptr orb);
/// Run the various tests.
- int run_tests (void);
+ int run_tests ();
/// make a CORBA request depending on the datatype.
- int make_request (void);
+ int make_request ();
/// makes the corba requests.
- int do_test (void);
+ int do_test ();
/// call cube_octet method on the cubit object.
- int cube_octet (void);
+ int cube_octet ();
/// call cube short on the cubit object.
- int cube_short (void);
+ int cube_short ();
/// call cube long on the cubit object.
- int cube_long (void);
+ int cube_long ();
/// call cube struct on the cubit object.
- int cube_struct (void);
+ int cube_struct ();
/// prints the latency stats.
- void print_stats (void);
+ void print_stats ();
/// Records the latencies in the <Task_State>.
void put_latency (JITTER_ARRAY *jitter,
@@ -323,7 +323,7 @@ private:
/// determines the frequency at which to make calls depending on the
/// id of the thread.
- void find_frequency (void);
+ void find_frequency ();
/// calculate the delta value.
ACE_timer_t calc_delta (ACE_timer_t real_time,
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
index cbe8462a77f..2cfd6cb1774 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
@@ -7,20 +7,20 @@ MT_Cubit_Timer::MT_Cubit_Timer (u_int granularity)
}
void
-MT_Cubit_Timer::start (void)
+MT_Cubit_Timer::start ()
{
this->timer_.start ();
}
void
-MT_Cubit_Timer::stop (void)
+MT_Cubit_Timer::stop ()
{
this->timer_.stop ();
this->timer_.elapsed_time (this->delta_);
}
ACE_timer_t
-MT_Cubit_Timer::get_elapsed (void)
+MT_Cubit_Timer::get_elapsed ()
{
ACE_timer_t real_time;
// Store the time in usecs.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
index f84b7499f28..c467380dd64 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
@@ -32,10 +32,10 @@ class MT_Cubit_Timer
public:
MT_Cubit_Timer (u_int granularity);
- void start (void);
- void stop (void);
+ void start ();
+ void stop ();
- ACE_timer_t get_elapsed (void);
+ ACE_timer_t get_elapsed ();
private:
/// timer.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
index f7e1ae4fc4c..237040b451e 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
@@ -12,7 +12,7 @@ Util_Thread::Util_Thread (Task_State *ts,
}
int
-Util_Thread::svc (void)
+Util_Thread::svc ()
{
ACE_hthread_t thr_handle;
ACE_Thread::self (thr_handle);
@@ -47,7 +47,7 @@ Util_Thread::svc (void)
}
u_long
-Util_Thread::get_number_of_computations (void)
+Util_Thread::get_number_of_computations ()
{
return this->number_of_computations_;
}
@@ -56,7 +56,7 @@ Util_Thread::get_number_of_computations (void)
// separate function to get it's execution time.
void
-Util_Thread::computation (void)
+Util_Thread::computation ()
{
// This is the number that the Util_Thread uses to check for
// primality.
@@ -74,7 +74,7 @@ Util_Thread::computation (void)
// And you thought your life was boring... :-)
int
-Util_Thread::run_computations (void)
+Util_Thread::run_computations ()
{
while (this->done_ == 0)
{
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 e71393dd7a8..83d50f26cb8 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
@@ -32,17 +32,17 @@ public:
virtual int svc ();
/// Gets the number of computations the thread was able to perform.
- u_long get_number_of_computations (void);
+ u_long get_number_of_computations ();
/// this is the actual "computation" being performed.
- void computation (void);
+ void computation ();
/// Indicates whether we're done.
int done_;
private:
/// Run the computations.
- int run_computations (void);
+ int run_computations ();
/// This stores the number of computations performed
/// by the Util_Thread so far
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
index 3438baa7d6c..9beeba0cbbc 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
@@ -62,7 +62,7 @@ switchHook (WIND_TCB *pOldTcb, // pointer to old task's WIND_TCB.
// Constructor.
-Client_i::Client_i (void)
+Client_i::Client_i ()
: high_priority_client_ (0),
low_priority_client_ (0),
util_thread_ (0),
@@ -80,7 +80,7 @@ Client_i::Client_i (void)
// Destructor.
-Client_i::~Client_i (void)
+Client_i::~Client_i ()
{
delete this->high_priority_client_;
if (this->low_priority_client_ != 0)
@@ -130,7 +130,7 @@ Client_i::init (int argc, ACE_TCHAR *argv[])
}
void
-Client_i::run (void)
+Client_i::run ()
{
if (this->ts_->thread_per_rate_ == 0)
{
@@ -148,7 +148,7 @@ Client_i::run (void)
#if defined (ACE_HAS_VXTHREADS)
void
-Client_i::output_taskinfo (void)
+Client_i::output_taskinfo ()
{
FILE *file_handle = ACE_OS::fopen ("taskinfo.txt", "w");
@@ -175,7 +175,7 @@ Client_i::output_taskinfo (void)
#endif /* ACE_HAS_VXTHREADS */
void
-Client_i::get_context_switches (void)
+Client_i::get_context_switches ()
{
#if (defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)) && !defined (ACE_WIN32)
@@ -202,7 +202,7 @@ Client_i::get_context_switches (void)
}
void
-Client_i::output_latency (void)
+Client_i::output_latency ()
{
FILE *latency_file_handle = 0;
char latency_file[BUFSIZ];
@@ -260,7 +260,7 @@ Client_i::output_latency (void)
// when there are not enough different priorities for all threads.
void
-Client_i::init_low_priority (void)
+Client_i::init_low_priority ()
{
ACE_Sched_Priority prev_priority = this->high_priority_;
if (this->ts_->use_multiple_priority_ == 1)
@@ -280,7 +280,7 @@ Client_i::init_low_priority (void)
}
void
-Client_i::calc_util_time (void)
+Client_i::calc_util_time ()
{
MT_Cubit_Timer timer (ACE_ONE_SECOND_IN_MSECS);
// Time the utilization thread' "computation" to get % IdleCPU at the
@@ -298,7 +298,7 @@ Client_i::calc_util_time (void)
}
int
-Client_i::activate_high_client (void)
+Client_i::activate_high_client ()
{
ACE_NEW_RETURN (this->high_priority_client_,
Client (&this->client_thread_manager_,
@@ -345,7 +345,7 @@ Client_i::activate_high_client (void)
}
int
-Client_i::activate_low_client (void)
+Client_i::activate_low_client ()
{
ACE_NEW_RETURN (this->low_priority_client_,
Client *[this->ts_->thread_count_],
@@ -431,7 +431,7 @@ Client_i::activate_low_client (void)
}
int
-Client_i::activate_util_thread (void)
+Client_i::activate_util_thread ()
{
ACE_NEW_RETURN (this->util_thread_,
Util_Thread (this->ts_,
@@ -467,7 +467,7 @@ Client_i::activate_util_thread (void)
}
void
-Client_i:: print_context_stats (void)
+Client_i:: print_context_stats ()
{
if (this->ts_->context_switch_test_ == 1)
{
@@ -503,7 +503,7 @@ Client_i:: print_context_stats (void)
}
void
-Client_i::print_latency_stats (void)
+Client_i::print_latency_stats ()
{
// If running the utilization test, don't report latency nor jitter.
if (this->ts_->use_utilization_test_ == 0)
@@ -535,7 +535,7 @@ Client_i::print_latency_stats (void)
}
void
-Client_i::print_util_stats (void)
+Client_i::print_util_stats ()
{
if (this->ts_->use_utilization_test_ == 1)
{
@@ -555,7 +555,7 @@ Client_i::print_util_stats (void)
}
void
-Client_i::print_priority_inversion_stats (void)
+Client_i::print_priority_inversion_stats ()
{
this->print_context_stats ();
this->print_latency_stats ();
@@ -563,7 +563,7 @@ Client_i::print_priority_inversion_stats (void)
}
int
-Client_i::start_servant (void)
+Client_i::start_servant ()
{
ACE_TCHAR high_thread_args[BUFSIZ];
@@ -614,7 +614,7 @@ Client_i::start_servant (void)
}
int
-Client_i::do_priority_inversion_test (void)
+Client_i::do_priority_inversion_test ()
{
this->timer_.start ();
#if defined (ACE_HAS_VXTHREADS)
@@ -695,7 +695,7 @@ Client_i::do_priority_inversion_test (void)
}
int
-Client_i::do_thread_per_rate_test (void)
+Client_i::do_thread_per_rate_test ()
{
Client CB_20Hz_client (&this->client_thread_manager_,
this->ts_,
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h
index 803bf32ee8c..2f98eb697ee 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h
@@ -29,7 +29,7 @@
#if defined (VME_DRIVER)
#include <hostLib.h>
-extern "C" STATUS vmeDrv (void);
+extern "C" STATUS vmeDrv ();
extern "C" STATUS vmeDevCreate (char *);
#endif /* defined (VME_DRIVER) */
@@ -42,65 +42,65 @@ class Client_i : public virtual MT_Priority
{
public:
///constructor.
- Client_i (void);
+ Client_i ();
/// destructor.
- virtual ~Client_i (void);
+ virtual ~Client_i ();
/// Initialize the state of <Client_i>.
int init (int argc, ACE_TCHAR *argv[]);
/// Run the tests.
- void run (void);
+ void run ();
/// Performs the priority inversion test.
- int do_priority_inversion_test (void);
+ int do_priority_inversion_test ();
/// Performs the test with 4 threads each sending requests at rates
/// of 20, 10, 5, and 1Hz.
- int do_thread_per_rate_test (void);
+ int do_thread_per_rate_test ();
/// Starts the client utilization thread.
- int start_servant (void);
+ int start_servant ();
/// output the latency results for the requests.
- void output_latency (void);
+ void output_latency ();
#if defined (VXWORKS)
/// Outputs the details of this task to a file taskinfo.txt.
- void output_taskinfo (void);
+ void output_taskinfo ();
#endif /* VXWORKS */
private:
/// Sets the priority to be used for the low priority clients.
- void init_low_priority (void);
+ void init_low_priority ();
/// Calculate the time for one util computation.
- void calc_util_time (void);
+ void calc_util_time ();
/// Activates the high priority client.
- int activate_high_client (void);
+ int activate_high_client ();
/// Activates the low priority client.
- int activate_low_client (void);
+ int activate_low_client ();
/// Activates the utilization thread.
- int activate_util_thread (void);
+ int activate_util_thread ();
/// Prints the results of the tests.
- void print_priority_inversion_stats (void);
+ void print_priority_inversion_stats ();
/// Prints the context switch results.
- void print_context_stats (void);
+ void print_context_stats ();
/// Prints the utilization test results.
- void print_util_stats (void);
+ void print_util_stats ();
/// Prints the latency and jitter results.
- void print_latency_stats (void);
+ void print_latency_stats ();
/// gets the number of context switches.
- void get_context_switches (void);
+ void get_context_switches ();
/// Pointer to the high priority client object.
Client *high_priority_client_;
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
index 1359acd6f0b..058233d853a 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
@@ -9,7 +9,7 @@ Cubit_i::Cubit_i (CORBA::ORB_ptr orb,
{
}
-Cubit_i::~Cubit_i (void)
+Cubit_i::~Cubit_i ()
{
}
@@ -44,12 +44,12 @@ Cubit_i::cube_struct (const Cubit::Many &values)
}
void
-Cubit_i::noop (void)
+Cubit_i::noop ()
{
// does nothing.
}
-void Cubit_i::shutdown (void)
+void Cubit_i::shutdown ()
{
ACE_DEBUG ((LM_DEBUG,
"(%t) Calling orb ()->shutdown ()\n"));
@@ -57,7 +57,7 @@ void Cubit_i::shutdown (void)
}
PortableServer::POA_ptr
-Cubit_i::_default_POA (void)
+Cubit_i::_default_POA ()
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
index 7aa2c1ca806..561d3fcbefd 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
@@ -26,7 +26,7 @@ class Cubit_i : public POA_Cubit
public:
Cubit_i (CORBA::ORB_ptr orb,
PortableServer::POA_ptr poa);
- ~Cubit_i (void);
+ ~Cubit_i ();
virtual CORBA::Octet cube_octet (CORBA::Octet o);
@@ -36,13 +36,13 @@ public:
virtual Cubit::Many cube_struct (const Cubit::Many &values);
- virtual void noop (void);
+ virtual void noop ();
- virtual void shutdown (void);
+ virtual void shutdown ();
/// The default POA
virtual PortableServer::POA_ptr
- _default_POA (void);
+ _default_POA ();
protected:
/// Keep a pointer to the ORB so we can shut it down.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
index 5651bbfe937..8d4dbe3b5aa 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -32,7 +32,7 @@
# include "quantify.h"
#endif /* ACE_HAS_QUANTIFY */
-Server::Server (void)
+Server::Server ()
:argc_ (0),
argv_ (0),
cubits_ (0),
@@ -64,7 +64,7 @@ Server::init (int argc, ACE_TCHAR **argv)
}
int
-Server::run (void)
+Server::run ()
{
STOP_QUANTIFY;
CLEAR_QUANTIFY;
@@ -83,7 +83,7 @@ Server::run (void)
}
void
-Server::prelim_args_process (void)
+Server::prelim_args_process ()
{
int i;
@@ -97,7 +97,7 @@ Server::prelim_args_process (void)
}
void
-Server::init_low_priority (void)
+Server::init_low_priority ()
{
ACE_Sched_Priority prev_priority = this->high_priority_;
@@ -122,7 +122,7 @@ Server::init_low_priority (void)
// Write the ior's to a file so the client can read them.
int
-Server::write_iors (void)
+Server::write_iors ()
{
u_int j;
@@ -168,7 +168,7 @@ Server::write_iors (void)
}
int
-Server::activate_high_servant (void)
+Server::activate_high_servant ()
{
ACE_TCHAR orbendpoint[BUFSIZ];
@@ -220,7 +220,7 @@ Server::activate_high_servant (void)
}
int
-Server::activate_low_servants (void)
+Server::activate_low_servants ()
{
if (static_cast<int> (this->num_low_priority_) > 0)
{
@@ -323,7 +323,7 @@ Server::activate_low_servants (void)
}
int
-Server::start_servants (void)
+Server::start_servants ()
{
// Do the preliminary argument processing for options -p and -h.
this->prelim_args_process ();
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
index 7effcbdfd9e..5ec5040b098 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
@@ -43,7 +43,7 @@
#if defined (VME_DRIVER)
#include <hostLib.h>
-extern "C" STATUS vmeDrv (void);
+extern "C" STATUS vmeDrv ();
extern "C" STATUS vmeDevCreate (char *);
#endif /* VME_DRIVER */
@@ -60,32 +60,32 @@ class Server
{
public:
/// Default constructor.
- Server (void);
+ Server ();
/// Initialize the server state.
int init (int argc, ACE_TCHAR **argv);
/// Run method.
- int run (void);
+ int run ();
private:
/// Start the high and low priority servants.
- int start_servants (void);
+ int start_servants ();
/// Preliminary argument processing code.
- void prelim_args_process (void);
+ void prelim_args_process ();
/// sets the priority to be used for the low priority servants.
- void init_low_priority (void);
+ void init_low_priority ();
/// Writes the iors of the servants to a file
- int write_iors (void);
+ int write_iors ();
/// Activates the high priority servant.
- int activate_high_servant (void);
+ int activate_high_servant ();
/// Activates the low priority servants.
- int activate_low_servants (void);
+ int activate_low_servants ();
/// Number of arguments for the servant.
int argc_;
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip.cpp b/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
index dcd4de0db31..290d5dd0326 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
@@ -12,7 +12,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
}
void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
{
this->orb_->shutdown (false);
}
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip.h b/TAO/performance-tests/Latency/AMI/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip.h
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip.h
@@ -21,7 +21,7 @@ public:
// = The skeleton methods
virtual Test::Timestamp test_method (Test::Timestamp send_time);
- virtual void shutdown (void);
+ virtual void shutdown ();
private:
/// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
index a7b12e089c8..b09c855071e 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
@@ -43,7 +43,7 @@ Roundtrip_Handler::test_method_excep (::Messaging::ExceptionHolder *holder)
}
void
-Roundtrip_Handler::shutdown (void)
+Roundtrip_Handler::shutdown ()
{
}
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
index b7f3332e45a..40891eaa46e 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
@@ -24,7 +24,7 @@ public:
virtual void test_method (Test::Timestamp send_time);
virtual void test_method_excep (::Messaging::ExceptionHolder *holder);
- virtual void shutdown (void);
+ virtual void shutdown ();
virtual void shutdown_excep (::Messaging::ExceptionHolder *holder);
private:
diff --git a/TAO/performance-tests/Latency/AMI/Server_Task.cpp b/TAO/performance-tests/Latency/AMI/Server_Task.cpp
index 2431feb42a7..51288cdde31 100644
--- a/TAO/performance-tests/Latency/AMI/Server_Task.cpp
+++ b/TAO/performance-tests/Latency/AMI/Server_Task.cpp
@@ -6,7 +6,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb)
}
int
-Server_Task::svc (void)
+Server_Task::svc ()
{
try
{
diff --git a/TAO/performance-tests/Latency/AMI/client.cpp b/TAO/performance-tests/Latency/AMI/client.cpp
index adefa42bb66..fffeb23c96d 100644
--- a/TAO/performance-tests/Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Latency/AMI/client.cpp
@@ -129,7 +129,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ACE_OS::gethrtime ());
if (orb->work_pending ())
orb->perform_work ();
-
}
ACE_Time_Value tv (0, 2000);
diff --git a/TAO/performance-tests/Latency/Collocation/Client_Task.cpp b/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
index 0667989e650..c1a307c708d 100644
--- a/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
@@ -17,7 +17,7 @@ Client_Task::Client_Task (Test::Roundtrip_ptr reference,
}
int
-Client_Task::svc (void)
+Client_Task::svc ()
{
try
{
@@ -77,5 +77,4 @@ Client_Task::svc (void)
}
return 0;
-
}
diff --git a/TAO/performance-tests/Latency/Collocation/Client_Task.h b/TAO/performance-tests/Latency/Collocation/Client_Task.h
index ab015903554..23e9d4cbe33 100644
--- a/TAO/performance-tests/Latency/Collocation/Client_Task.h
+++ b/TAO/performance-tests/Latency/Collocation/Client_Task.h
@@ -15,20 +15,17 @@
class Client_Task : public ACE_Task_Base
{
public:
-
/// Constructor
Client_Task (Test::Roundtrip_ptr reference,
int iterations,
ACE_Thread_Manager *thr_mgr);
/// Thread entry point
- int svc (void);
+ int svc ();
private:
-
const int niterations;
Test::Roundtrip_var remote_ref_;
-
};
#include /**/ "ace/post.h"
diff --git a/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp b/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp
index 6382128d071..73c68ef3284 100644
--- a/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp
@@ -13,7 +13,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
}
void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
{
this->orb_->shutdown (false);
}
diff --git a/TAO/performance-tests/Latency/Collocation/Roundtrip.h b/TAO/performance-tests/Latency/Collocation/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/Collocation/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Collocation/Roundtrip.h
@@ -21,7 +21,7 @@ public:
// = The skeleton methods
virtual Test::Timestamp test_method (Test::Timestamp send_time);
- virtual void shutdown (void);
+ virtual void shutdown ();
private:
/// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/Collocation/Server_Task.cpp b/TAO/performance-tests/Latency/Collocation/Server_Task.cpp
index 4ab05dd7b3b..2f40fe495b7 100644
--- a/TAO/performance-tests/Latency/Collocation/Server_Task.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Server_Task.cpp
@@ -18,7 +18,7 @@ Server_Task::get_reference ()
}
int
-Server_Task::svc (void)
+Server_Task::svc ()
{
try
{
diff --git a/TAO/performance-tests/Latency/Collocation/Server_Task.h b/TAO/performance-tests/Latency/Collocation/Server_Task.h
index 0fa23d8b529..86c8428ce3b 100644
--- a/TAO/performance-tests/Latency/Collocation/Server_Task.h
+++ b/TAO/performance-tests/Latency/Collocation/Server_Task.h
@@ -29,7 +29,6 @@ public:
Test::Roundtrip * get_reference ();
private:
-
ACE_Manual_Event &cond_;
/// Manual event to wake up the main thread to create a client
/// thread.
diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.cpp b/TAO/performance-tests/Latency/DII/Roundtrip.cpp
index dcd4de0db31..290d5dd0326 100644
--- a/TAO/performance-tests/Latency/DII/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/DII/Roundtrip.cpp
@@ -12,7 +12,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
}
void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
{
this->orb_->shutdown (false);
}
diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.h b/TAO/performance-tests/Latency/DII/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/DII/Roundtrip.h
+++ b/TAO/performance-tests/Latency/DII/Roundtrip.h
@@ -21,7 +21,7 @@ public:
// = The skeleton methods
virtual Test::Timestamp test_method (Test::Timestamp send_time);
- virtual void shutdown (void);
+ virtual void shutdown ();
private:
/// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp
index 2273992983e..918af48016c 100644
--- a/TAO/performance-tests/Latency/DII/client.cpp
+++ b/TAO/performance-tests/Latency/DII/client.cpp
@@ -158,7 +158,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
object->_request ("shutdown");
request->invoke ();
-
}
}
catch (const CORBA::Exception& ex)
diff --git a/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp b/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
index dcd4de0db31..290d5dd0326 100644
--- a/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
@@ -12,7 +12,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
}
void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
{
this->orb_->shutdown (false);
}
diff --git a/TAO/performance-tests/Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Latency/Deferred/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/Deferred/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.h
@@ -21,7 +21,7 @@ public:
// = The skeleton methods
virtual Test::Timestamp test_method (Test::Timestamp send_time);
- virtual void shutdown (void);
+ virtual void shutdown ();
private:
/// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
index dcd4de0db31..290d5dd0326 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
@@ -12,7 +12,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
}
void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
{
this->orb_->shutdown (false);
}
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
@@ -21,7 +21,7 @@ public:
// = The skeleton methods
virtual Test::Timestamp test_method (Test::Timestamp send_time);
- virtual void shutdown (void);
+ virtual void shutdown ();
private:
/// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
index b3168d869ec..9c766855f4c 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
@@ -9,7 +9,7 @@ Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
}
int
-Client_Task::svc (void)
+Client_Task::svc ()
{
try
{
@@ -43,7 +43,7 @@ Client_Task::accumulate_and_dump (
}
void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
{
CORBA::ULongLong dummy = 0;
for (int i = 0; i != 100; ++i)
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 5848a4a8771..5ffe18e12ac 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
@@ -26,7 +26,7 @@ public:
private:
/// Make sure that the current thread has a connection available.
- void validate_connection (void);
+ void validate_connection ();
private:
/// The object reference used for this test
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
index dcd4de0db31..290d5dd0326 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
@@ -12,7 +12,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
}
void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
{
this->orb_->shutdown (false);
}
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
@@ -21,7 +21,7 @@ public:
// = The skeleton methods
virtual Test::Timestamp test_method (Test::Timestamp send_time);
- virtual void shutdown (void);
+ virtual void shutdown ();
private:
/// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
index b3168d869ec..9c766855f4c 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
@@ -9,7 +9,7 @@ Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
}
int
-Client_Task::svc (void)
+Client_Task::svc ()
{
try
{
@@ -43,7 +43,7 @@ Client_Task::accumulate_and_dump (
}
void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
{
CORBA::ULongLong dummy = 0;
for (int i = 0; i != 100; ++i)
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
index 5848a4a8771..5ffe18e12ac 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
+++ b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
@@ -26,7 +26,7 @@ public:
private:
/// Make sure that the current thread has a connection available.
- void validate_connection (void);
+ void validate_connection ();
private:
/// The object reference used for this test
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
index dcd4de0db31..290d5dd0326 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
@@ -12,7 +12,7 @@ Roundtrip::test_method (Test::Timestamp send_time)
}
void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
{
this->orb_->shutdown (false);
}
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
index 25b26d1f4cd..9884f4478d6 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
@@ -21,7 +21,7 @@ public:
// = The skeleton methods
virtual Test::Timestamp test_method (Test::Timestamp send_time);
- virtual void shutdown (void);
+ virtual void shutdown ();
private:
/// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp b/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
index 38ef68443e6..1aa09af027f 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
@@ -6,7 +6,7 @@ Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb)
}
int
-Worker_Thread::svc (void)
+Worker_Thread::svc ()
{
try
{
diff --git a/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp b/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
index cefeecab98f..2b15d910c2f 100644
--- a/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
+++ b/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
@@ -23,7 +23,7 @@ Memory_Growth::send_objref (const Test::PayLoad & /*p*/
}
void
-Memory_Growth::shutdown (void)
+Memory_Growth::shutdown ()
{
this->orb_->shutdown (false);
}
diff --git a/TAO/performance-tests/Memory/IORsize/Memory_Growth.h b/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
index 4c2f7924601..5a91cbc158d 100644
--- a/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
+++ b/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
@@ -20,7 +20,7 @@ public:
// = The skeleton methods
virtual void send_objref (const Test::PayLoad &p);
- virtual void shutdown (void);
+ virtual void shutdown ();
private:
/// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
index a3658526edd..4ddc0c94992 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
+++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
@@ -6,13 +6,13 @@ Memory_Growth::Memory_Growth (CORBA::ORB_ptr orb)
}
void
-Memory_Growth::ping (void)
+Memory_Growth::ping ()
{
return;
}
void
-Memory_Growth::shutdown (void)
+Memory_Growth::shutdown ()
{
this->orb_->shutdown (false);
}
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
index 5da0a251fe1..3753dfbcaf1 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
+++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
@@ -19,9 +19,9 @@ public:
Memory_Growth (CORBA::ORB_ptr orb);
// = The skeleton methods
- virtual void ping (void);
+ virtual void ping ();
- virtual void shutdown (void);
+ virtual void shutdown ();
private:
/// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
index 954962e5c3a..2914991822a 100644
--- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
+++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
@@ -46,7 +46,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
}
void
-set_rt_scheduling (void)
+set_rt_scheduling ()
{
int priority =
(ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/POA/Demux/client.cpp b/TAO/performance-tests/POA/Demux/client.cpp
index afb4acfe869..b9279fe1b51 100644
--- a/TAO/performance-tests/POA/Demux/client.cpp
+++ b/TAO/performance-tests/POA/Demux/client.cpp
@@ -14,7 +14,6 @@
int
ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
-
// Set TAO_debug_level to 0 to ensure silent running unless
// debugging is explicitly invoked
TAO_debug_level = 0;
@@ -41,5 +40,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
}
return 0;
-
}
diff --git a/TAO/performance-tests/POA/Demux/demux_stats.cpp b/TAO/performance-tests/POA/Demux/demux_stats.cpp
index 2cea585ce4c..9df67df4938 100644
--- a/TAO/performance-tests/POA/Demux/demux_stats.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_stats.cpp
@@ -14,13 +14,11 @@
class Demux_Stats
{
-
public:
-
/// Calculates the average latency and Standard deviation.
/// Expects the input data in my_results.dat.
int
- calculate_avg_latency (void);
+ calculate_avg_latency ();
/// parses args.
int
@@ -39,7 +37,6 @@ private :
int
Demux_Stats::parse_args (int argc_, char * argv_ [])
{
-
ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("i:"));
int c;
@@ -59,7 +56,6 @@ Demux_Stats::parse_args (int argc_, char * argv_ [])
int
Demux_Stats::calculate_avg_latency ()
{
-
CORBA::ULong i, time;
char str1[50], str2[50], str3[50];
@@ -98,7 +94,6 @@ Demux_Stats::calculate_avg_latency ()
while (fscanf (this->result_fp_, "%s %s %s %ld %ld", &str1, &str2, &str3, &i, &time) != EOF)
{
-
if(ACE_OS::strcmp (str1,"POA::locate_poa_i")==0 && (ACE_OS::strcmp (str3,"end") == 0))
{
if (items < 1) { items = items + 1; counter++; }
@@ -317,7 +312,6 @@ Demux_Stats::calculate_avg_latency ()
if (iterations == 0)
{
-
ACE_OS::printf("Average response times = POA = %lf SERVANT = %lf DISPATCH = %lf PERFECT = %lf DYNAMIC = %lf BINARY = %lf LINEAR = %lf PARSE = %lf microsec\n", mean_poa, mean_servant,
mean_dispatch,
mean_perfect,
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
index 5d4a632fc5a..f76ede02eed 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
@@ -14,7 +14,7 @@
#include "ace/OS_NS_string.h"
// Constructor
-Demux_Test_Client::Demux_Test_Client (void)
+Demux_Test_Client::Demux_Test_Client ()
: argc_ (0),
argv_ (0),
is_ (Demux_Test_Client::LINEAR),
@@ -31,7 +31,7 @@ Demux_Test_Client::Demux_Test_Client (void)
}
// destructor
-Demux_Test_Client::~Demux_Test_Client (void)
+Demux_Test_Client::~Demux_Test_Client ()
{
}
@@ -118,14 +118,12 @@ Demux_Test_Client::init (int argc, ACE_TCHAR *argv [])
// success
return 0;
-
}
// parse command line arguments (if any).
int
-Demux_Test_Client::parse_args (void)
+Demux_Test_Client::parse_args ()
{
-
ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("df:m:n:o:p:i:s:"));
int c;
@@ -236,7 +234,7 @@ Demux_Test_Client::parse_args (void)
// The main program for Demux_Test
int
-Demux_Test_Client::run (void)
+Demux_Test_Client::run ()
{
// open a temporary results file
if ((this->result_fp_ = ACE_OS::fopen ("results.dat", "w")) == 0)
@@ -303,7 +301,7 @@ Demux_Test_Client::run (void)
}
int
-Demux_Test_Client::run_linear_test (void)
+Demux_Test_Client::run_linear_test ()
{
CORBA::ULong j, k, l, m;
ACE_hrtime_t start, end;
@@ -329,7 +327,7 @@ Demux_Test_Client::run_linear_test (void)
}
int
-Demux_Test_Client::run_random_test (void)
+Demux_Test_Client::run_random_test ()
{
ACE_DEBUG ((LM_DEBUG,
"ERROR : Random test\n"));
@@ -337,7 +335,7 @@ Demux_Test_Client::run_random_test (void)
}
int
-Demux_Test_Client::run_best_test (void)
+Demux_Test_Client::run_best_test ()
{
ACE_DEBUG ((LM_DEBUG,
"ERROR : Best Test\n"));
@@ -345,7 +343,7 @@ Demux_Test_Client::run_best_test (void)
}
int
-Demux_Test_Client::run_worst_test (void)
+Demux_Test_Client::run_worst_test ()
{
ACE_DEBUG ((LM_DEBUG,
"ERROR : Worst test\n"));
@@ -353,7 +351,7 @@ Demux_Test_Client::run_worst_test (void)
}
int
-Demux_Test_Client::print_results (void)
+Demux_Test_Client::print_results ()
{
ACE_DEBUG ((LM_DEBUG,
"******** "));
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.h b/TAO/performance-tests/POA/Demux/demux_test_client.h
index 8612a173f20..17ec654b5df 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.h
@@ -23,7 +23,6 @@
class Demux_Test_Client
{
public:
-
// Request invocation strategies
enum INVOKE_STRATEGY
{
@@ -41,39 +40,38 @@ public:
};
/// CTOR
- Demux_Test_Client (void);
+ Demux_Test_Client ();
/// DTOR
- ~Demux_Test_Client (void);
+ ~Demux_Test_Client ();
/// initialize the client test bed
int init (int argc, ACE_TCHAR *argv []);
/// run the tests
- int run (void);
+ int run ();
private:
-
/// parse command line arguments
- int parse_args (void);
+ int parse_args ();
/// initialize the operation database
- int init_operation_db (void);
+ int init_operation_db ();
/// run linear strategy
- int run_linear_test (void);
+ int run_linear_test ();
/// run random strategy
- int run_random_test (void);
+ int run_random_test ();
/// run best strategy (w.r.t to linear)
- int run_best_test (void);
+ int run_best_test ();
/// run worst strategy (w.r.t to linear)
- int run_worst_test (void);
+ int run_worst_test ();
/// print results
- int print_results (void);
+ int print_results ();
/// number of command line arguments
int argc_;
@@ -119,7 +117,6 @@ private:
/// database of operations
Operation_DB_Entry op_db_[TAO_DEMUX_TEST_MAX_OPS];
-
};
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.inl b/TAO/performance-tests/POA/Demux/demux_test_client.inl
index 9b2d1111852..184cba77413 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.inl
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.inl
@@ -10,7 +10,7 @@ static void shutdown (Demux_Test_ptr objref)
}
//FUZZ: enable check_for_lack_ACE_OS
-int Demux_Test_Client::init_operation_db (void)
+int Demux_Test_Client::init_operation_db ()
{
this->op_db_[0].op_ = M302;
this->op_db_[1].op_ = shutdown;
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.cpp b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
index eb44ad3b68a..114c236a6bf 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_i.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
@@ -4,18 +4,18 @@
#include "tao/ORB_Core.h"
// ctor
-Demux_Test_i::Demux_Test_i (void)
+Demux_Test_i::Demux_Test_i ()
{}
// dtor
-Demux_Test_i::~Demux_Test_i (void)
+Demux_Test_i::~Demux_Test_i ()
{}
-void Demux_Test_i::M302 (void)
+void Demux_Test_i::M302 ()
{
}
-void Demux_Test_i::shutdown (void)
+void Demux_Test_i::shutdown ()
{
TAO_ORB_Core_instance ()->orb ()->shutdown ();
}
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.h b/TAO/performance-tests/POA/Demux/demux_test_i.h
index 505e86ef220..d2f80bb455f 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_i.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_i.h
@@ -8,8 +8,7 @@
class Demux_Test_i : public POA_Demux_Test
{
public:
-
- Demux_Test_i (void);
+ Demux_Test_i ();
//ctor.
Demux_Test_i (PortableServer::POA_ptr poa)
@@ -18,7 +17,7 @@ public:
};
// ctor
- ~Demux_Test_i (void);
+ ~Demux_Test_i ();
// dtor
// Return the Default POA of this Servant
@@ -27,14 +26,13 @@ public:
return PortableServer::POA::_duplicate (this->poa_.in ());
};
- virtual void M302 (void);
+ virtual void M302 ();
- virtual void shutdown (void);
+ virtual void shutdown ();
private:
PortableServer::POA_var poa_;
// Implement a different _default_POA()
-
};
#endif /* TAO_DEMUX_TEST_I_H */
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
index 7f8ee4a8c99..b05872f9bb6 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
@@ -13,7 +13,7 @@
#include "ace/OS_NS_string.h"
// Constructor
-Demux_Test_Server::Demux_Test_Server (void)
+Demux_Test_Server::Demux_Test_Server ()
: argc_ (0),
argv_ (0),
num_POAs_ (1),
@@ -27,7 +27,7 @@ Demux_Test_Server::Demux_Test_Server (void)
}
// destructor
-Demux_Test_Server::~Demux_Test_Server (void)
+Demux_Test_Server::~Demux_Test_Server ()
{
ACE_OS::fclose (this->poa_fp_);
}
@@ -84,7 +84,6 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv [])
// grab the POA Manager
try
{
-
this->poa_mgr_ =
this->root_poa_->the_POAManager ();
}
@@ -285,7 +284,6 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv [])
ACE_OS::fprintf (this->ior_fp_, "%s\n", ior.in ());
-
}
catch (const CORBA::Exception& ex)
{
@@ -298,7 +296,6 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv [])
} // j loop
prev_poa = this->child_poa_[i].in ();
-
} // i loop
ACE_OS::fclose (this->ior_fp_);
@@ -310,7 +307,6 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv [])
try
{
this->poa_mgr_->activate ();
-
}
catch (const CORBA::Exception& ex)
{
@@ -320,14 +316,12 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv [])
// success
return 0;
-
}
// parse command line arguments (if any).
int
-Demux_Test_Server::parse_args (void)
+Demux_Test_Server::parse_args ()
{
-
ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("df:o:p:ut"));
int c;
@@ -399,7 +393,7 @@ Demux_Test_Server::parse_args (void)
// grab a reference to the naming service so that we can register with it.
int
-Demux_Test_Server::init_naming_service (void)
+Demux_Test_Server::init_naming_service ()
{
// Initialize the naming services
if (this->my_name_client_.init (this->orb_.in ()) == -1)
@@ -414,7 +408,7 @@ Demux_Test_Server::init_naming_service (void)
// The main program for Demux_Test
int
-Demux_Test_Server::run (void)
+Demux_Test_Server::run ()
{
try
{
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.h b/TAO/performance-tests/POA/Demux/demux_test_server.h
index 8fbf653f604..b27a3e87a2b 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.h
@@ -28,27 +28,26 @@ class Demux_Test_Server
{
public:
/// ctor
- Demux_Test_Server (void);
+ Demux_Test_Server ();
/// dtor
- ~Demux_Test_Server (void);
+ ~Demux_Test_Server ();
/// Execute client code.
- int run (void);
+ int run ();
/// Initialize the communication endpoint with server.
int init (int argc, ACE_TCHAR **argv);
/// Calculates the statistics by reading different data values from results.dat.
- int calculate_avg_latency (void);
+ int calculate_avg_latency ();
private:
-
/// parse command line arguments (if any)
- int parse_args (void);
+ int parse_args ();
/// initialize the naming service
- int init_naming_service (void);
+ int init_naming_service ();
/// # of arguments on the command line.
int argc_;
@@ -97,7 +96,6 @@ private:
/// Use the Transient POAs for servant activation as opposed
/// to persistent POAs.
int use_transient_poas_;
-
};
diff --git a/TAO/performance-tests/POA/Demux/write_names.cpp b/TAO/performance-tests/POA/Demux/write_names.cpp
index 73002c74770..dd00816e9f8 100644
--- a/TAO/performance-tests/POA/Demux/write_names.cpp
+++ b/TAO/performance-tests/POA/Demux/write_names.cpp
@@ -3,7 +3,6 @@
int
ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
-
for(int i=0; i<1000; i++)
ACE_OS::printf ("%09d\n",i);
}
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
index 3158372ce64..e6a1f4ab3b4 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
@@ -7,7 +7,7 @@ Factory::Factory (CORBA::ORB_ptr orb)
}
Test::Simple_ptr
-Factory::create_simple_object (void)
+Factory::create_simple_object ()
{
Simple *simple_impl;
ACE_NEW_THROW_EX (simple_impl,
@@ -20,7 +20,7 @@ Factory::create_simple_object (void)
}
void
-Factory::shutdown (void)
+Factory::shutdown ()
{
this->orb_->shutdown (false);
}
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.h b/TAO/performance-tests/POA/Implicit_Activation/Factory.h
index 73624c14b7e..9e50fbf7d93 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Factory.h
+++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.h
@@ -20,9 +20,9 @@ public:
// = The skeleton methods
- virtual Test::Simple_ptr create_simple_object (void);
+ virtual Test::Simple_ptr create_simple_object ();
- virtual void shutdown (void);
+ virtual void shutdown ();
private:
/// Keep a reference to the ORB
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp b/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
index e3b8caf8e37..8bcaab684a2 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
@@ -1,11 +1,11 @@
#include "Simple.h"
-Simple::Simple (void)
+Simple::Simple ()
{
}
void
-Simple::destroy (void)
+Simple::destroy ()
{
PortableServer::POA_var poa = this->_default_POA ();
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.h b/TAO/performance-tests/POA/Implicit_Activation/Simple.h
index 3279cb2ae10..5a234c4b6e9 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Simple.h
+++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.h
@@ -16,11 +16,11 @@ class Simple
{
public:
/// Constructor
- Simple (void);
+ Simple ();
// = The skeleton methods
- virtual void destroy (void);
+ virtual void destroy ();
};
#if defined(_MSC_VER)
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
index b59b62d15c8..135955a3138 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
@@ -207,7 +207,7 @@ public:
}
}
- ~stats (void)
+ ~stats ()
{
if (this->quantify_)
{
@@ -327,7 +327,6 @@ child_poa_testing (PortableServer::POA_ptr root_poa)
int
ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
-
try
{
// Initialize the ORB first.
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
index 4cf2427b933..784745f6ab9 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
@@ -103,7 +103,7 @@ PP_Test_Client::read_ior (ACE_TCHAR *filename)
// Parses the command line arguments and returns an error status.
int
-PP_Test_Client::parse_args (void)
+PP_Test_Client::parse_args ()
{
ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("ovdn:f:k:x"));
int c;
@@ -164,9 +164,8 @@ PP_Test_Client::parse_args (void)
// Oneway test.
void
-PP_Test_Client::send_oneway (void)
+PP_Test_Client::send_oneway ()
{
-
try
{
ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SEND_ONEWAY_START);
@@ -184,9 +183,8 @@ PP_Test_Client::send_oneway (void)
// Twoway test.
void
-PP_Test_Client::send_void (void)
+PP_Test_Client::send_void ()
{
-
try
{
ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SEND_VOID_START);
@@ -250,7 +248,6 @@ PP_Test_Client::run ()
int
PP_Test_Client::shutdown_server (int do_shutdown)
{
-
try
{
if (do_shutdown)
@@ -275,9 +272,8 @@ PP_Test_Client::shutdown_server (int do_shutdown)
}
int
-PP_Test_Client::run_oneway (void)
+PP_Test_Client::run_oneway ()
{
-
try
{
CORBA::ULong i;
@@ -314,9 +310,8 @@ PP_Test_Client::run_oneway (void)
}
int
-PP_Test_Client::run_void (void)
+PP_Test_Client::run_void ()
{
-
try
{
CORBA::ULong i;
@@ -352,7 +347,7 @@ PP_Test_Client::run_void (void)
return this->error_count_ == 0 ? 0 : 1;
}
-PP_Test_Client::~PP_Test_Client (void)
+PP_Test_Client::~PP_Test_Client ()
{
// Free resources and close the IOR files.
if (this->factory_ior_file_)
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.h b/TAO/performance-tests/Pluggable/PP_Test_Client.h
index 8689a013061..44fbce0e4af 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Client.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_Client.h
@@ -40,10 +40,10 @@ public:
/// Use <testing_collocation> to control some client's behaviors.
PP_Test_Client (int shutdown = 0);
- ~PP_Test_Client (void);
+ ~PP_Test_Client ();
/// Execute client example code.
- int run (void);
+ int run ();
/// Initialize the client communication endpoint with server.
/// <collocation_test_ior> is used to pass in the ior file name.
@@ -54,19 +54,19 @@ private:
int read_ior (ACE_TCHAR *filename);
/// Parses the arguments passed on the command line.
- int parse_args (void);
+ int parse_args ();
/// Oneway operation test.
- void send_oneway (void);
+ void send_oneway ();
/// Twoway operation test.
- void send_void (void);
+ void send_void ();
/// This method runs only the send_void() test.
- int run_void (void);
+ int run_void ();
/// This method runs only the send_oneway() test.
- int run_oneway (void);
+ int run_oneway ();
/// Invoke the method with <do_shutdown> != 0 to shutdown the server.
int shutdown_server (int do_shutdown);
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
index a8121b86a85..0fc81a5e56b 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
@@ -3,13 +3,13 @@
#include "tao/debug.h"
#include "ace/OS_NS_stdio.h"
-PP_Test_Server::PP_Test_Server (void)
+PP_Test_Server::PP_Test_Server ()
: ior_output_file_ (0)
{
}
int
-PP_Test_Server::parse_args (void)
+PP_Test_Server::parse_args ()
{
ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("do:"));
int c;
@@ -103,7 +103,7 @@ PP_Test_Server::run ()
return 0;
}
-PP_Test_Server::~PP_Test_Server (void)
+PP_Test_Server::~PP_Test_Server ()
{
if (this->factory_id_.in ())
this->orb_manager_.deactivate_under_child_poa (this->factory_id_.in ());
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.h b/TAO/performance-tests/Pluggable/PP_Test_Server.h
index f837ce4ece9..4853aa6c304 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.h
@@ -37,21 +37,21 @@ class PP_Test_Server
{
public:
/// Default constructor
- PP_Test_Server (void);
+ PP_Test_Server ();
/// Destructor
- ~PP_Test_Server (void);
+ ~PP_Test_Server ();
/// Initialize the server state - parsing arguments, etc.
int init (int argc,
ACE_TCHAR **argv);
/// Run the orb
- int run (void);
+ int run ();
private:
/// Parses the commandline arguments.
- int parse_args (void);
+ int parse_args ();
/// File to output the cubit factory IOR.
FILE* ior_output_file_;
diff --git a/TAO/performance-tests/Pluggable/PP_Test_i.cpp b/TAO/performance-tests/Pluggable/PP_Test_i.cpp
index 71d7968e128..62c2cae11f3 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_i.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_i.cpp
@@ -60,12 +60,12 @@ Pluggable_Test_Factory_i::Pluggable_Test_Factory_i (CORBA::ORB_ptr orb)
// Factory Destructor
-Pluggable_Test_Factory_i::~Pluggable_Test_Factory_i (void)
+Pluggable_Test_Factory_i::~Pluggable_Test_Factory_i ()
{
}
Pluggable_Test_ptr
-Pluggable_Test_Factory_i::make_pluggable_test (void)
+Pluggable_Test_Factory_i::make_pluggable_test ()
{
ACE_FUNCTION_TIMEPROBE (PP_TEST_I_MAKE_PLUGGABLE_START);
return my_pluggable_test_._this ();
@@ -80,14 +80,14 @@ PP_Test_i::PP_Test_i (CORBA::ORB_ptr orb)
// Destructor
-PP_Test_i::~PP_Test_i (void)
+PP_Test_i::~PP_Test_i ()
{
}
// Oneway send
void
-PP_Test_i::send_oneway (void)
+PP_Test_i::send_oneway ()
{
ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SEND_ONEWAY_START);
}
@@ -95,14 +95,14 @@ PP_Test_i::send_oneway (void)
// Twoway send
void
-PP_Test_i::send_void (void)
+PP_Test_i::send_void ()
{
ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SEND_VOID_START);
}
// Shutdown.
-void PP_Test_i::shutdown (void)
+void PP_Test_i::shutdown ()
{
ACE_DEBUG ((LM_DEBUG,
"%s\n",
diff --git a/TAO/performance-tests/Pluggable/PP_Test_i.h b/TAO/performance-tests/Pluggable/PP_Test_i.h
index f6d78fcca71..df6bc300f8d 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_i.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_i.h
@@ -29,16 +29,16 @@ public:
PP_Test_i (CORBA::ORB_ptr orb);
/// Destructor
- ~PP_Test_i (void);
+ ~PP_Test_i ();
/// Test a oneway call.
- virtual void send_oneway (void);
+ virtual void send_oneway ();
/// Test a twoway call.
- virtual void send_void (void);
+ virtual void send_void ();
/// Shutdown routine.
- virtual void shutdown (void);
+ virtual void shutdown ();
protected:
/// Keep a pointer to the ORB so we can shut it down.
@@ -59,10 +59,10 @@ public:
Pluggable_Test_Factory_i (CORBA::ORB_ptr orb);
/// Destructor.
- ~Pluggable_Test_Factory_i (void);
+ ~Pluggable_Test_Factory_i ();
/// Make a Pluggable Test object.
- virtual Pluggable_Test_ptr make_pluggable_test (void);
+ virtual Pluggable_Test_ptr make_pluggable_test ();
private:
PP_Test_i my_pluggable_test_;
diff --git a/TAO/performance-tests/Protocols/distributor.cpp b/TAO/performance-tests/Protocols/distributor.cpp
index a6b2caf5a2b..839d4f82d4d 100644
--- a/TAO/performance-tests/Protocols/distributor.cpp
+++ b/TAO/performance-tests/Protocols/distributor.cpp
@@ -54,7 +54,7 @@ public:
CORBA::PolicyManager_ptr policy_manager,
test_ptr receiver);
- ~test_i (void);
+ ~test_i ();
void start_test (CORBA::Long session_id,
const char *protocol,
@@ -62,11 +62,11 @@ public:
CORBA::ULong message_size,
CORBA::ULong iterations);
- void end_test (void);
+ void end_test ();
- void oneway_sync (void);
+ void oneway_sync ();
- void twoway_sync (void);
+ void twoway_sync ();
void oneway_method (CORBA::Long session_id,
CORBA::ULong iteration,
@@ -77,10 +77,10 @@ public:
::test::octets &payload);
//FUZZ: disable check_for_lack_ACE_OS
- void shutdown (void);
+ void shutdown ();
//FUZZ: enable check_for_lack_ACE_OS
- PortableServer::POA_ptr _default_POA (void);
+ PortableServer::POA_ptr _default_POA ();
private:
CORBA::ORB_var orb_;
@@ -125,7 +125,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
this->rtorb_->create_client_protocol_policy (protocols);
}
-test_i::~test_i (void)
+test_i::~test_i ()
{
}
@@ -171,7 +171,6 @@ test_i::start_test (CORBA::Long session_id,
// for a few times before giving up.
for (int j = 0;;)
{
-
test_protocol_setup:
try
@@ -209,7 +208,6 @@ test_i::start_test (CORBA::Long session_id,
// for a few times before giving up.
for (int k = 0;;)
{
-
base_protocol_setup:
try
@@ -248,7 +246,7 @@ test_i::start_test (CORBA::Long session_id,
}
void
-test_i::end_test (void)
+test_i::end_test ()
{
// Use IIOP to indicate end of test to server.
this->policy_manager_->set_policy_overrides (this->base_protocol_policy_,
@@ -258,13 +256,13 @@ test_i::end_test (void)
}
void
-test_i::oneway_sync (void)
+test_i::oneway_sync ()
{
this->receiver_->oneway_sync ();
}
void
-test_i::twoway_sync (void)
+test_i::twoway_sync ()
{
this->receiver_->twoway_sync ();
}
@@ -290,13 +288,13 @@ test_i::twoway_method (CORBA::Long &session_id,
}
PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
void
-test_i::shutdown (void)
+test_i::shutdown ()
{
this->receiver_->shutdown ();
diff --git a/TAO/performance-tests/Protocols/receiver.cpp b/TAO/performance-tests/Protocols/receiver.cpp
index 524adf15166..d8fc1790cd1 100644
--- a/TAO/performance-tests/Protocols/receiver.cpp
+++ b/TAO/performance-tests/Protocols/receiver.cpp
@@ -59,7 +59,7 @@ public:
test_i (CORBA::ORB_ptr orb,
PortableServer::POA_ptr poa);
- ~test_i (void);
+ ~test_i ();
void start_test (CORBA::Long session_id,
const char *protocol,
@@ -67,11 +67,11 @@ public:
CORBA::ULong message_size,
CORBA::ULong iterations);
- void end_test (void);
+ void end_test ();
- void oneway_sync (void);
+ void oneway_sync ();
- void twoway_sync (void);
+ void twoway_sync ();
void oneway_method (CORBA::Long session_id,
CORBA::ULong iteration,
@@ -82,10 +82,10 @@ public:
::test::octets &payload);
//FUZZ: disable check_for_lack_ACE_OS
- void shutdown (void);
+ void shutdown ();
//FUZZ: enable check_for_lack_ACE_OS
- PortableServer::POA_ptr _default_POA (void);
+ PortableServer::POA_ptr _default_POA ();
private:
CORBA::ORB_var orb_;
@@ -112,7 +112,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
{
}
-test_i::~test_i (void)
+test_i::~test_i ()
{
}
@@ -162,7 +162,7 @@ test_i::start_test (CORBA::Long session_id,
}
void
-test_i::end_test (void)
+test_i::end_test ()
{
// Record end time.
this->test_end_ =
@@ -226,12 +226,12 @@ test_i::end_test (void)
}
void
-test_i::oneway_sync (void)
+test_i::oneway_sync ()
{
}
void
-test_i::twoway_sync (void)
+test_i::twoway_sync ()
{
}
@@ -308,13 +308,13 @@ test_i::twoway_method (CORBA::Long &session_id,
}
PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
void
-test_i::shutdown (void)
+test_i::shutdown ()
{
ACE_DEBUG ((LM_DEBUG,
"test_i::shutdown\n"));
diff --git a/TAO/performance-tests/Protocols/sender.cpp b/TAO/performance-tests/Protocols/sender.cpp
index e10826b6e00..a39c1ad51bb 100644
--- a/TAO/performance-tests/Protocols/sender.cpp
+++ b/TAO/performance-tests/Protocols/sender.cpp
@@ -183,14 +183,13 @@ public:
CORBA::PolicyManager_ptr policy_manager,
test_ptr test);
- void run (void);
+ void run ();
- void print_stats (void);
+ void print_stats ();
- void setup (void);
+ void setup ();
private:
-
ACE_hrtime_t deadline_for_current_call (CORBA::ULong i);
void missed_start_deadline (CORBA::ULong invocation);
void missed_end_deadline (CORBA::ULong invocation);
@@ -317,7 +316,7 @@ Worker::Worker (CORBA::ORB_ptr orb,
}
void
-Worker::print_stats (void)
+Worker::print_stats ()
{
CORBA::ULong missed_total_deadlines =
this->missed_start_deadlines_ + this->missed_end_deadlines_;
@@ -454,7 +453,7 @@ Worker::missed_end_deadline (CORBA::ULong invocation)
}
void
-Worker::setup (void)
+Worker::setup ()
{
// Make sure we have a connection to the server using the test
// protocol.
@@ -465,7 +464,6 @@ Worker::setup (void)
// for a few times before giving up.
for (int j = 0;;)
{
-
test_protocol_setup:
try
@@ -503,7 +501,6 @@ Worker::setup (void)
// for a few times before giving up.
for (int k = 0;;)
{
-
base_protocol_setup:
try
@@ -540,7 +537,7 @@ Worker::setup (void)
}
void
-Worker::run (void)
+Worker::run ()
{
// Select the test protocol for these invocation.
this->policy_manager_->set_policy_overrides (this->test_protocol_policy_,
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
index 0b86c5ac4fe..b136baa8df0 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
@@ -24,7 +24,7 @@ class RTCORBA_COMMON_Export Test_i : public POA_Test
{
public:
/// ctor
- Test_i (void);
+ Test_i ();
// = The Test methods.
void test_method (CORBA::Long id);
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl
index 60fa6e3774b..730a0be162e 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl
@@ -1,4 +1,4 @@
ACE_INLINE
-Test_i::Test_i (void)
+Test_i::Test_i ()
{
}
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 2dab4dd836c..5940f002126 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
@@ -21,7 +21,7 @@ class Client : public ACE_Task_Base
// Use the ACE_Task_Base class to run the client threads.
//
public:
- Client (void);
+ Client ();
// ctor
void set (int niterations,
@@ -213,7 +213,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
// ****************************************************************
-Client::Client (void)
+Client::Client ()
{
}
@@ -232,7 +232,7 @@ Client::set (int niterations,
}
int
-Client::svc (void)
+Client::svc ()
{
ACE_hthread_t current;
ACE_Thread::self (current);
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 958b597b92b..d1e5690f65f 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
@@ -17,7 +17,7 @@ class Server : public ACE_Task_Base
// Use the ACE_Task_Base class to run the server threads.
//
public:
- Server (void);
+ Server ();
// ctor
void set (Test_i *server, int priority, int argc, ACE_TCHAR *argv[]);
@@ -168,7 +168,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
// ****************************************************************
-Server::Server (void)
+Server::Server ()
{
}
@@ -186,7 +186,7 @@ Server::set (Test_i *server,
}
int
-Server::svc (void)
+Server::svc ()
{
ACE_hthread_t current;
ACE_Thread::self (current);
@@ -253,7 +253,6 @@ Server::svc (void)
poa_manager->activate ();
orb->run ();
-
}
catch (const CORBA::Exception& ex)
{
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 a0046475528..0e1c3d78eed 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
@@ -20,7 +20,7 @@ class Client : public ACE_Task_Base
// Use the ACE_Task_Base class to run the client threads.
//
public:
- Client (void);
+ Client ();
// ctor
void set (Test_ptr server,
@@ -217,7 +217,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
throughput.dump_results (ACE_TEXT("Aggregated"), gsf);
server->shutdown ("");
-
}
catch (const CORBA::Exception& ex)
{
@@ -231,7 +230,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
// ****************************************************************
-Client::Client (void)
+Client::Client ()
{
}
@@ -252,7 +251,7 @@ Client::set (Test_ptr server,
}
int
-Client::svc (void)
+Client::svc ()
{
ACE_hthread_t current;
ACE_Thread::self (current);
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
index 01fcc474949..7c0184fc5d9 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
@@ -81,7 +81,7 @@ static Messaging::SyncScope sync_scope = Messaging::SYNC_WITH_TRANSPORT;
static ACE_High_Res_Timer::global_scale_factor_type gsf = 0;
static void
-print_params (void)
+print_params ()
{
if (test_twoway)
{
@@ -359,7 +359,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
}
int
-set_rt_mode (void)
+set_rt_mode ()
{
int policy = ACE_SCHED_FIFO;
int priority =
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
index bd393f055bf..b450e05b3d5 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
@@ -35,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
}
int
-set_rt_mode (void)
+set_rt_mode ()
{
int policy = ACE_SCHED_FIFO;
int priority =
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
index 5a5bd2564f1..617e1951d63 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
@@ -33,7 +33,7 @@ public:
void twoway_work_test (CORBA::ULong work);
- void shutdown (void);
+ void shutdown ();
private:
/// The ORB
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
index 9e835b90b7f..d49019b3a7a 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
@@ -44,7 +44,7 @@ static int count_missed_end_deadlines = 0;
struct Synchronizers
{
- Synchronizers (void)
+ Synchronizers ()
: worker_lock_ (),
workers_ (1),
workers_ready_ (0),
@@ -406,11 +406,11 @@ public:
RTCORBA::PriorityMapping &priority_mapping,
Synchronizers &synchronizers);
- int svc (void);
+ int svc ();
ACE_hrtime_t deadline_for_current_call (CORBA::ULong i);
- void reset_priority (void);
+ void reset_priority ();
void print_stats (ACE_hrtime_t test_end);
- int setup (void);
+ int setup ();
void missed_start_deadline (CORBA::ULong invocation);
void missed_end_deadline (CORBA::ULong invocation);
@@ -461,7 +461,7 @@ Paced_Worker::Paced_Worker (ACE_Thread_Manager &thread_manager,
}
void
-Paced_Worker::reset_priority (void)
+Paced_Worker::reset_priority ()
{
if (set_priority)
{
@@ -574,7 +574,7 @@ Paced_Worker::print_stats (ACE_hrtime_t test_end)
}
int
-Paced_Worker::setup (void)
+Paced_Worker::setup ()
{
if (priority_setting == AFTER_THREAD_CREATION)
{
@@ -614,7 +614,7 @@ Paced_Worker::missed_end_deadline (CORBA::ULong invocation)
}
int
-Paced_Worker::svc (void)
+Paced_Worker::svc ()
{
try
{
@@ -689,11 +689,11 @@ public:
RTCORBA::PriorityMapping &priority_mapping,
Synchronizers &synchronizers);
- int svc (void);
+ int svc ();
void print_stats (ACE_Sample_History &history,
ACE_hrtime_t test_end);
- int setup (void);
- void print_collective_stats (void);
+ int setup ();
+ void print_collective_stats ();
test_var test_;
CORBA::ULong iterations_;
@@ -764,7 +764,7 @@ Continuous_Worker::print_stats (ACE_Sample_History &history,
}
void
-Continuous_Worker::print_collective_stats (void)
+Continuous_Worker::print_collective_stats ()
{
if (continuous_workers > 0)
{
@@ -794,7 +794,7 @@ Continuous_Worker::print_collective_stats (void)
}
int
-Continuous_Worker::setup (void)
+Continuous_Worker::setup ()
{
if (priority_setting == AFTER_THREAD_CREATION)
{
@@ -819,7 +819,7 @@ Continuous_Worker::setup (void)
}
int
-Continuous_Worker::svc (void)
+Continuous_Worker::svc ()
{
try
{
@@ -863,14 +863,12 @@ Continuous_Worker::svc (void)
class Task : public ACE_Task_Base
{
public:
-
Task (ACE_Thread_Manager &thread_manager,
CORBA::ORB_ptr orb);
- int svc (void);
+ int svc ();
CORBA::ORB_var orb_;
-
};
Task::Task (ACE_Thread_Manager &thread_manager,
@@ -881,7 +879,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
}
int
-Task::svc (void)
+Task::svc ()
{
Synchronizers synchronizers;
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
index 31ef0cbc69b..25860a549bf 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
@@ -20,10 +20,10 @@ public:
CORBA::ULong prime_number);
//FUZZ: disable check_for_lack_ACE_OS
- void shutdown (void);
+ void shutdown ();
//FUZZ: enable check_for_lack_ACE_OS
- PortableServer::POA_ptr _default_POA (void);
+ PortableServer::POA_ptr _default_POA ();
private:
CORBA::ORB_var orb_;
@@ -53,13 +53,13 @@ test_i::method (CORBA::ULong work,
}
PortableServer::POA_ptr
-test_i::_default_POA (void)
+test_i::_default_POA ()
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
void
-test_i::shutdown (void)
+test_i::shutdown ()
{
this->orb_->shutdown (false);
}
@@ -186,14 +186,12 @@ write_ior_to_file (const ACE_TCHAR *ior_file,
class Task : public ACE_Task_Base
{
public:
-
Task (ACE_Thread_Manager &thread_manager,
CORBA::ORB_ptr orb);
- int svc (void);
+ int svc ();
CORBA::ORB_var orb_;
-
};
Task::Task (ACE_Thread_Manager &thread_manager,
@@ -204,7 +202,7 @@ Task::Task (ACE_Thread_Manager &thread_manager,
}
int
-Task::svc (void)
+Task::svc ()
{
try
{
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h
index e2b64b3ddc1..e2f09f0b197 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h
@@ -47,7 +47,6 @@ public:
Test::Timestamp send_time);
-
void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh);
private:
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
index 7af03422198..64c44e0d706 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
@@ -335,7 +335,6 @@ test_double_seq (Test::Roundtrip_ptr roundtrip)
}
-
int
ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
index 4eeef2f1ab6..ef5dfba1a80 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
@@ -49,7 +49,7 @@ Roundtrip::test_short_method (const Test::short_load &,
}
void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
{
this->orb_->shutdown (false);
}
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
index 7c2cf869732..45e0ab70078 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
@@ -15,7 +15,6 @@ class Roundtrip
: public virtual POA_Test::Roundtrip
{
public:
-
/// Constructor
Roundtrip (CORBA::ORB_ptr orb);
@@ -38,7 +37,7 @@ public:
Test::Timestamp test_double_method (const Test::double_load& ol,
Test::Timestamp send_time);
- virtual void shutdown (void);
+ virtual void shutdown ();
private:
/// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
index 63acb1c980c..764786b08e3 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
@@ -173,7 +173,7 @@ Roundtrip_Handler::test_longlong_method_excep (::Messaging::ExceptionHolder *hol
// = Other methods
void
-Roundtrip_Handler::shutdown (void)
+Roundtrip_Handler::shutdown ()
{
}
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
index 15644ab0415..c914102c56c 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
@@ -47,7 +47,7 @@ public:
// = Other methods
- virtual void shutdown (void);
+ virtual void shutdown ();
virtual void shutdown_excep (::Messaging::ExceptionHolder *holder);
private:
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp
index 2431feb42a7..51288cdde31 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp
@@ -6,7 +6,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb)
}
int
-Server_Task::svc (void)
+Server_Task::svc ()
{
try
{
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
index 80a86a84e5b..d5d1921e003 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
@@ -90,7 +90,6 @@ void test_octet_seq (Test::Roundtrip_ptr roundtrip,
ACE_OS::gethrtime ());
if (orb->work_pending ())
orb->perform_work ();
-
}
ACE_Time_Value tv (0, 2000);
@@ -136,7 +135,6 @@ void test_char_seq (Test::Roundtrip_ptr roundtrip,
ACE_OS::gethrtime ());
if (orb->work_pending ())
orb->perform_work ();
-
}
ACE_Time_Value tv (0, 2000);
@@ -182,7 +180,6 @@ void test_long_seq (Test::Roundtrip_ptr roundtrip,
ACE_OS::gethrtime ());
if (orb->work_pending ())
orb->perform_work ();
-
}
ACE_Time_Value tv (0, 2000);
@@ -228,7 +225,6 @@ void test_short_seq (Test::Roundtrip_ptr roundtrip,
ACE_OS::gethrtime ());
if (orb->work_pending ())
orb->perform_work ();
-
}
ACE_Time_Value tv (0, 2000);
@@ -274,7 +270,6 @@ void test_double_seq (Test::Roundtrip_ptr roundtrip,
ACE_OS::gethrtime ());
if (orb->work_pending ())
orb->perform_work ();
-
}
ACE_Time_Value tv (0, 2000);
@@ -320,7 +315,6 @@ void test_longlong_seq (Test::Roundtrip_ptr roundtrip,
ACE_OS::gethrtime ());
if (orb->work_pending ())
orb->perform_work ();
-
}
ACE_Time_Value tv (0, 2000);
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
index 4eeef2f1ab6..ef5dfba1a80 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
@@ -49,7 +49,7 @@ Roundtrip::test_short_method (const Test::short_load &,
}
void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
{
this->orb_->shutdown (false);
}
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
index 7c2cf869732..45e0ab70078 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
@@ -15,7 +15,6 @@ class Roundtrip
: public virtual POA_Test::Roundtrip
{
public:
-
/// Constructor
Roundtrip (CORBA::ORB_ptr orb);
@@ -38,7 +37,7 @@ public:
Test::Timestamp test_double_method (const Test::double_load& ol,
Test::Timestamp send_time);
- virtual void shutdown (void);
+ virtual void shutdown ();
private:
/// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
index a399d56df78..54ec9a64dde 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
@@ -337,7 +337,6 @@ test_double_seq (Test::Roundtrip_ptr roundtrip)
}
-
int
ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
index 4eeef2f1ab6..ef5dfba1a80 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
@@ -49,7 +49,7 @@ Roundtrip::test_short_method (const Test::short_load &,
}
void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
{
this->orb_->shutdown (false);
}
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
index 7c2cf869732..45e0ab70078 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
@@ -15,7 +15,6 @@ class Roundtrip
: public virtual POA_Test::Roundtrip
{
public:
-
/// Constructor
Roundtrip (CORBA::ORB_ptr orb);
@@ -38,7 +37,7 @@ public:
Test::Timestamp test_double_method (const Test::double_load& ol,
Test::Timestamp send_time);
- virtual void shutdown (void);
+ virtual void shutdown ();
private:
/// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
index 098776142d6..b159411c7d5 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
@@ -89,7 +89,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
}
-
int
test_octet_seq (Test::Roundtrip_ptr roundtrip)
{
@@ -510,7 +509,6 @@ test_double_seq (Test::Roundtrip_ptr roundtrip)
}
-
// The main() function starts here
int
diff --git a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp
index 1163c7866f3..0c274c3aa5c 100644
--- a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp
@@ -153,7 +153,6 @@ void big_time_test (CORBA::ULong num_list_loops,
str_len = list.strs.first_str.length();
list.strs.first_str.length(str_len + 1);
list.strs.first_str[str_len] = use_long_str ? long_str : short_str;
-
} // end of str loop
} // end of seq loop
@@ -187,7 +186,6 @@ void big_time_test (CORBA::ULong num_list_loops,
int
ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
-
if (argc > 1 && ACE_OS::strcasecmp (argv[1],ACE_TEXT("-csv")) == 0)
use_csv = true;
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
index 4eeef2f1ab6..ef5dfba1a80 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
@@ -49,7 +49,7 @@ Roundtrip::test_short_method (const Test::short_load &,
}
void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
{
this->orb_->shutdown (false);
}
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
index 7c2cf869732..45e0ab70078 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
@@ -15,7 +15,6 @@ class Roundtrip
: public virtual POA_Test::Roundtrip
{
public:
-
/// Constructor
Roundtrip (CORBA::ORB_ptr orb);
@@ -38,7 +37,7 @@ public:
Test::Timestamp test_double_method (const Test::double_load& ol,
Test::Timestamp send_time);
- virtual void shutdown (void);
+ virtual void shutdown ();
private:
/// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
index d39fd5283a9..6d1d3fde83d 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *data_type,
}
int
-Client_Task::svc (void)
+Client_Task::svc ()
{
try
{
@@ -62,7 +62,7 @@ Client_Task::accumulate_and_dump (
}
void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
{
CORBA::ULongLong dummy = 0;
Test::octet_load oc;
@@ -78,7 +78,7 @@ Client_Task::validate_connection (void)
}
void
-Client_Task::test_octet_seq (void)
+Client_Task::test_octet_seq ()
{
Test::octet_load ol (this->size_);
ol.length (this->size_);
@@ -91,12 +91,11 @@ Client_Task::test_octet_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
void
-Client_Task::test_long_seq (void)
+Client_Task::test_long_seq ()
{
Test::long_load ll (this->size_);
ll.length (this->size_);
@@ -109,13 +108,12 @@ Client_Task::test_long_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
void
-Client_Task::test_short_seq (void)
+Client_Task::test_short_seq ()
{
Test::short_load sl (this->size_);
sl.length (this->size_);
@@ -128,12 +126,11 @@ Client_Task::test_short_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
void
-Client_Task::test_char_seq (void)
+Client_Task::test_char_seq ()
{
Test::char_load cl (this->size_);
cl.length (this->size_);
@@ -146,12 +143,11 @@ Client_Task::test_char_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
void
-Client_Task::test_longlong_seq (void)
+Client_Task::test_longlong_seq ()
{
Test::longlong_load ll (this->size_);
ll.length (this->size_);
@@ -164,12 +160,11 @@ Client_Task::test_longlong_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
void
-Client_Task::test_double_seq (void)
+Client_Task::test_double_seq ()
{
Test::double_load dl (this->size_);
dl.length (this->size_);
@@ -182,6 +177,5 @@ Client_Task::test_double_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
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 0bd8f60bd15..531173d8acd 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
@@ -28,15 +28,15 @@ public:
private:
/// Make sure that the current thread has a connection available.
- void validate_connection (void);
+ void validate_connection ();
/// Some performance test methods
- void test_octet_seq (void);
- void test_long_seq (void);
- void test_short_seq (void);
- void test_char_seq (void);
- void test_longlong_seq (void);
- void test_double_seq (void);
+ void test_octet_seq ();
+ void test_long_seq ();
+ void test_short_seq ();
+ void test_char_seq ();
+ void test_longlong_seq ();
+ void test_double_seq ();
private:
/// The data type of the sequence load to be tested
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
index e6dcf32173c..8ac6981955a 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
@@ -48,7 +48,7 @@ Roundtrip::test_short_method (const Test::short_load &,
}
void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
{
this->orb_->shutdown (false);
}
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
index fe58d00e939..45e0ab70078 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
@@ -37,7 +37,7 @@ public:
Test::Timestamp test_double_method (const Test::double_load& ol,
Test::Timestamp send_time);
- virtual void shutdown (void);
+ virtual void shutdown ();
private:
/// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
index 66b9d153715..27962ee6200 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *data_type,
}
int
-Client_Task::svc (void)
+Client_Task::svc ()
{
try
{
@@ -62,7 +62,7 @@ Client_Task::accumulate_and_dump (
}
void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
{
CORBA::ULongLong dummy = 0;
Test::octet_load oc;
@@ -78,7 +78,7 @@ Client_Task::validate_connection (void)
}
void
-Client_Task::test_octet_seq (void)
+Client_Task::test_octet_seq ()
{
Test::octet_load ol (this->size_);
ol.length (this->size_);
@@ -91,12 +91,11 @@ Client_Task::test_octet_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
void
-Client_Task::test_long_seq (void)
+Client_Task::test_long_seq ()
{
Test::long_load ll (this->size_);
ll.length (this->size_);
@@ -109,13 +108,12 @@ Client_Task::test_long_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
void
-Client_Task::test_short_seq (void)
+Client_Task::test_short_seq ()
{
Test::short_load sl (this->size_);
sl.length (this->size_);
@@ -128,12 +126,11 @@ Client_Task::test_short_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
void
-Client_Task::test_char_seq (void)
+Client_Task::test_char_seq ()
{
Test::char_load cl (this->size_);
cl.length (this->size_);
@@ -146,12 +143,11 @@ Client_Task::test_char_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
void
-Client_Task::test_longlong_seq (void)
+Client_Task::test_longlong_seq ()
{
Test::longlong_load ll (this->size_);
ll.length (this->size_);
@@ -164,12 +160,11 @@ Client_Task::test_longlong_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
void
-Client_Task::test_double_seq (void)
+Client_Task::test_double_seq ()
{
Test::double_load dl (this->size_);
dl.length (this->size_);
@@ -182,6 +177,5 @@ Client_Task::test_double_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
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 0bd8f60bd15..531173d8acd 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
@@ -28,15 +28,15 @@ public:
private:
/// Make sure that the current thread has a connection available.
- void validate_connection (void);
+ void validate_connection ();
/// Some performance test methods
- void test_octet_seq (void);
- void test_long_seq (void);
- void test_short_seq (void);
- void test_char_seq (void);
- void test_longlong_seq (void);
- void test_double_seq (void);
+ void test_octet_seq ();
+ void test_long_seq ();
+ void test_short_seq ();
+ void test_char_seq ();
+ void test_longlong_seq ();
+ void test_double_seq ();
private:
/// The data type of the sequence load to be tested
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
index e6dcf32173c..8ac6981955a 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
@@ -48,7 +48,7 @@ Roundtrip::test_short_method (const Test::short_load &,
}
void
-Roundtrip::shutdown (void)
+Roundtrip::shutdown ()
{
this->orb_->shutdown (false);
}
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
index fe58d00e939..45e0ab70078 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
@@ -37,7 +37,7 @@ public:
Test::Timestamp test_double_method (const Test::double_load& ol,
Test::Timestamp send_time);
- virtual void shutdown (void);
+ virtual void shutdown ();
private:
/// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp
index 38ef68443e6..1aa09af027f 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp
@@ -6,7 +6,7 @@ Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb)
}
int
-Worker_Thread::svc (void)
+Worker_Thread::svc ()
{
try
{
diff --git a/TAO/performance-tests/Throughput/Receiver.cpp b/TAO/performance-tests/Throughput/Receiver.cpp
index 3398bfef863..065ca312c58 100644
--- a/TAO/performance-tests/Throughput/Receiver.cpp
+++ b/TAO/performance-tests/Throughput/Receiver.cpp
@@ -2,7 +2,7 @@
#include "Receiver.h"
#include "ace/High_Res_Timer.h"
-Receiver::Receiver (void)
+Receiver::Receiver ()
: start_time_ (0)
, message_count_ (0)
, byte_count_ (0)
@@ -38,7 +38,7 @@ Receiver::receive_data (const Test::Message &the_message)
}
void
-Receiver::done (void)
+Receiver::done ()
{
if (this->message_count_ == 0)
{
diff --git a/TAO/performance-tests/Throughput/Receiver.h b/TAO/performance-tests/Throughput/Receiver.h
index d7159953a82..f2697134c85 100644
--- a/TAO/performance-tests/Throughput/Receiver.h
+++ b/TAO/performance-tests/Throughput/Receiver.h
@@ -17,12 +17,12 @@ class Receiver
{
public:
/// Constructor
- Receiver (void);
+ Receiver ();
// = The skeleton methods
virtual void receive_data (const Test::Message &message);
- virtual void done (void);
+ virtual void done ();
private:
/// The timestamp for the first message
diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.cpp b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
index dbff14c5c48..b67eb3418a8 100644
--- a/TAO/performance-tests/Throughput/Receiver_Factory.cpp
+++ b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
@@ -7,7 +7,7 @@ Receiver_Factory::Receiver_Factory (CORBA::ORB_ptr orb)
}
Test::Receiver_ptr
-Receiver_Factory::create_receiver (void)
+Receiver_Factory::create_receiver ()
{
Receiver *receiver_impl = 0;
ACE_NEW_THROW_EX (receiver_impl,
@@ -30,7 +30,7 @@ Receiver_Factory::create_receiver (void)
}
void
-Receiver_Factory::shutdown (void)
+Receiver_Factory::shutdown ()
{
this->orb_->shutdown (false);
}
diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.h b/TAO/performance-tests/Throughput/Receiver_Factory.h
index 44a023b49e0..b16cb45b13e 100644
--- a/TAO/performance-tests/Throughput/Receiver_Factory.h
+++ b/TAO/performance-tests/Throughput/Receiver_Factory.h
@@ -14,9 +14,9 @@ public:
Receiver_Factory (CORBA::ORB_ptr orb);
// = The skeleton methods
- virtual Test::Receiver_ptr create_receiver (void);
+ virtual Test::Receiver_ptr create_receiver ();
- virtual void shutdown (void);
+ virtual void shutdown ();
private:
/// Keep a reference to the ORB in order to shutdown the app