diff options
Diffstat (limited to 'ACE/apps/Gateway')
19 files changed, 71 insertions, 71 deletions
diff --git a/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp b/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp index 4f9ac9bfc52..3aa485921c3 100644 --- a/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp +++ b/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp @@ -638,7 +638,7 @@ Thr_Consumer_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *) // from the use of threads, compared with the Reactive solution. int -Thr_Consumer_Handler::svc (void) +Thr_Consumer_Handler::svc () { for (in_thread_ = 1;;) { @@ -748,7 +748,7 @@ Thr_Supplier_Handler::open (void *) // existing code!). int -Thr_Supplier_Handler::svc (void) +Thr_Supplier_Handler::svc () { for (in_thread_ = 1;;) { diff --git a/ACE/apps/Gateway/Gateway/Connection_Handler.cpp b/ACE/apps/Gateway/Gateway/Connection_Handler.cpp index b2bcecbe9a2..f6995bae893 100644 --- a/ACE/apps/Gateway/Gateway/Connection_Handler.cpp +++ b/ACE/apps/Gateway/Gateway/Connection_Handler.cpp @@ -42,7 +42,7 @@ Connection_Handler::total_bytes (size_t bytes) this->total_bytes_ += bytes; } -Connection_Handler::Connection_Handler (void) +Connection_Handler::Connection_Handler () { } @@ -95,7 +95,7 @@ Connection_Handler::timeout (long to) // re-calculation). long -Connection_Handler::timeout (void) +Connection_Handler::timeout () { long old_timeout = this->timeout_; this->timeout_ *= 2; diff --git a/ACE/apps/Gateway/Gateway/Connection_Handler.h b/ACE/apps/Gateway/Gateway/Connection_Handler.h index baf4a8f46f0..6fb8a9ae14a 100644 --- a/ACE/apps/Gateway/Gateway/Connection_Handler.h +++ b/ACE/apps/Gateway/Gateway/Connection_Handler.h @@ -40,7 +40,7 @@ class Connection_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH> { public: /// Default constructor (needed to make <ACE_Connector> happy). - Connection_Handler (void); + Connection_Handler (); /// Real constructor. Connection_Handler (const Connection_Config_Info &); @@ -77,7 +77,7 @@ public: // = Set/get the current retry timeout delay. void timeout (long); - long timeout (void); + long timeout (); // = Set/get the maximum retry timeout delay. void max_timeout (long); diff --git a/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.cpp b/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.cpp index d140392fbd3..a69dc559bae 100644 --- a/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.cpp +++ b/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.cpp @@ -1,7 +1,7 @@ #include "Connection_Handler_Connector.h" #include "ace/os_include/os_netdb.h" -Connection_Handler_Connector::Connection_Handler_Connector (void) +Connection_Handler_Connector::Connection_Handler_Connector () { } diff --git a/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.h b/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.h index b5ef112aecd..02d458e3f86 100644 --- a/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.h +++ b/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.h @@ -31,7 +31,7 @@ class Connection_Handler_Connector : public ACE_Connector<Connection_Handler, ACE_SOCK_CONNECTOR> { public: - Connection_Handler_Connector (void); + Connection_Handler_Connector (); // Initiate (or reinitiate) a connection on the Connection_Handler. int initiate_connection (Connection_Handler *, diff --git a/ACE/apps/Gateway/Gateway/Event.h b/ACE/apps/Gateway/Gateway/Event.h index 9d7c652dbda..895cd441fd6 100644 --- a/ACE/apps/Gateway/Gateway/Event.h +++ b/ACE/apps/Gateway/Gateway/Event.h @@ -132,7 +132,7 @@ public: { } - void decode (void) + void decode () { this->len_ = ntohl (this->len_); this->connection_id_ = ntohl (this->connection_id_); @@ -141,7 +141,7 @@ public: } // Decode from network byte order to host byte order. - void encode (void) + void encode () { this->len_ = htonl (this->len_); this->connection_id_ = htonl (this->connection_id_); @@ -194,7 +194,7 @@ public: class Subscription { public: - void decode (void) + void decode () { this->connection_id_ = ntohl (this->connection_id_); @@ -205,7 +205,7 @@ public: } // Decode from network byte order to host byte order. - void encode (void) + void encode () { this->connection_id_ = htonl (this->connection_id_); diff --git a/ACE/apps/Gateway/Gateway/Event_Channel.cpp b/ACE/apps/Gateway/Gateway/Event_Channel.cpp index f192bd3a8c8..97ea7f95ddf 100644 --- a/ACE/apps/Gateway/Gateway/Event_Channel.cpp +++ b/ACE/apps/Gateway/Gateway/Event_Channel.cpp @@ -5,7 +5,7 @@ #include "ace/OS_NS_sys_select.h" #include "ace/Signal.h" -Event_Channel::~Event_Channel (void) +Event_Channel::~Event_Channel () { } @@ -13,7 +13,7 @@ Event_Channel::~Event_Channel (void) # pragma warning (push) # pragma warning (disable:4355) /* Use of 'this' in initializer list */ # endif -Event_Channel::Event_Channel (void) +Event_Channel::Event_Channel () : supplier_acceptor_ (*this, 'S'), consumer_acceptor_ (*this, 'C') { @@ -23,7 +23,7 @@ Event_Channel::Event_Channel (void) #endif int -Event_Channel::compute_performance_statistics (void) +Event_Channel::compute_performance_statistics () { ACE_DEBUG ((LM_DEBUG, "(%t) doing the performance timeout here...\n")); CONNECTION_MAP_ITERATOR cmi (this->connection_map_); @@ -340,7 +340,7 @@ Event_Channel::cancel_connection_connection (Connection_Handler *connection_hand // Initiate active connections with the Consumer and Supplier Peers. void -Event_Channel::initiate_connector (void) +Event_Channel::initiate_connector () { if (Options::instance ()->enabled (Options::CONSUMER_CONNECTOR | Options::SUPPLIER_CONNECTOR)) @@ -366,7 +366,7 @@ Event_Channel::initiate_connector (void) // to accept. int -Event_Channel::initiate_acceptors (void) +Event_Channel::initiate_acceptors () { if (Options::instance ()->enabled (Options::CONSUMER_ACCEPTOR)) { diff --git a/ACE/apps/Gateway/Gateway/Event_Channel.h b/ACE/apps/Gateway/Gateway/Event_Channel.h index 2f4bfcc2a4d..e25d12bfd22 100644 --- a/ACE/apps/Gateway/Gateway/Event_Channel.h +++ b/ACE/apps/Gateway/Gateway/Event_Channel.h @@ -33,8 +33,8 @@ typedef ACE_Null_Mutex MAP_MUTEX; class ACE_Svc_Export Event_Channel : public ACE_Event_Handler { public: - Event_Channel (void); - ~Event_Channel (void); + Event_Channel (); + ~Event_Channel (); /// Open the channel. virtual int open (void * = 0); @@ -78,11 +78,11 @@ public: ACE_Time_Value * = 0); /// Actively initiate connections to the Peers. - void initiate_connector (void); + void initiate_connector (); /// Passively initiate the <Peer_Acceptor>s for Consumer and /// Suppliers. - int initiate_acceptors (void); + int initiate_acceptors (); private: /// Parse the command-line arguments. @@ -98,7 +98,7 @@ private: void subscription_event (ACE_Message_Block *data); /// Perform timer-based performance profiling. - int compute_performance_statistics (void); + int compute_performance_statistics (); /// Periodically callback to perform timer-based performance /// profiling. diff --git a/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp b/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp index 56c60f9b1c6..3b3e4710fbc 100644 --- a/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp +++ b/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp @@ -53,7 +53,7 @@ Event_Forwarding_Discriminator_Iterator::next (Consumer_Dispatch_Set *&cds) } int -Event_Forwarding_Discriminator_Iterator::advance (void) +Event_Forwarding_Discriminator_Iterator::advance () { return this->map_iter_.advance (); } diff --git a/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h b/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h index d4a5fe9dcad..f8f497f3230 100644 --- a/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h +++ b/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h @@ -57,7 +57,7 @@ class Event_Forwarding_Discriminator_Iterator public: Event_Forwarding_Discriminator_Iterator (Event_Forwarding_Discriminator &mm); int next (Consumer_Dispatch_Set *&); - int advance (void); + int advance (); private: /// Map we are iterating over. diff --git a/ACE/apps/Gateway/Gateway/File_Parser.cpp b/ACE/apps/Gateway/Gateway/File_Parser.cpp index d301b408efc..9145d20e03e 100644 --- a/ACE/apps/Gateway/Gateway/File_Parser.cpp +++ b/ACE/apps/Gateway/Gateway/File_Parser.cpp @@ -13,7 +13,7 @@ typedef FPRT::Return_Type FP_RETURN_TYPE; // File_Parser stuff. template <class ENTRY> -File_Parser<ENTRY>::~File_Parser (void) +File_Parser<ENTRY>::~File_Parser () { } @@ -28,7 +28,7 @@ File_Parser<ENTRY>::open (const ACE_TCHAR filename[]) } template <class ENTRY> int -File_Parser<ENTRY>::close (void) +File_Parser<ENTRY>::close () { return ACE_OS::fclose (this->infile_); } @@ -140,7 +140,7 @@ File_Parser<ENTRY>::comments (char ch) } template <class ENTRY> int -File_Parser<ENTRY>::skipline (void) +File_Parser<ENTRY>::skipline () { // Skip the remainder of the line. diff --git a/ACE/apps/Gateway/Gateway/File_Parser.h b/ACE/apps/Gateway/Gateway/File_Parser.h index 2ca3f86e79c..09733640cd2 100644 --- a/ACE/apps/Gateway/Gateway/File_Parser.h +++ b/ACE/apps/Gateway/Gateway/File_Parser.h @@ -48,11 +48,11 @@ class File_Parser { public: /// Destructor. - virtual ~File_Parser (void); + virtual ~File_Parser (); // = Open and Close the file specified int open (const ACE_TCHAR filename[]); - int close (void); + int close (); virtual FPRT::Return_Type read_entry (ENTRY &entry, int &line_number) = 0; @@ -82,7 +82,7 @@ protected: /// Skips to the remainder of a line, e.g., when we find a comment /// character. - int skipline (void); + int skipline (); /// Pointer to the file we're reading. FILE *infile_; diff --git a/ACE/apps/Gateway/Gateway/Gateway.cpp b/ACE/apps/Gateway/Gateway/Gateway.cpp index a711cd4d7a8..e1275482a6d 100644 --- a/ACE/apps/Gateway/Gateway/Gateway.cpp +++ b/ACE/apps/Gateway/Gateway/Gateway.cpp @@ -29,10 +29,10 @@ protected: // = Configuration methods. // Parse the proxy configuration file. - int parse_connection_config_file (void); + int parse_connection_config_file (); // Parse the consumer configuration file. - int parse_consumer_config_file (void); + int parse_consumer_config_file (); // = Lifecycle management methods. // Shut down the Gateway when input comes in from the controlling @@ -135,7 +135,7 @@ Gateway::init (int argc, ACE_TCHAR *argv[]) // This method is automatically called when the Gateway is shutdown. int -Gateway::fini (void) +Gateway::fini () { // Remove the handler that receive events on stdin. Otherwise, we // will crash on shutdown. @@ -170,7 +170,7 @@ Gateway::info (ACE_TCHAR **strp, size_t length) const // Parse and build the proxy table. int -Gateway::parse_connection_config_file (void) +Gateway::parse_connection_config_file () { // File that contains the proxy configuration information. Connection_Config_File_Parser connection_file; @@ -256,7 +256,7 @@ Gateway::parse_connection_config_file (void) } int -Gateway::parse_consumer_config_file (void) +Gateway::parse_consumer_config_file () { // File that contains the consumer event forwarding information. Consumer_Config_File_Parser consumer_file; diff --git a/ACE/apps/Gateway/Gateway/Options.cpp b/ACE/apps/Gateway/Gateway/Options.cpp index a0f8edcf8ab..d844e0549e8 100644 --- a/ACE/apps/Gateway/Gateway/Options.cpp +++ b/ACE/apps/Gateway/Gateway/Options.cpp @@ -14,7 +14,7 @@ Options *Options::instance_ = 0; // Let's have a usage prompt. void -Options::print_usage (void) +Options::print_usage () { ACE_DEBUG ((LM_INFO, "gatewayd [-a {C|S}:acceptor-port] [-c {C|S}:connector-port]" @@ -36,7 +36,7 @@ Options::print_usage (void) )); } Options * -Options::instance (void) +Options::instance () { if (Options::instance_ == 0) ACE_NEW_RETURN (Options::instance_, Options, 0); @@ -44,7 +44,7 @@ Options::instance (void) return Options::instance_; } -Options::Options (void) +Options::Options () : locking_strategy_ (0), performance_window_ (0), blocking_semantics_ (ACE_NONBLOCK), @@ -69,7 +69,7 @@ Options::enabled (int option) const return ACE_BIT_ENABLED (this->options_, option); } -Options::~Options (void) +Options::~Options () { delete this->locking_strategy_; } @@ -93,7 +93,7 @@ Options::performance_window () const } CONNECTION_ID & -Options::connection_id (void) +Options::connection_id () { return this->connection_id_; } diff --git a/ACE/apps/Gateway/Gateway/Options.h b/ACE/apps/Gateway/Gateway/Options.h index 5ba13c7a5e8..a6b2aef20fe 100644 --- a/ACE/apps/Gateway/Gateway/Options.h +++ b/ACE/apps/Gateway/Gateway/Options.h @@ -49,10 +49,10 @@ public: }; /// Return Singleton. - static Options *instance (void); + static Options *instance (); /// Termination. - ~Options (void); + ~Options (); /// Parse the arguments and set the options. int parse_args (int argc, ACE_TCHAR *argv[]); @@ -62,7 +62,7 @@ public: * = Accessor methods. * Determine if an option is enabled. */ - void print_usage(void); + void print_usage(); int enabled (int option) const; /** @@ -125,7 +125,7 @@ public: long max_queue_size () const; /// Returns a reference to the next available connection id; - CONNECTION_ID &connection_id (void); + CONNECTION_ID &connection_id (); private: enum @@ -138,7 +138,7 @@ private: }; /// Initialization. - Options (void); + Options (); /// Options Singleton instance. static Options *instance_; diff --git a/ACE/apps/Gateway/Peer/Options.cpp b/ACE/apps/Gateway/Peer/Options.cpp index 2a849effa2e..8874d671051 100644 --- a/ACE/apps/Gateway/Peer/Options.cpp +++ b/ACE/apps/Gateway/Peer/Options.cpp @@ -12,14 +12,14 @@ Options *Options::instance_ = 0; void -Options::print_usage_and_die (void) +Options::print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%n [-a {C|S}:acceptor-port] [-c {C|S}:connector-port] [-C connection-id] [-h gateway-host] [-q max-queue-size] [-t timeout] [-v]\n"))); ACE_OS::exit (1); } -Options::Options (void) +Options::Options () : options_ (0), supplier_acceptor_port_ (DEFAULT_PEER_SUPPLIER_PORT), consumer_acceptor_port_ (DEFAULT_PEER_CONSUMER_PORT), @@ -39,7 +39,7 @@ Options::Options (void) } Options * -Options::instance (void) +Options::instance () { if (Options::instance_ == 0) ACE_NEW_RETURN (Options::instance_, Options, 0); @@ -54,7 +54,7 @@ Options::timeout () const } CONNECTION_ID & -Options::connection_id (void) +Options::connection_id () { return this->connection_id_; } diff --git a/ACE/apps/Gateway/Peer/Options.h b/ACE/apps/Gateway/Peer/Options.h index 0d9613f0234..987a69c75b4 100644 --- a/ACE/apps/Gateway/Peer/Options.h +++ b/ACE/apps/Gateway/Peer/Options.h @@ -34,7 +34,7 @@ public: }; /// Return Singleton. - static Options *instance (void); + static Options *instance (); /// Parse the arguments and set the options. void parse_args (int argc, ACE_TCHAR *argv[]); @@ -76,7 +76,7 @@ public: long max_queue_size () const; /// Returns a reference to the connection id. - CONNECTION_ID &connection_id (void); + CONNECTION_ID &connection_id (); private: enum @@ -91,10 +91,10 @@ private: }; /// Ensure Singleton. - Options (void); + Options (); /// Explain usage and exit. - void print_usage_and_die (void); + void print_usage_and_die (); /// Singleton. static Options *instance_; diff --git a/ACE/apps/Gateway/Peer/Peer.cpp b/ACE/apps/Gateway/Peer/Peer.cpp index 56542dca89e..d40348c792f 100644 --- a/ACE/apps/Gateway/Peer/Peer.cpp +++ b/ACE/apps/Gateway/Peer/Peer.cpp @@ -6,7 +6,7 @@ #include "ace/Signal.h" #include "Peer.h" -Peer_Handler::Peer_Handler (void) +Peer_Handler::Peer_Handler () : connection_id_ (-1), // Maybe it's better than 0. msg_frag_ (0), total_bytes_ (0) @@ -106,7 +106,7 @@ Peer_Handler::transmit (ACE_Message_Block *mb, // Read events from stdin and send them to the gatewayd. int -Peer_Handler::transmit_stdin (void) +Peer_Handler::transmit_stdin () { // If return value is -1, then first_time_ must be reset to 1. int result = 0; @@ -482,7 +482,7 @@ Peer_Handler::handle_input (ACE_HANDLE sd) // Action that receives our connection id from the Gateway. int -Peer_Handler::await_connection_id (void) +Peer_Handler::await_connection_id () { ssize_t n = this->peer ().recv (&this->connection_id_, sizeof this->connection_id_); @@ -543,7 +543,7 @@ Peer_Handler::await_connection_id (void) } int -Peer_Handler::subscribe (void) +Peer_Handler::subscribe () { ACE_Message_Block *mb = 0; @@ -562,7 +562,7 @@ Peer_Handler::subscribe (void) // Action that receives events from the Gateway. int -Peer_Handler::await_events (void) +Peer_Handler::await_events () { ACE_Message_Block *mb = 0; @@ -619,7 +619,7 @@ Peer_Handler::handle_timeout (const ACE_Time_Value &, return this->handle_close (); } -Peer_Handler::~Peer_Handler (void) +Peer_Handler::~Peer_Handler () { // Shut down the handler. this->handle_close (); @@ -692,13 +692,13 @@ Peer_Acceptor::start (u_short port) return 0; } -Peer_Acceptor::Peer_Acceptor (void) +Peer_Acceptor::Peer_Acceptor () : peer_handler_ (0) { } int -Peer_Acceptor::close (void) +Peer_Acceptor::close () { // Will trigger a delete. if (this->peer_handler_ != 0) @@ -822,7 +822,7 @@ Peer_Factory::info (ACE_TCHAR **strp, size_t length) const // the peer. int -Peer_Factory::fini (void) +Peer_Factory::fini () { this->consumer_acceptor_.close (); this->supplier_acceptor_.close (); diff --git a/ACE/apps/Gateway/Peer/Peer.h b/ACE/apps/Gateway/Peer/Peer.h index 2cc6c0da1b1..7d849384c8a 100644 --- a/ACE/apps/Gateway/Peer/Peer.h +++ b/ACE/apps/Gateway/Peer/Peer.h @@ -72,10 +72,10 @@ class ACE_Svc_Export Peer_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_ { public: /// Initialize the peer. - Peer_Handler (void); + Peer_Handler (); /// Shutdown the Peer. - ~Peer_Handler (void); + ~Peer_Handler (); /// Initialize the handler when called by /// <ACE_Acceptor::handle_input>. @@ -118,21 +118,21 @@ protected: virtual int nonblk_put (ACE_Message_Block *mb); /// Register Consumer subscriptions with the gateway. - int subscribe (void); + int subscribe (); // = Event/state/action handlers. /// Receive a event from stdin and send it to the gateway. - int transmit_stdin (void); + int transmit_stdin (); /// Action that receives the route id. - int await_connection_id (void); + int await_connection_id (); /// Action that receives events. - int await_events (void); + int await_events (); /// Pointer-to-member-function for the current action to run in this /// state. This points to one of the preceding 3 methods. - int (Peer_Handler::*do_action_)(void); + int (Peer_Handler::*do_action_)(); /// Connection ID of the peer, which is obtained from the gatewayd. CONNECTION_ID connection_id_; @@ -164,13 +164,13 @@ class ACE_Svc_Export Peer_Acceptor : public ACE_Acceptor<Peer_Handler, ACE_SOCK_ { public: /// Default initialization. - Peer_Acceptor (void); + Peer_Acceptor (); /// the <Peer_Acceptor>. int start (u_short); /// Terminate the <Peer_Acceptor>. - int close (void); + int close (); /// Factory method that creates a <Peer_Handler> just once. virtual int make_svc_handler (Peer_Handler *&); |