diff options
Diffstat (limited to 'TAO/performance-tests/Cubit')
23 files changed, 192 insertions, 192 deletions
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 04e8bd1fd79..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 { @@ -1562,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 3236d8087c4..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); } @@ -407,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", @@ -418,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 1bb88cacb2f..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. @@ -175,13 +175,13 @@ 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 @@ -190,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 8d6474f51ca..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 (); @@ -384,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; @@ -484,7 +484,7 @@ Client::get_jitter (u_int id) } void -Client::find_frequency (void) +Client::find_frequency () { if (this->ts_->thread_per_rate_ == 0) { @@ -546,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")); @@ -653,7 +653,7 @@ Client::get_cubit (CORBA::ORB_ptr orb) } int -Client::svc (void) +Client::svc () { try { @@ -723,7 +723,7 @@ Client::svc (void) } int -Client::cube_octet (void) +Client::cube_octet () { try { @@ -764,7 +764,7 @@ Client::cube_octet (void) } int -Client::cube_short (void) +Client::cube_short () { try { @@ -797,7 +797,7 @@ Client::cube_short (void) } int -Client::cube_long (void) +Client::cube_long () { try { @@ -830,7 +830,7 @@ Client::cube_long (void) } int -Client::cube_struct (void) +Client::cube_struct () { try { @@ -869,7 +869,7 @@ Client::cube_struct (void) } int -Client::make_request (void) +Client::make_request () { int result; @@ -920,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. @@ -978,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; @@ -1065,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_; |