diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-20 02:34:57 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-20 02:34:57 +0000 |
| commit | 5c1001ce4f585836e1f83c28d1df89aee42fb743 (patch) | |
| tree | 5967e9ca7d44ed1d2823be9746817ebb8e025f5d /ace | |
| parent | 2ae14b2b85ad813a269e8a5529aa76cf984fa8a5 (diff) | |
| download | ATCD-5c1001ce4f585836e1f83c28d1df89aee42fb743.tar.gz | |
changed include protection from #if !defined to ifndef, and added #pragma once, if possible
Diffstat (limited to 'ace')
211 files changed, 2995 insertions, 2831 deletions
diff --git a/ace/ACE.h b/ace/ACE.h index 4f077e8da59..2b089ca2808 100644 --- a/ace/ACE.h +++ b/ace/ACE.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // ACE.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ // This #include must come first to avoid recursive include problems. @@ -21,7 +21,7 @@ #define ACE_ACE_H #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ // Forward declarations. @@ -71,31 +71,31 @@ public: // E.g., the "0" in SunPro C++ 4.32.0 // = Recv operations that factor out differences between Win32 and UNIX. - static ssize_t recv (ACE_HANDLE handle, - void *buf, - size_t len, + static ssize_t recv (ACE_HANDLE handle, + void *buf, + size_t len, int flags); // Receive up to <len> bytes into <buf> from <handle> (uses the // <ACE_OS::recv> call). - static ssize_t recv (ACE_HANDLE handle, - void *buf, + static ssize_t recv (ACE_HANDLE handle, + void *buf, size_t len); // Receive up to <len> bytes into <buf> from <handle> (uses the // <ACE_OS::read> system call on UNIX and the <ACE_OS::recv> call on // Win32). // = Recv operations that receive exactly n bytes. - static ssize_t recv_n (ACE_HANDLE handle, - void *buf, - size_t len, + static ssize_t recv_n (ACE_HANDLE handle, + void *buf, + size_t len, int flags); // Receive <len> bytes into <buf> from <handle> (uses the // <ACE_OS::recv> call). If <handle> is set to non-blocking mode // this call will poll until all <len> bytes are received. - static ssize_t recv_n (ACE_HANDLE handle, - void *buf, + static ssize_t recv_n (ACE_HANDLE handle, + void *buf, size_t len); // Receive <len> bytes into <buf> from <handle> (uses the // <ACE_OS::read> system call on UNIX and the <ACE_OS::recv> call on @@ -103,9 +103,9 @@ public: // poll until all <len> bytes are received. // = Timed <recv> operations. - static ssize_t recv (ACE_HANDLE handle, - void *buf, - size_t len, + static ssize_t recv (ACE_HANDLE handle, + void *buf, + size_t len, int flags, const ACE_Time_Value *timeout); // Wait up to <timeout> amount of time to receive up to <len> bytes @@ -116,9 +116,9 @@ public: // elapses). If <recv> times out a -1 is returned with <errno == // ETIME>. If it succeeds the number of bytes received is returned. - static ssize_t recv (ACE_HANDLE handle, - void *buf, - size_t len, + static ssize_t recv (ACE_HANDLE handle, + void *buf, + size_t len, const ACE_Time_Value *timeout); // Wait up to <timeout> amount of time to receive up to <len> bytes // into <buf> from <handle> (uses the <ACE_OS::read> call). The @@ -142,7 +142,7 @@ public: static ssize_t recvfrom (ACE_HANDLE handle, char *buf, - int len, + int len, int flags, struct sockaddr *addr, int *addrlen, @@ -156,9 +156,9 @@ public: // == ETIME>. If it succeeds the number of bytes received is // returned. - static ssize_t recv_n (ACE_HANDLE handle, - void *buf, - size_t len, + static ssize_t recv_n (ACE_HANDLE handle, + void *buf, + size_t len, int flags, const ACE_Time_Value *timeout); // Try to recv exactly <len> bytes into <buf> from <handle> (uses @@ -171,9 +171,9 @@ public: // <recv_n> return <len> (i.e., the number of bytes requested to be // read). - static ssize_t recv_n (ACE_HANDLE handle, - void *buf, - size_t len, + static ssize_t recv_n (ACE_HANDLE handle, + void *buf, + size_t len, const ACE_Time_Value *timeout); // Try to recv exactly <len> bytes into <buf> from <handle> (uses // the <ACE_OS::recv> call). The <timeout> indicates how long to @@ -186,31 +186,31 @@ public: // read). // = Send operations that factor out differences between Win32 and UNIX. - static ssize_t send (ACE_HANDLE handle, - const void *buf, - size_t len, + static ssize_t send (ACE_HANDLE handle, + const void *buf, + size_t len, int flags); // Send up to <len> bytes into <buf> from <handle> (uses the // <ACE_OS::send> call). - static ssize_t send (ACE_HANDLE handle, - const void *buf, + static ssize_t send (ACE_HANDLE handle, + const void *buf, size_t len); // Send up to <len> bytes into <buf> from <handle> (uses the // <ACE_OS::write> system call on UNIX and the <ACE_OS::send> call // on Win32). // = Send operations that send exactly n bytes. - static ssize_t send_n (ACE_HANDLE handle, - const void *buf, - size_t len, + static ssize_t send_n (ACE_HANDLE handle, + const void *buf, + size_t len, int flags); // Send <len> bytes from <buf> to <handle> (uses the <ACE_OS::send> // system call). If <handle> is set to non-blocking mode this call // will poll until all <len> bytes are sent. - static ssize_t send_n (ACE_HANDLE handle, - const void *buf, + static ssize_t send_n (ACE_HANDLE handle, + const void *buf, size_t len); // Send <len> bytes from <buf> to <handle> (uses the <ACE_OS::write> // system call on UNIX and the <ACE_OS::recv> call on Win32). If @@ -218,9 +218,9 @@ public: // all <len> bytes are sent. // = Timed <send> operations. - static ssize_t send (ACE_HANDLE handle, - const void *buf, - size_t len, + static ssize_t send (ACE_HANDLE handle, + const void *buf, + size_t len, const ACE_Time_Value *timeout); // Wait up to <timeout> amount of time to send up to <len> bytes // into <buf> from <handle> (uses the <ACE_OS::write> system call on @@ -231,9 +231,9 @@ public: // <send> times out a -1 is returned with <errno == ETIME>. If it // succeeds the number of bytes sent is returned. - static ssize_t send (ACE_HANDLE handle, - const void *buf, - size_t len, + static ssize_t send (ACE_HANDLE handle, + const void *buf, + size_t len, int flags, const ACE_Time_Value *timeout); // Wait up to <timeout> amount of time to send up to <len> bytes @@ -244,8 +244,8 @@ public: // elapses). If <send> times out a -1 is returned with <errno == // ETIME>. If it succeeds the number of bytes sent is returned. - static ssize_t sendmsg (ACE_HANDLE handle, - const struct msghdr *msg, + static ssize_t sendmsg (ACE_HANDLE handle, + const struct msghdr *msg, int flags, const ACE_Time_Value *timeout); // Wait up to <timeout> amount of time to send the <msg> to <handle> @@ -258,7 +258,7 @@ public: static ssize_t sendto (ACE_HANDLE handle, const char *buf, - int len, + int len, int flags, const struct sockaddr *addr, int addrlen, @@ -271,9 +271,9 @@ public: // elapses). If <sendto> times out a -1 is returned with <errno == // ETIME>. If it succeeds the number of bytes sent is returned. - static ssize_t send_n (ACE_HANDLE handle, - const void *buf, - size_t len, + static ssize_t send_n (ACE_HANDLE handle, + const void *buf, + size_t len, int flags, const ACE_Time_Value *timeout); // Try to send exactly <len> bytes into <buf> from <handle> (uses @@ -286,9 +286,9 @@ public: // <send_n> return <len> (i.e., the number of bytes requested to be // sent). - static ssize_t send_n (ACE_HANDLE handle, - const void *buf, - size_t len, + static ssize_t send_n (ACE_HANDLE handle, + const void *buf, + size_t len, const ACE_Time_Value *timeout); // Try to send exactly <len> bytes into <buf> from <handle> (uses // the <ACE_OS::send> call). The <timeout> indicates how long to @@ -302,7 +302,7 @@ public: // = Timed Scatter-read and gather-write functions. - static ssize_t writev (ACE_HANDLE handle, + static ssize_t writev (ACE_HANDLE handle, const iovec *iov, int iovcnt, const ACE_Time_Value *timeout); @@ -335,8 +335,8 @@ public: // These encapsulate differences between UNIX and Win32 and also // send and recv exactly n bytes. - static ssize_t read_n (ACE_HANDLE handle, - void *buf, + static ssize_t read_n (ACE_HANDLE handle, + void *buf, size_t len); // Receive <len> bytes into <buf> from <handle> (uses the // <ACE_OS::read> call, which uses the <read> system call on UNIX @@ -344,8 +344,8 @@ public: // non-blocking mode this call will poll until all <len> bytes are // received. - static ssize_t write_n (ACE_HANDLE handle, - const void *buf, + static ssize_t write_n (ACE_HANDLE handle, + const void *buf, size_t len); // Send <len> bytes from <buf> to <handle> (uses the <ACE_OS::write> // calls, which is uses the <write> system call on UNIX and the @@ -369,7 +369,7 @@ public: // socket internally (and free it). Returns -1 on failure and 0 on // success. - static int get_ip_interfaces (size_t &count, + static int get_ip_interfaces (size_t &count, ACE_INET_Addr *&addr_array); // Return count and array of all configured IP interfaces on this // host, rc = 0 on success (count == number of interfaces else -1). @@ -386,13 +386,13 @@ public: // made. Caller must <close> the handle. static int handle_timed_accept (ACE_HANDLE listener, - ACE_Time_Value *timeout, + ACE_Time_Value *timeout, int restart); // Wait up to <timeout> amount of time to passively establish a // connection. This method doesn't perform the <accept>, it just // does the timed wait... - static ACE_HANDLE handle_timed_complete (ACE_HANDLE listener, + static ACE_HANDLE handle_timed_complete (ACE_HANDLE listener, ACE_Time_Value *timeout, int is_tli = 0); // Wait up to <timeout> amount of time to complete an actively @@ -404,18 +404,18 @@ public: static ACE_HANDLE handle_timed_open (ACE_Time_Value *timeout, LPCTSTR name, - int flags, + int flags, int perms); // Wait up to <timeout> amount of time to actively open a device. // This method doesn't perform the <connect>, it just does the timed // wait... // = Set/get/clear various flags related to I/O HANDLE. - static int set_flags (ACE_HANDLE handle, + static int set_flags (ACE_HANDLE handle, int flags); // Set flags associated with <handle>. - static int clr_flags (ACE_HANDLE handle, + static int clr_flags (ACE_HANDLE handle, int flags); // Clear flags associated with <handle>. @@ -454,7 +454,7 @@ public: // new> rather than <malloc>. # if defined (ACE_WIN32) - static wchar_t *strnew (const wchar_t *s); + static wchar_t *strnew (const wchar_t *s); // This method is just like <strdup>, except that it uses <operator // new> rather than <malloc>. #endif /* ACE_WIN32 */ @@ -486,7 +486,7 @@ public: // "<pathname>.exe". Always returns <pathname> on UNIX. static const char *basename (const char *pathname, - char delim); + char delim); // Returns the "basename" of a <pathname>. #if defined (ACE_HAS_UNICODE) @@ -503,7 +503,7 @@ public: static const wchar_t *execname (const wchar_t *pathname); static const wchar_t *basename (const wchar_t *pathname, - wchar_t delim); + wchar_t delim); // Returns the "basename" of a <pathname>. #endif /* ACE_HAS_UNICODE */ @@ -522,8 +522,8 @@ public: // = Methods for searching and opening shared libraries. - static int ldfind (const ASYS_TCHAR *filename, - ASYS_TCHAR *pathname, + static int ldfind (const ASYS_TCHAR *filename, + ASYS_TCHAR *pathname, size_t maxlen); // Finds the file <filename> either using an absolute path or using // a relative path in conjunction with ACE_LD_SEARCH_PATH (e.g., @@ -534,17 +534,17 @@ public: // Win32) if the <filename> doesn't match directly. static FILE *ldopen (const ASYS_TCHAR *filename, - const ASYS_TCHAR *type); + const ASYS_TCHAR *type); // Uses <ldopen> to locate and open the appropriate <filename> and // returns a pointer to the file, else it returns a NULL // pointer. <type> specifies how the file should be open. static ACE_HANDLE open_temp_file (const char *name, - int mode, + int mode, int perm = 0); // Opening the temp file. File is automagically unlinked when it is // closed. This is useful for have temp files. - + // = Shield us from Win32's inability to select on STDIN. // = Miscelleous functions. @@ -605,7 +605,7 @@ public: // may not have a chance to cleanup before it shuts down. static void unique_name (const void *object, - LPTSTR name, + LPTSTR name, size_t length); // This method uses process id and object pointer to come up with a // machine wide unique name. The process ID will provide uniqueness diff --git a/ace/ARGV.h b/ace/ARGV.h index 73db55ddd99..9edebe6c1e7 100644 --- a/ace/ARGV.h +++ b/ace/ARGV.h @@ -5,25 +5,26 @@ // // = LIBRARY // ace -// +// // = FILENAME // ARGV.h // // = AUTHOR // Doug Schmidt, Everett Anderson -// +// // ============================================================================ #ifndef ACE_ARGUMENT_VECTOR_H #define ACE_ARGUMENT_VECTOR_H #include "ace/ACE.h" -#include "ace/Containers.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Containers.h" + class ACE_Export ACE_ARGV { // = TITLE @@ -62,7 +63,7 @@ public: // = Accessor arguments. const ASYS_TCHAR *operator[] (size_t index); - // Returns the <index>th string in the ARGV array. + // Returns the <index>th string in the ARGV array. ASYS_TCHAR **argv (void); // Returns the <argv> array. Caller should not delete this memory @@ -71,7 +72,7 @@ public: // saved to the queue. size_t argc (void) const; - // Returns <argc>. + // Returns <argc>. const ASYS_TCHAR *buf (void); // Returns the <buf>. Caller should not delete this memory since @@ -90,13 +91,13 @@ public: // What state is this ACE_ARGV in? // These are the states possible via the different constructors. - enum States + enum States { - TO_STRING = 1, + TO_STRING = 1, // ACE_ARGV converts buf[] to ASYS_TCHAR *argv[] - TO_PTR_ARRAY = 2, + TO_PTR_ARRAY = 2, // ACE_ARGV converts ASYS_TCHAR *argv[] to buf[] - ITERATIVE = 3 + ITERATIVE = 3 // Builds buf[] or ASYS_TCHAR *argv[] iteratively with add() }; @@ -109,7 +110,7 @@ private: // Converts buf_ into the ASYS_TCHAR *argv[] format. int argv_to_string (ASYS_TCHAR **argv, ASYS_TCHAR *&buf); - // Returns the string created from argv in buf and + // Returns the string created from argv in buf and // returns the number of arguments. int substitute_env_args_; @@ -119,10 +120,10 @@ private: // Current state marker. size_t argc_; - // Number of arguments in the ARGV array. + // Number of arguments in the ARGV array. ASYS_TCHAR **argv_; - // The array of string arguments. + // The array of string arguments. ASYS_TCHAR *buf_; // Buffer containing the <argv> contents. diff --git a/ace/Acceptor.h b/ace/Acceptor.h index 09739f5e817..d42360a35e8 100644 --- a/ace/Acceptor.h +++ b/ace/Acceptor.h @@ -5,27 +5,28 @@ // // = LIBRARY // ace -// +// // = FILENAME // Acceptor.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_ACCEPTOR_H #define ACE_ACCEPTOR_H #include "ace/Service_Config.h" -#include "ace/Service_Object.h" -#include "ace/Svc_Handler.h" -#include "ace/Strategies.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Service_Object.h" +#include "ace/Svc_Handler.h" +#include "ace/Strategies.h" + template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> class ACE_Acceptor : public ACE_Service_Object { @@ -52,13 +53,13 @@ class ACE_Acceptor : public ACE_Service_Object // a group. public: // = Initialization and termination methods. - ACE_Acceptor (ACE_Reactor * = 0, + ACE_Acceptor (ACE_Reactor * = 0, int use_select = 1); // "Do-nothing" constructor. ACE_Acceptor (const ACE_PEER_ACCEPTOR_ADDR &local_addr, - ACE_Reactor * = ACE_Reactor::instance (), - int flags = 0, + ACE_Reactor * = ACE_Reactor::instance (), + int flags = 0, int use_select = 1, int reuse_addr = 1); // Initialize and register <this> with the Reactor and listen for @@ -72,9 +73,9 @@ public: // <PEER_ACCEPTOR>. If it is non-zero this will allow the OS to // reuse this listen port. - int open (const ACE_PEER_ACCEPTOR_ADDR &, - ACE_Reactor * = ACE_Reactor::instance (), - int flags = 0, + int open (const ACE_PEER_ACCEPTOR_ADDR &, + ACE_Reactor * = ACE_Reactor::instance (), + int flags = 0, int use_select = 1, int reuse_addr = 1); // Initialize and register <this> with the Reactor and listen for @@ -138,8 +139,8 @@ protected: // multi-processing). // = Demultiplexing hooks. - virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); + virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, + ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); // Perform termination activities when <this> is removed from the // <reactor>. @@ -198,32 +199,32 @@ class ACE_Strategy_Acceptor : public ACE_Acceptor <SVC_HANDLER, ACE_PEER_ACCEPTO public: // = Initialization and termination methods. ACE_Strategy_Acceptor (const ASYS_TCHAR service_name[] = 0, - const ASYS_TCHAR service_description[] = 0, + const ASYS_TCHAR service_description[] = 0, int use_select = 1); // Default constructor. ACE_Strategy_Acceptor (const ACE_PEER_ACCEPTOR_ADDR &local_addr, - ACE_Reactor * = ACE_Reactor::instance (), - ACE_Creation_Strategy<SVC_HANDLER> * = 0, - ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> * = 0, - ACE_Concurrency_Strategy<SVC_HANDLER> * = 0, - ACE_Scheduling_Strategy<SVC_HANDLER> * = 0, - const ASYS_TCHAR service_name[] = 0, - const ASYS_TCHAR service_description[] = 0, + ACE_Reactor * = ACE_Reactor::instance (), + ACE_Creation_Strategy<SVC_HANDLER> * = 0, + ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> * = 0, + ACE_Concurrency_Strategy<SVC_HANDLER> * = 0, + ACE_Scheduling_Strategy<SVC_HANDLER> * = 0, + const ASYS_TCHAR service_name[] = 0, + const ASYS_TCHAR service_description[] = 0, int use_select = 1); // Initialize the appropriate strategies for creation, passive // connection acceptance, and concurrency, and then register <this> // with the Reactor and listen for connection requests at the // designated <local_addr>. - int open (const ACE_PEER_ACCEPTOR_ADDR &, - ACE_Reactor * = ACE_Reactor::instance (), - ACE_Creation_Strategy<SVC_HANDLER> * = 0, - ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> * = 0, - ACE_Concurrency_Strategy<SVC_HANDLER> * = 0, - ACE_Scheduling_Strategy<SVC_HANDLER> * = 0, - const ASYS_TCHAR *service_name = 0, - const ASYS_TCHAR *service_description = 0, + int open (const ACE_PEER_ACCEPTOR_ADDR &, + ACE_Reactor * = ACE_Reactor::instance (), + ACE_Creation_Strategy<SVC_HANDLER> * = 0, + ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> * = 0, + ACE_Concurrency_Strategy<SVC_HANDLER> * = 0, + ACE_Scheduling_Strategy<SVC_HANDLER> * = 0, + const ASYS_TCHAR *service_name = 0, + const ASYS_TCHAR *service_description = 0, int use_select = 1); // Initialize the appropriate strategies for creation, passive // connection acceptance, and concurrency, and then register <this> @@ -296,7 +297,7 @@ protected: // = Demultiplexing hooks. virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); + ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); // Perform termination activities when <this> is removed from the // <Reactor>. @@ -368,7 +369,7 @@ class ACE_Oneshot_Acceptor : public ACE_Service_Object // = DESCRIPTION // This class works similarly to the regular <ACE_Acceptor>, // with the following differences: - // + // // 1. This class doesn't automagically register <this> with the // <ACE_Reactor> since it expects to have its <accept> method // called directly. However, it stashes the <ACE_Reactor> @@ -387,8 +388,8 @@ public: // Constructor. ACE_Oneshot_Acceptor (const ACE_PEER_ACCEPTOR_ADDR &local_addr, - ACE_Reactor *reactor = ACE_Reactor::instance (), - ACE_Concurrency_Strategy<SVC_HANDLER> * = 0); + ACE_Reactor *reactor = ACE_Reactor::instance (), + ACE_Concurrency_Strategy<SVC_HANDLER> * = 0); // Initialize the appropriate strategies for concurrency and then // open the <peer_acceptor> at the designated <local_addr>. Note // that unlike the <ACE_Acceptor> and <ACE_Strategy_Acceptor>, this @@ -396,9 +397,9 @@ public: // this point -- it just stashes the <reactor> away in case it's // needed later. - int open (const ACE_PEER_ACCEPTOR_ADDR &, - ACE_Reactor *reactor = ACE_Reactor::instance (), - ACE_Concurrency_Strategy<SVC_HANDLER> * = 0); + int open (const ACE_PEER_ACCEPTOR_ADDR &, + ACE_Reactor *reactor = ACE_Reactor::instance (), + ACE_Concurrency_Strategy<SVC_HANDLER> * = 0); // Initialize the appropriate strategies for concurrency and then // open the <peer_acceptor> at the designated <local_addr>. Note // that unlike the <ACE_Acceptor> and <ACE_Strategy_Acceptor>, this @@ -411,13 +412,13 @@ public: // = Explicit factory operation. virtual int accept (SVC_HANDLER * = 0, - ACE_PEER_ACCEPTOR_ADDR *remote_addr = 0, - const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults, - int restart = 1, + ACE_PEER_ACCEPTOR_ADDR *remote_addr = 0, + const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults, + int restart = 1, int reset_new_handle = 0); // Create a <SVC_HANDLER>, accept the connection into the // <SVC_HANDLER>, and activate the <SVC_HANDLER>. - + virtual int cancel (void); // Cancel a oneshot acceptor that was started asynchronously. @@ -446,9 +447,9 @@ protected: // object" via multi-threading or multi-processing). int shared_accept (SVC_HANDLER *svc_handler, - ACE_PEER_ACCEPTOR_ADDR *remote_addr, - ACE_Time_Value *timeout, - int restart, + ACE_PEER_ACCEPTOR_ADDR *remote_addr, + ACE_Time_Value *timeout, + int restart, int reset_new_handle); // Factors out the code shared between the <accept> and // <handle_input> methods. @@ -458,16 +459,16 @@ protected: // Returns the listening acceptor's <ACE_HANDLE>. virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); + ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); // Perform termination activities when <this> is removed from the // <reactor>. - + virtual int handle_input (ACE_HANDLE); // Accept one connection from a client and activates the - // SVC_HANDLER. + // SVC_HANDLER. - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); + virtual int handle_timeout (const ACE_Time_Value &tv, + const void *arg); // Called when an acceptor times out... // = Dynamic linking hooks. @@ -493,8 +494,8 @@ protected: private: int register_handler (SVC_HANDLER *svc_handler, - const ACE_Synch_Options &options, - int restart); + const ACE_Synch_Options &options, + int restart); // Insert ourselves into the <ACE_Reactor> so that we can continue // accepting this connection asynchronously. This method should NOT // be called by developers directly. diff --git a/ace/Activation_Queue.h b/ace/Activation_Queue.h index 5913142b9e4..c2e9b232269 100644 --- a/ace/Activation_Queue.h +++ b/ace/Activation_Queue.h @@ -5,27 +5,28 @@ // // = LIBRARY // ace -// +// // = FILENAME // Activation_Queue.h // // = AUTHOR // Andres Kruse <Andres.Kruse@cern.ch> and Douglas C. Schmidt -// <schmidt@cs.wustl.edu> -// +// <schmidt@cs.wustl.edu> +// // ============================================================================ #ifndef ACE_ACTIVATION_QUEUE_H #define ACE_ACTIVATION_QUEUE_H #include "ace/Synch_T.h" -#include "ace/Message_Queue.h" -#include "ace/Method_Request.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Message_Queue.h" +#include "ace/Method_Request.h" + class ACE_Export ACE_Activation_Queue { // = TITLE @@ -56,8 +57,8 @@ public: ACE_Method_Request *dequeue (ACE_Time_Value *tv = 0); // Dequeue the next available <Method_Request>. - int enqueue (ACE_Method_Request *new_method_request, - ACE_Time_Value *tv = 0); + int enqueue (ACE_Method_Request *new_method_request, + ACE_Time_Value *tv = 0); // Enqueue the <Method_Request> in priority order. The priority is // determined by the <priority> method of the <new_message_request>. @@ -70,7 +71,7 @@ public: protected: ACE_Message_Queue<ACE_SYNCH> *queue_; // Stores the <Method_Requests>. - + int delete_queue_; // Keeps track of whether we need to delete the queue. }; diff --git a/ace/Addr.h b/ace/Addr.h index 4e2985bf98b..1d9a2051ed8 100644 --- a/ace/Addr.h +++ b/ace/Addr.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Addr.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_ADDR_H @@ -20,10 +20,10 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class ACE_Export ACE_Addr +class ACE_Export ACE_Addr { // = TITLE // Defines the base class for the "address family independent" @@ -32,26 +32,26 @@ public: // = Initialization and termination methods. ACE_Addr (int type = -1, int size = -1); - // Initializes instance variables. + // Initializes instance variables. virtual ~ACE_Addr (void); // Destructor. - // = Get/set the size of the address. + // = Get/set the size of the address. int get_size (void) const; // Return the size of the address. void set_size (int size); - // Sets the size of the address. + // Sets the size of the address. - // = Get/set the type of the address. + // = Get/set the type of the address. int get_type (void) const; - // Get the type of the address. + // Get the type of the address. void set_type (int type); - // Set the type of the address. + // Set the type of the address. virtual void *get_addr (void) const; // Return a pointer to the address. @@ -93,10 +93,10 @@ public: // Declare the dynamic allocation hooks. protected: - int addr_type_; + int addr_type_; // e.g., AF_UNIX, AF_INET, AF_SPIPE, etc. - int addr_size_; + int addr_size_; // Number of bytes in the address. }; diff --git a/ace/Arg_Shifter.h b/ace/Arg_Shifter.h index 49675d227a4..7209b67eab8 100644 --- a/ace/Arg_Shifter.h +++ b/ace/Arg_Shifter.h @@ -3,15 +3,15 @@ // ======================================================================== // -// = LIBRARY +// = LIBRARY // ace -// -// = FILENAME +// +// = FILENAME // Arg_Shifter.h -// -// = AUTHOR -// Seth Widoff -// +// +// = AUTHOR +// Seth Widoff +// // ======================================================================== #ifndef ACE_ARG_SHIFTER_H @@ -44,10 +44,10 @@ public: // indices to the end of the vector, forbidding iteration. Following // iteration over argv, the argc value will contain the number of // unconsumed arguments. - + ~ACE_Arg_Shifter (void); // Destructor. - + char *get_current (void) const; // Get the current head of the vector. @@ -65,24 +65,24 @@ public: int is_option_next (void) const; // Returns 1 if there's a next item in the vector and it begins with // '-'. - + int is_parameter_next (void) const; // Returns 1 if there's a next item in the vector and it doesn't // begin with '-'. - + int num_ignored_args (void) const; // Returns the number of irrelevant args seen. - + private: int &argc_; // The size of the argument vector. int total_size_; // The size of argv_. - + char **temp_; // The temporary array over which we traverse. - + char **argv_; // The array in which the arguments are reordered. @@ -92,10 +92,10 @@ private: int back_; // The index of <argv_> in which we'll stick the next unknown // argument. - + int front_; // The index of <argv_> in which we'll stick the next known - // argument. + // argument. }; #endif /* ACE_ARG_SHIFTER_H */ diff --git a/ace/Array.h b/ace/Array.h index 715787503ab..faa4a450607 100644 --- a/ace/Array.h +++ b/ace/Array.h @@ -24,7 +24,7 @@ #include "ace/Containers.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (__ACE_INLINE__) diff --git a/ace/Asynch_Acceptor.h b/ace/Asynch_Acceptor.h index d3e01b25b84..41f3ce435ea 100644 --- a/ace/Asynch_Acceptor.h +++ b/ace/Asynch_Acceptor.h @@ -4,13 +4,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Asynch_Acceptor.h // // = AUTHOR // Irfan Pyarali (irfan@cs.wustl.edu) -// +// // ============================================================================ #ifndef ACE_ASYNCH_ACCEPTOR_H @@ -19,7 +19,7 @@ #include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) @@ -32,7 +32,7 @@ class ACE_Message_Block; class ACE_INET_Addr; template <class HANDLER> -class ACE_Asynch_Acceptor : public ACE_Handler +class ACE_Asynch_Acceptor : public ACE_Handler { // = TITLE // This class is an example of the Acceptor Pattern. This class @@ -41,11 +41,11 @@ class ACE_Asynch_Acceptor : public ACE_Handler // // = DESCRIPTION // Unlike the <ACE_Acceptor>, however, this class is designed to - // be used asynchronously. + // be used asynchronously. public: ACE_Asynch_Acceptor (void); // A do nothing constructor. - + virtual ~ACE_Asynch_Acceptor (void); // Virtual destruction @@ -76,7 +76,7 @@ public: // <backlog> number of asynchronous accepts are started. virtual ACE_HANDLE get_handle (void) const; - // Get the underlying handle. + // Get the underlying handle. virtual void set_handle (ACE_HANDLE handle); // Set the underlying listen handle. It is the user's responsibility @@ -94,15 +94,15 @@ public: // operations issued by other threads. virtual int validate_new_connection (const ACE_INET_Addr &remote_address); - // Template method for address validation. + // Template method for address validation. // // Default implemenation always validates the remote address. virtual int should_reissue_accept (void); - // Template method for deciding whether to reissue accept. + // Template method for deciding whether to reissue accept. // // Default implemenation always returns this->reissue_accept_. - + // // These are low level tweaking methods // @@ -116,7 +116,7 @@ public: virtual void validate_new_connection (int new_value); // Set and get flag that indicates if address validation is // required. - + virtual int reissue_accept (void) const; virtual void reissue_accept (int new_value); // Set and get flag that indicates if a new accept should be @@ -132,25 +132,25 @@ public: protected: virtual void handle_accept (const ACE_Asynch_Accept::Result &result); - // This is called when an outstanding accept completes. + // This is called when an outstanding accept completes. ACE_HANDLE handle (void) const; // Return the listen handle. void parse_address (const ACE_Asynch_Accept::Result &result, - ACE_INET_Addr &remote_address, - ACE_INET_Addr &local_address); + ACE_INET_Addr &remote_address, + ACE_INET_Addr &local_address); // This parses the address from read buffer. virtual HANDLER *make_handler (void); // This is the template method used to create new handler. // Subclasses must overwrite this method if a new handler creation // strategy is required. - + private: ACE_HANDLE listen_handle_; // Handle used to listen for new connections. - + ACE_Asynch_Accept asynch_accept_; // <Asynch_Accept> used to make life easier :-) @@ -159,7 +159,7 @@ private: int validate_new_connection_; // Flag that indicates if address validation is required. - + int reissue_accept_; // Flag that indicates if a new accept should be reissued when a // accept completes. diff --git a/ace/Asynch_IO.h b/ace/Asynch_IO.h index 6289dfafda4..0667f1bdb22 100644 --- a/ace/Asynch_IO.h +++ b/ace/Asynch_IO.h @@ -30,7 +30,7 @@ #include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \ diff --git a/ace/Auto_Ptr.h b/ace/Auto_Ptr.h index 67df8fb59e6..592faef550b 100644 --- a/ace/Auto_Ptr.h +++ b/ace/Auto_Ptr.h @@ -5,14 +5,14 @@ // // = LIBRARY // ace -// +// // = FILENAME // Auto_Ptr.h // // = AUTHOR -// Doug Schmidt, based on code from Jack Reeves (jack@fx.com) and +// Doug Schmidt, based on code from Jack Reeves (jack@fx.com) and // Dr. Harald M. Mueller (mueller@garwein.hai.siemens.co.at) -// +// // ============================================================================ #ifndef ACE_AUTO_PTR_H @@ -21,11 +21,11 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ template <class X> -class ACE_Auto_Basic_Ptr +class ACE_Auto_Basic_Ptr { // = TITLE // Implements the draft C++ standard auto_ptr abstraction. @@ -70,13 +70,13 @@ public: // = Initialization and termination methods /* explicit */ auto_ptr (X *p = 0); - X *operator-> () const; + X *operator-> () const; }; #endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ template<class X> -class ACE_Auto_Basic_Array_Ptr +class ACE_Auto_Basic_Array_Ptr { // = TITLE // Implements an extension to the draft C++ standard auto_ptr @@ -88,7 +88,7 @@ public: ACE_Auto_Basic_Array_Ptr (const ACE_Auto_Basic_Array_Ptr<X> &ap); ACE_Auto_Basic_Array_Ptr<X> &operator= (const ACE_Auto_Basic_Array_Ptr<X> &rhs); ~ACE_Auto_Basic_Array_Ptr (void); - + // = Accessor methods. X &operator* () const; X &operator[] (int i) const; diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h index a134592784f..8c37257b337 100644 --- a/ace/Basic_Types.h +++ b/ace/Basic_Types.h @@ -48,7 +48,7 @@ #define ACE_BASIC_TYPES_H #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ // A char always has 1 byte, by definition. diff --git a/ace/CLASSIX/CLASSIX_Addr.h b/ace/CLASSIX/CLASSIX_Addr.h index f3cbae992ff..0afb1675a89 100644 --- a/ace/CLASSIX/CLASSIX_Addr.h +++ b/ace/CLASSIX/CLASSIX_Addr.h @@ -5,7 +5,7 @@ // // = LIBRARY // ACE -// +// // = FILENAME // CLASSIX_Addr.h // @@ -14,10 +14,15 @@ // // ============================================================================ -#if !defined (ACE_CLASSIX_ADDR_H) +#ifndef ACE_CLASSIX_ADDR_H #define ACE_CLASSIX_ADDR_H #include "ace/ACE.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Addr.h" #include <ipc/chIpc.h> @@ -27,24 +32,24 @@ class ACE_Export ACE_CLASSIX_Addr : public ACE_Addr { // = TITLE // Defines the ClassiX IPC address format. - // + // // = DESCRIPTION // This class defines basic interfaces for "ACE-like" address for // Chorus port. public: - enum + enum { ACE_CLASSIX_ADDR_UNKNOWN = ACE_INVALID_HANDLE, /* K_NONEPORT */ ACE_CLASSIX_ADDR_DEFAULT = K_DEFAULTPORT, AF_CLASSIX = AF_MAX + 1 }; - + enum Addr_Type { - PORT, // use Peer_Port - GROUP, // use Peer_Group - STAMP, // use peer_Stamp - DYNAMIC, // use Peer_Group + PORT, // use Peer_Port + GROUP, // use Peer_Group + STAMP, // use peer_Stamp + DYNAMIC, // use Peer_Group UNDEFINED }; @@ -59,11 +64,11 @@ public: // = Direct initialization methods (useful after the object has been // constructed). // Returns 0 on success, -1 otherwise. - // + // /* -----------------------------------------------------*/ // = ACCESS - // + // virtual const KnUniqueId& get_id (void) const; // Returns a reference to the unique identifier diff --git a/ace/CLASSIX/CLASSIX_CLD_Connector.h b/ace/CLASSIX/CLASSIX_CLD_Connector.h index 3d0f1f7b45b..2825841bcdd 100644 --- a/ace/CLASSIX/CLASSIX_CLD_Connector.h +++ b/ace/CLASSIX/CLASSIX_CLD_Connector.h @@ -6,13 +6,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // CLASSIX_CLD_Connector.h // // = AUTHOR(S) // Nokia Telecommunications -// +// // ============================================================================ */ @@ -20,6 +20,11 @@ #define ACE_CLASSIX_CLD_CONNECTOR_H #include "ace/CLASSIX/CLASSIX_Stream.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + /* ------------------------------------------------------------------------- */ class ACE_CLASSIX_CLD_Connector @@ -30,14 +35,14 @@ class ACE_CLASSIX_CLD_Connector // = DESCRIPTION // This is used when a client needs to communicate with a server // whose SAP address is known beforehand. - // + // // Although there is a connection // procedure, no connection is actually taken place // between the client and server, since Chorus IPC does not have // connection semantics. // The connect procedure is necessary for // compatibility with <ACE_SOCK_Connector> class. - // + // // This class will simplify the client's // program, since it provides connection-like communication // mechanism. @@ -45,7 +50,7 @@ class ACE_CLASSIX_CLD_Connector // = NOTES // The server in this case trusts everyone who lands on the // server's SAP. - // + // // = SEE ALSO // ACE_CLASSIX_COD_Connector { @@ -54,25 +59,25 @@ class ACE_CLASSIX_CLD_Connector enum OPTIONS { // Do not enable the local SAP - // (so that the Reactor will not monitor the port) - ENABLE = 0x1 + // (so that the Reactor will not monitor the port) + ENABLE = 0x1 }; // = Initialization routines. ACE_CLASSIX_CLD_Connector (void); // Default constructor. - ACE_CLASSIX_CLD_Connector (ACE_CLASSIX_Stream &new_stream, - const ACE_Addr &remote_sap - = ACE_Addr::sap_any, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = 0, - int perms = 0, - int protocol_family - = ACE_CLASSIX_Addr::AF_CLASSIX, - int protocol = 0); + ACE_CLASSIX_CLD_Connector (ACE_CLASSIX_Stream &new_stream, + const ACE_Addr &remote_sap + = ACE_Addr::sap_any, + ACE_Time_Value *timeout = 0, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int reuse_addr = 0, + int flags = 0, + int perms = 0, + int protocol_family + = ACE_CLASSIX_Addr::AF_CLASSIX, + int protocol = 0); // Emulates connection semantics so that it can be plugged into // <ACE_Connector> // Actively connect local SAP and remote SAP togeter. @@ -82,28 +87,28 @@ class ACE_CLASSIX_CLD_Connector // the acceptor's address. In connectionless mode, we do not have // an acceptor. The <remote_sap> address will be copied to the new stream // if things goes well. - // + // // If <local_sap> refers to any address, a port will be // allocated and will be used as a local SAP. // // The rest parameters are there so that this class can be plugged into // <ACE_Connector>. - virtual int connect (ACE_CLASSIX_Stream &new_stream, - const ACE_Addr &remote_sap = ACE_Addr::sap_any, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = 0, - int perms = 0, - int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX, - int protocol = 0); + virtual int connect (ACE_CLASSIX_Stream &new_stream, + const ACE_Addr &remote_sap = ACE_Addr::sap_any, + ACE_Time_Value *timeout = 0, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int reuse_addr = 0, + int flags = 0, + int perms = 0, + int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX, + int protocol = 0); // Factory method used in <ACE_Connector>::connect_svc_handler() // Initialization method when default constructor is used. - // See the comments for the corresponding constructor - + // See the comments for the corresponding constructor + virtual int reset_new_handle (ACE_HANDLE handle); // Factory method used in ACE_Connector::handle_output(). // Meant for resetting any event associations on this handle @@ -113,7 +118,7 @@ class ACE_CLASSIX_CLD_Connector void dump(void) const; private: - + ACE_CLASSIX_CLD_Connector(ACE_CLASSIX_CLD_Connector const&); ACE_CLASSIX_CLD_Connector const& operator=(ACE_CLASSIX_CLD_Connector const&); }; diff --git a/ace/CLASSIX/CLASSIX_CO_Acceptor.h b/ace/CLASSIX/CLASSIX_CO_Acceptor.h index 264b723c044..02f58f89bb4 100644 --- a/ace/CLASSIX/CLASSIX_CO_Acceptor.h +++ b/ace/CLASSIX/CLASSIX_CO_Acceptor.h @@ -5,19 +5,24 @@ // // = LIBRARY // ACE -// +// // = FILENAME // CLASSIX_CO_Acceptor.h // // = AUTHOR // Nokia Telecommunications -// +// // ============================================================================ -#if !defined (ACE_CLASSIX_CO_ACCEPTOR_H) +#ifndef ACE_CLASSIX_CO_ACCEPTOR_H #define ACE_CLASSIX_CO_ACCEPTOR_H #include "ace/CLASSIX/CLASSIX_Stream.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Time_Value.h" class ACE_Export ACE_CLASSIX_CO_Acceptor @@ -30,13 +35,13 @@ class ACE_Export ACE_CLASSIX_CO_Acceptor // This class is the counter part of the <ACE_CLASSIX_Connector> // class. It exchanges SAP information to set up a logical // connection. - // + // // Data format passed between a connector and this class uses // Peer_Union structure. // // = SEE ALSO // ACE_CLASSIX_Connector - // + // public: struct Peer_Port { @@ -68,21 +73,21 @@ public: ACE_CLASSIX_CO_Acceptor (ACE_Reactor* = ACE_Reactor::instance()); // Default constructor. - ACE_CLASSIX_CO_Acceptor (const ACE_Addr &local_sap, - int reuse_addr = 0, - int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX, - int backlog = 0, - int protocol = 0, - ACE_Reactor* = ACE_Reactor::instance()); + ACE_CLASSIX_CO_Acceptor (const ACE_Addr &local_sap, + int reuse_addr = 0, + int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX, + int backlog = 0, + int protocol = 0, + ACE_Reactor* = ACE_Reactor::instance()); // Initiate a passive mode socket. virtual ~ACE_CLASSIX_CO_Acceptor (void); // Default dtor. - int open (const ACE_Addr &local_sap, - int reuse_addr = 0, - int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX, - int backlog = 5, + int open (const ACE_Addr &local_sap, + int reuse_addr = 0, + int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX, + int backlog = 5, int protocol = 0, ACE_Reactor* = ACE_Reactor::instance()); // Initiate a passive mode socket. @@ -90,9 +95,9 @@ public: // Closes down the listening port. // = Passive connection acceptance method. - int accept (ACE_CLASSIX_Stream &new_stream, + int accept (ACE_CLASSIX_Stream &new_stream, ACE_Addr *remote_addr = 0, - ACE_Time_Value *timeout = 0, + ACE_Time_Value *timeout = 0, int restart = 1, int reset_new_handle = 0) const; // Accept a new data transfer connection. A <timeout> of 0 means @@ -101,7 +106,7 @@ public: // = ACCESS ACE_HANDLE get_handle (void) const; - // Get the underlying descriptor. + // Get the underlying descriptor. int get_local_addr (ACE_Addr &) const; // Return the local endpoint address in the referenced ACE_Addr. // Returns 0 if successful, else -1. diff --git a/ace/CLASSIX/CLASSIX_CO_Connector.h b/ace/CLASSIX/CLASSIX_CO_Connector.h index 6b8616e4125..610739dc18d 100644 --- a/ace/CLASSIX/CLASSIX_CO_Connector.h +++ b/ace/CLASSIX/CLASSIX_CO_Connector.h @@ -6,13 +6,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // CLASSIX_CO_Connector.h // // = AUTHOR(S) // Nokia Telecommunications -// +// // ============================================================================ */ @@ -20,6 +20,11 @@ #define ACE_CLASSIX_CO_CONNECTOR_H #include "ace/CLASSIX/CLASSIX_CLD_Connector.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + /* ------------------------------------------------------------------------- */ class ACE_CLASSIX_CO_Connector : public ACE_CLASSIX_CLD_Connector @@ -30,7 +35,7 @@ class ACE_CLASSIX_CO_Connector : public ACE_CLASSIX_CLD_Connector // = DESCRIPTION // This is used when a client needs to communicate with a server // whose SAP address is unknown. - // + // // <ACE_CLASSIX_Connect> and <ACE_CLASSIX_Acceptor> exchanges // address(SAP) information to establish a logical link. // @@ -43,24 +48,24 @@ class ACE_CLASSIX_CO_Connector : public ACE_CLASSIX_CLD_Connector // = SEE ALSO // ACE_CLASSIX_CLD_Connector // ACE_CLASSIX_Acceptor - // + // { public: // = Initialization routines. ACE_CLASSIX_CO_Connector (void); // Default constructor. - ACE_CLASSIX_CO_Connector (ACE_CLASSIX_Stream &new_stream, - const ACE_Addr &remote_sap - = ACE_Addr::sap_any, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = 0, - int perms = 0, - int protocol_family - = ACE_CLASSIX_Addr::AF_CLASSIX, - int protocol = 0); + ACE_CLASSIX_CO_Connector (ACE_CLASSIX_Stream &new_stream, + const ACE_Addr &remote_sap + = ACE_Addr::sap_any, + ACE_Time_Value *timeout = 0, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int reuse_addr = 0, + int flags = 0, + int perms = 0, + int protocol_family + = ACE_CLASSIX_Addr::AF_CLASSIX, + int protocol = 0); // Emulates connection semantics so that it can be plugged into // <ACE_Connector> // Actively connect local SAP and remote SAP togeter. @@ -70,34 +75,34 @@ class ACE_CLASSIX_CO_Connector : public ACE_CLASSIX_CLD_Connector // the acceptor's address. In connectionless mode, we do not have // an acceptor. The <remote_sap> address will be copied to the new stream // if things goes well. - // + // // If <local_sap> refers to any address, a port will be // allocated and will be used as a local SAP. // // The rest parameters are there so that this class can be plugged into // <ACE_Connector>. - int connect (ACE_CLASSIX_Stream &new_stream, - const ACE_Addr &remote_sap = ACE_Addr::sap_any, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = 0, - int perms = 0, - int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX, - int protocol = 0); + int connect (ACE_CLASSIX_Stream &new_stream, + const ACE_Addr &remote_sap = ACE_Addr::sap_any, + ACE_Time_Value *timeout = 0, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int reuse_addr = 0, + int flags = 0, + int perms = 0, + int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX, + int protocol = 0); // Factory method used in <ACE_Connector>::connect_svc_handler() // Initialization method when default constructor is used. - // See the comments for the corresponding constructor - + // See the comments for the corresponding constructor + // = HELPER void dump(void) const; private: - + ACE_CLASSIX_CO_Connector(ACE_CLASSIX_CO_Connector const&); ACE_CLASSIX_CO_Connector const& operator=(ACE_CLASSIX_CO_Connector const&); }; diff --git a/ace/CLASSIX/CLASSIX_Dgram_Mcast.h b/ace/CLASSIX/CLASSIX_Dgram_Mcast.h index 4edc717e394..a21a770f83d 100644 --- a/ace/CLASSIX/CLASSIX_Dgram_Mcast.h +++ b/ace/CLASSIX/CLASSIX_Dgram_Mcast.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // CLASSIX_Dgram_Mcast.h // // = AUTHOR(S) // Nokia Telecommunications -// +// // ============================================================================ #ifndef ACE_CLASSIX_DGRAM_MCAST_H @@ -32,37 +32,37 @@ class ACE_CLASSIX_Dgram_Mcast : public ACE_CLASSIX_Stream // messages. // // This class is most likely used in the server. - // + // { public: // = INITIALIZATION ACE_CLASSIX_Dgram_Mcast(void); // Default constructor, does not setup anything - ACE_CLASSIX_Dgram_Mcast(int /* stamp */, - const ACE_CLASSIX_Port& = - *ACE_CLASSIX_DEFAULT_PORT::instance()); + ACE_CLASSIX_Dgram_Mcast(int /* stamp */, + const ACE_CLASSIX_Port& = + *ACE_CLASSIX_DEFAULT_PORT::instance()); // remote SAP = port group, local SAP = default port - int set_saps(int /* stamp */, - const ACE_CLASSIX_Port& = - *ACE_CLASSIX_DEFAULT_PORT::instance()); + int set_saps(int /* stamp */, + const ACE_CLASSIX_Port& = + *ACE_CLASSIX_DEFAULT_PORT::instance()); // remote SAP = port group, local SAP = default port - //virtual ssize_t send (const void *, /* buf */ + //virtual ssize_t send (const void *, /* buf */ // size_t /* n */) const; // = HELPER void dump (void) const; // Dump the state of an object. - + ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. protected: - virtual int set_mode_(u_int = K_BROADMODE); /* theMode */ + virtual int set_mode_(u_int = K_BROADMODE); /* theMode */ // Sets the addressing mode with the current setting of coTarget virtual int set_mode_(u_int, /* mode */ int /* site */); // Sets the addressing mode as well as the coTarget @@ -75,13 +75,18 @@ class ACE_CLASSIX_Dgram_Mcast : public ACE_CLASSIX_Stream private: // Disable copy constructor ACE_CLASSIX_Dgram_Mcast(ACE_CLASSIX_Dgram_Mcast const&); - ACE_CLASSIX_Dgram_Mcast const& operator=(ACE_CLASSIX_Dgram_Mcast const&); + ACE_CLASSIX_Dgram_Mcast const& operator=(ACE_CLASSIX_Dgram_Mcast const&); }; /* ------------------------------------------------------------------------- */ #if defined (__ACE_INLINE__) #include "ace/CLASSIX/CLASSIX_Dgram_Mcast.i" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #endif /* __ACE_INLINE__ */ #endif /* ACE_CLASSIX_DGRAM_MCAST_H */ diff --git a/ace/CLASSIX/CLASSIX_Group.h b/ace/CLASSIX/CLASSIX_Group.h index db5d900f633..ed92c5970d1 100644 --- a/ace/CLASSIX/CLASSIX_Group.h +++ b/ace/CLASSIX/CLASSIX_Group.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // CLASSIX/Group.h // // = AUTHOR(S) // Nokia Telecommunications -// +// // ============================================================================ #ifndef ACE_CLASSIX_GROUP_H @@ -19,26 +19,31 @@ /* ------------------------------------------------------------------------- */ #include "ace/CLASSIX/CLASSIX_Addr.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/CLASSIX/CLASSIX_Port.h" class ACE_CLASSIX_Group : public ACE_CLASSIX_Addr // = TITLE // Wrapper over Chorus's Group concept. - // + // // = DESCRIPTION // Provides interface to insert and remove ports in the group which is // created based on a given KnCap. This"<KnCap> is the unique // identifier of the group. - // + // // = NOTE // Chorus does not provide facility to remove a group from the system, // nor explicitly create a group. // As such, the wrapper allows users to freely change from one group // to the other within the same <ACE_CLASSIX_Group> instance. - // + // // = SEE ALSO // <ACE_CLASSIX_Group_Stamp>, <ACE_CLASSIX_Group_Dynamic> - // + // { public: // = INITIALIZATION @@ -46,7 +51,7 @@ class ACE_CLASSIX_Group : public ACE_CLASSIX_Addr // Sets up the group wrapper using the supplied group id. ACE_CLASSIX_Group(const KnCap&); // Sets up the group wrapper using the supplied KnCap - + // = ACCESS int is_configured(void) const; // Returns 1, if it contains valid group id; 0, otherwise. @@ -90,8 +95,8 @@ class ACE_CLASSIX_Group : public ACE_CLASSIX_Addr struct group_addr { - int config_; // 1, if the following fields are valid - KnCap group_; + int config_; // 1, if the following fields are valid + KnCap group_; }; group_addr addr_; diff --git a/ace/CLASSIX/CLASSIX_Group_Dynamic.h b/ace/CLASSIX/CLASSIX_Group_Dynamic.h index 1252cfa1b8b..7531d69404f 100644 --- a/ace/CLASSIX/CLASSIX_Group_Dynamic.h +++ b/ace/CLASSIX/CLASSIX_Group_Dynamic.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // CLASSIX_Group_Dynamic.h // // = AUTHOR(S) // Nokia Telecommunications -// +// // ============================================================================ #ifndef ACE_CLASSIX_GROUP_DYNAMIC_H @@ -20,22 +20,26 @@ /* ------------------------------------------------------------------------- */ #include "ace/CLASSIX/CLASSIX_Group.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_CLASSIX_Group_Dynamic : public ACE_CLASSIX_Group // = TITLE // Wrapper over Chorus's Group which is created dynamically and not named // by a <Stamp>. - // + // // = DESCRIPTION // This is a subclass of <ACE_CLASSIX_Group>. - // + // // Its encapsulated group is created dynamically and the // <KnCap> is the name as well as the unique identifier. - // + // // = SEE ALSO // <ACE_CLASSIX_Group>, <ACE_CLASSIX_Group_Stamp> { public: - + ACE_CLASSIX_Group_Dynamic(void); // default constructor... create a group use Chorus IPC's K_DYNAMIC option @@ -43,7 +47,7 @@ class ACE_CLASSIX_Group_Dynamic : public ACE_CLASSIX_Group // returns Dynamic type private: - + ACE_CLASSIX_Group_Dynamic(ACE_CLASSIX_Group_Dynamic const&); ACE_CLASSIX_Group_Dynamic const& operator=(ACE_CLASSIX_Group_Dynamic const&); }; diff --git a/ace/CLASSIX/CLASSIX_Group_Stamp.h b/ace/CLASSIX/CLASSIX_Group_Stamp.h index cf1e818510f..a69d732edc2 100644 --- a/ace/CLASSIX/CLASSIX_Group_Stamp.h +++ b/ace/CLASSIX/CLASSIX_Group_Stamp.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // CLASSIX_Group_Stamp.h // // = AUTHOR(S) // Nokia Telecommunications -// +// // ============================================================================ #ifndef ACE_CLASSIX_GROUP_STAMP_H @@ -20,28 +20,32 @@ /* ------------------------------------------------------------------------- */ #include "ace/CLASSIX/CLASSIX_Group.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_CLASSIX_Group_Stamp : public ACE_CLASSIX_Group // = TITLE // Wrapper over Chorus's Group using <Stamp> for naming the group. - // + // // = DESCRIPTION // This is a subclass of <ACE_CLASSIX_Group>. - // + // // Its encapsulated group is named by a <stamp>. However, // <KnCap> is still the unique identifier of the group. // // = NOTE // As at the time of writing, The stamp is contained in the ui.uiTail // field of <KnCap>. - // + // // = SEE ALSO // <ACE_CLASSIX_Group>, <ACE_CLASSIX_Group_Dynamic> - // + // { public: enum { - ILLEGAL_STAMP = 0 + ILLEGAL_STAMP = 0 /* Have we defined the range of valid stamps? */ }; @@ -51,7 +55,7 @@ class ACE_CLASSIX_Group_Stamp : public ACE_CLASSIX_Group ACE_CLASSIX_Group_Stamp(int /* stamp */); // creates a group use the specfied stamp virtual void set_addr(void*, /* pointer to the stamp */ - int = 0 /* not used */); + int = 0 /* not used */); // Replaces the existing group according to the supplied stamp // = ACCESS diff --git a/ace/CLASSIX/CLASSIX_OS.h b/ace/CLASSIX/CLASSIX_OS.h index 6caccfe8a69..e708a5e7d9e 100644 --- a/ace/CLASSIX/CLASSIX_OS.h +++ b/ace/CLASSIX/CLASSIX_OS.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // CLASSIX_OS.h // // = AUTHOR(S) // Nokia Telecommunications -// +// // ============================================================================ #ifndef ACE_CLASSIX_OS_H @@ -19,6 +19,11 @@ /* ------------------------------------------------------------------------- */ #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Select_Reactor.h" #include "ace/Singleton.h" #include "ace/CLASSIX/CLASSIX_Port_Core.h" @@ -30,10 +35,10 @@ class ACE_Export ACE_CLASSIX_Mgr // = TITLE // Class to manage resouces, especially static resources - // + // // = DESCRIPTION // It is intended that one <ACE_CLASSIX_Mgr> per actor - // + // { public: friend ACE_Singleton<ACE_CLASSIX_Mgr, ACE_SYNCH_NULL_MUTEX>; @@ -82,23 +87,23 @@ private: class ACE_CLASSIX_Msg // = TITLE // Class wrapper over Chorus's KnMsgDesc structure - // + // // = DESCRIPTION // Provides initialization and reset methods to construct a KnMsgDesc. - // + // // The flags in the <flags> field of the KnMsgDesc structure is always // set to 0. Therefore, the message body will always be copied and // the message is assumed to be part of the user(kernel) address // space when the caller is a USER(SUPERVISOR) thread. // (Chorus may not support the options defined in the flag, so we // choose not to use the flag, i.e. set it to null). - // - // The message annex is not used. + // + // The message annex is not used. // = SEE ALSO // ipcSend(2) { - public: + public: // = initialization ACE_CLASSIX_Msg(); // default constructor diff --git a/ace/CLASSIX/CLASSIX_Peer_SAP.h b/ace/CLASSIX/CLASSIX_Peer_SAP.h index 5e391c48014..8a3d784ebcb 100644 --- a/ace/CLASSIX/CLASSIX_Peer_SAP.h +++ b/ace/CLASSIX/CLASSIX_Peer_SAP.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // CLASSIX_Peer_SAP.h // // = AUTHOR(S) // Nokia Telecommunications -// +// // ============================================================================ #ifndef ACE_CLASSIX_PEER_SAP_H @@ -30,7 +30,7 @@ class ACE_CLASSIX_Peer_SAP // In CLASSIX, a local SAP is always a port, a peer SAP can be // a port or a group of port. This class is for peer SAP and // <ACE_SAP> is for local SAP. - // + // // = SEE ALSO // <ACE_SAP> { @@ -40,10 +40,10 @@ class ACE_CLASSIX_Peer_SAP // Default constructor. // Needs to be initialized by a set() operation. ACE_CLASSIX_Peer_SAP(const ACE_CLASSIX_Port_Core&);/* peer port */ - + ACE_CLASSIX_Peer_SAP(const ACE_CLASSIX_Port&);/* peer port address */ ACE_CLASSIX_Peer_SAP(const ACE_Addr&); /* peer port address */ - + ACE_CLASSIX_Peer_SAP(const KnUniqueId&); /* peer port address */ ACE_CLASSIX_Peer_SAP(const KnCap&); /* peer group address */ ACE_CLASSIX_Peer_SAP(int /* stamp */); /* stamp for peer group */ @@ -51,12 +51,12 @@ class ACE_CLASSIX_Peer_SAP ~ACE_CLASSIX_Peer_SAP(void); int set(const ACE_CLASSIX_Port_Core&); /* peer port */ - + int set(const ACE_Addr&); /* peer port address */ - - int set(const KnUniqueId&); /* peer port address */ - int set(const KnCap&); /* peer group address */ - int set(int /* stamp */); /* stamp for the peer group */ + + int set(const KnUniqueId&); /* peer port address */ + int set(const KnCap&); /* peer group address */ + int set(int /* stamp */); /* stamp for the peer group */ // = ACCESS const ACE_CLASSIX_Addr* get_addr(void) const; @@ -73,13 +73,13 @@ class ACE_CLASSIX_Peer_SAP // = HELPER void dump (void) const; // Dump the state of an object. - + ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. protected: #if 0 - virtual set_mode_(u_int = K_BROADMODE); /* theMode */ + virtual set_mode_(u_int = K_BROADMODE); /* theMode */ // Sets the addressing mode with the current setting of coTarget virtual set_mode_(u_int, /* mode */ int /* site */); // Sets the addressing mode as well as the coTarget @@ -89,13 +89,18 @@ class ACE_CLASSIX_Peer_SAP private: // Disable copy constructor ACE_CLASSIX_Peer_SAP(ACE_CLASSIX_Peer_SAP const&); - ACE_CLASSIX_Peer_SAP const& operator=(ACE_CLASSIX_Peer_SAP const&); + ACE_CLASSIX_Peer_SAP const& operator=(ACE_CLASSIX_Peer_SAP const&); }; /* ------------------------------------------------------------------------- */ #if defined (__ACE_INLINE__) #include "ace/CLASSIX/CLASSIX_Peer_SAP.i" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #endif /* __ACE_INLINE__ */ #endif /* ACE_CLASSIX_PEER_SAP_H */ diff --git a/ace/CLASSIX/CLASSIX_Port.h b/ace/CLASSIX/CLASSIX_Port.h index 28d44a24ce5..2bb45d4cf7c 100644 --- a/ace/CLASSIX/CLASSIX_Port.h +++ b/ace/CLASSIX/CLASSIX_Port.h @@ -5,7 +5,7 @@ // // = LIBRARY // ace -// +// // = FILENAME // CLASSIX_Port.h // @@ -14,10 +14,15 @@ // // ============================================================================ -#if !defined (ACE_CLASSIX_PORT_H) +#ifndef ACE_CLASSIX_PORT_H #define ACE_CLASSIX_PORT_H #include "ace/Singleton.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/CLASSIX/CLASSIX_OS.h" #include "ace/CLASSIX/CLASSIX_Addr.h" @@ -27,13 +32,13 @@ class ACE_Export ACE_CLASSIX_Port : public ACE_CLASSIX_Addr // = TITLE // Defines the ClassiX IPC Port address format for "ACE Socket" like // interfaces - // + // // = DESCRIPTION // The port address contains two fields: // a global unique identifier and a local identifier. // The global unique identifier is also referred to as the port address // and the local identifier as the port no. - // + // // = NOTE // In Chorus, one can always convert from a port unique identifier to // a port no and vice versa. This class is implemented based on this @@ -41,14 +46,14 @@ class ACE_Export ACE_CLASSIX_Port : public ACE_CLASSIX_Addr // // = SEE ALSO // <ACE_CLASSIX_PORT_Default>, <ACE_CLASSIX_Port_Core> - // + // public: /* -----------------------------------------------------*/ // = Initialization methods. ACE_CLASSIX_Port (); // Default constructor. // The address corresponds to the default port of the actor. - + ACE_CLASSIX_Port (const ACE_CLASSIX_Port &); // Copy constructor. ACE_CLASSIX_Port (const ACE_Addr &); @@ -57,10 +62,10 @@ public: ACE_CLASSIX_Port (const ACE_CLASSIX_Port_Core&); // Creates an <ACE_CLASSIX_Port> from <ACE_CLASSIX_Port_Core> - ACE_CLASSIX_Port (const KnUniqueId& /* port_id */); + ACE_CLASSIX_Port (const KnUniqueId& /* port_id */); // Creates an <ACE_CLASSIX_Port> from the given <port_id> - ACE_CLASSIX_Port (ACE_HANDLE /* port_no */); + ACE_CLASSIX_Port (ACE_HANDLE /* port_no */); // Creates an <ACE_CLASSIX_Port> from the given <port_no> ACE_CLASSIX_Port (void* /* location */, int /* length */); @@ -80,7 +85,7 @@ public: // Sets the <ACE_CLASSIX_Port_Basic> from a <port_id> virtual void set_addr (void * /* addr location */, - int /* len */); + int /* len */); // Set the address as the one pointed to by the location pointer. // The address contains <len> bytes. // Would prefer to return the status, but the base class uses void. @@ -101,7 +106,7 @@ public: /* -----------------------------------------------------*/ // = Control - // + // virtual int enable(int /* receive priority */) const; // Puts the port into the set of monitored ports. virtual int disable(void) const; @@ -111,7 +116,7 @@ public: /* -----------------------------------------------------*/ // = Comparison - // + // int operator == (const ACE_CLASSIX_Port &) const; // Compare two addresses for equality. The addresses are considered // equal if they have the same content in the KnUniqueId address structure. @@ -121,10 +126,10 @@ public: /* -----------------------------------------------------*/ // = Helper - // + // void dump (void) const; // Dump the state of an object. - + ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. @@ -135,13 +140,13 @@ private: // constructed). // Will create/reset the port only if the port no was <ACE_CLASSIX_ANY> // Returns 0 on success, -1 otherwise. - // + // int set_ (const ACE_Addr &); // Sets the <ACE_CLASSIX_Port_Basic> from another <ACE_CLASSIX_Port_Basic>. - + private: ACE_CLASSIX_Port_Core::Addr addr_; }; diff --git a/ace/CLASSIX/CLASSIX_Port_Core.h b/ace/CLASSIX/CLASSIX_Port_Core.h index e4955063279..5fdfb6309bd 100644 --- a/ace/CLASSIX/CLASSIX_Port_Core.h +++ b/ace/CLASSIX/CLASSIX_Port_Core.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // CLASSIX_Port_Core.h // // = AUTHOR(S) // Nokia Telecommunications -// +// // ============================================================================ #ifndef ACE_CLASSIX_PORT_CORE_H @@ -19,6 +19,11 @@ /* ------------------------------------------------------------------------- */ #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include <ipc/chIpc.h> @@ -28,7 +33,7 @@ class ACE_Export ACE_CLASSIX_Port_Core // = TITLE // Defines interfaces for allocation/deallocation of a Chorus // IPC port - // + // // = DESCRIPTION // This class allocates a port in the constructor and deallocates it in // the destructor. @@ -38,10 +43,10 @@ public: // = Initialization methods. ACE_CLASSIX_Port_Core (void); // Allocates a port from the OS - // + // virtual ~ACE_CLASSIX_Port_Core (void); // Deallocates the port from the OS. - + virtual const KnUniqueId& get_id (void) const; // Returns a reference to the port id. virtual ACE_HANDLE get_handle (void) const; @@ -59,18 +64,18 @@ public: #endif /* -----------------------------------------------------*/ // = Helper - // + // void dump (void) const; // Dump the state of an object. - + ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. struct Addr { - KnUniqueId id; // port address: unique identifier - ACE_HANDLE handle;// port no: local identifier. + KnUniqueId id; // port address: unique identifier + ACE_HANDLE handle;// port no: local identifier. }; @@ -81,7 +86,7 @@ protected: ACE_CLASSIX_Port_Core::Addr addr_; int config_; // Sets to 1, if configured; - // 0 otherwise + // 0 otherwise private: // Disallow copy constructor/assignment ACE_CLASSIX_Port_Core(ACE_CLASSIX_Port_Core const&); diff --git a/ace/CLASSIX/CLASSIX_Port_Default.h b/ace/CLASSIX/CLASSIX_Port_Default.h index 39229c6b1a0..698c9ff9afe 100644 --- a/ace/CLASSIX/CLASSIX_Port_Default.h +++ b/ace/CLASSIX/CLASSIX_Port_Default.h @@ -5,7 +5,7 @@ // // = LIBRARY // ace -// +// // = FILENAME // CLASSIX_Port_Default.h // @@ -18,13 +18,18 @@ #define ACE_CLASSIX_PORT_DEFAULT_H #include "ace/Singleton.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/CLASSIX/CLASSIX_Port.h" class ACE_CLASSIX_Port_Default : public ACE_CLASSIX_Port { // = TITLE // Implements the address wrapper of an actor's default port. - // + // // = DESCRIPTION // This corresponds to the address of an actor's default port // which does not change @@ -35,12 +40,12 @@ class ACE_CLASSIX_Port_Default : public ACE_CLASSIX_Port // of this class is a singleton. The protected constructor and the // friendship with the ACE_Singleton preventys this class from being // instantiated by other classes. - // + // // = NOTE // // = SEE ALSO // <ACE_CLASSIX_PORT> - // + // friend class ACE_Singleton<ACE_CLASSIX_Port_Default, ACE_SYNCH_NULL_MUTEX>; /* -----------------------------------------------------*/ @@ -66,7 +71,7 @@ protected: #endif /* __ACE_INLINE__ */ /* ------------------------------------------------------------------------- */ -typedef ACE_Singleton<ACE_CLASSIX_Port_Default, ACE_SYNCH_NULL_MUTEX> +typedef ACE_Singleton<ACE_CLASSIX_Port_Default, ACE_SYNCH_NULL_MUTEX> ACE_CLASSIX_DEFAULT_PORT; /* ------------------------------------------------------------------------- */ diff --git a/ace/CLASSIX/CLASSIX_SAP.h b/ace/CLASSIX/CLASSIX_SAP.h index 5301c2e226e..cefbdf031c8 100644 --- a/ace/CLASSIX/CLASSIX_SAP.h +++ b/ace/CLASSIX/CLASSIX_SAP.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // CLASSIX_SAP.h // // = AUTHOR(S) // Nokia Telecommunications -// +// // ============================================================================ #ifndef ACE_CLASSIX_SAP_H @@ -20,28 +20,32 @@ /* ------------------------------------------------------------------------- */ #include "ace/CLASSIX/CLASSIX_Port.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_CLASSIX_SAP // = TITLE // Class implementing the SAP over a Chorus port. - // + // // = DESCRIPTION // A SAP has a port which is referred to as the local port. // This class provides methods to manipulate this port. // // The SAP will always put the port in DISABLED state on exit. - // + // // In CLASSIX, a local SAP is always a port, a peer SAP can be // a port or a group of port. This class is for local SAP and // <ACE_Peer_SAP> is for peer SAP. // // = SEE ALSO // <ACE_Peer_SAP> - // + // { public: enum { - DEFAULT_PRIORITY = 10 + DEFAULT_PRIORITY = 10 }; // = INITIALIZATION @@ -106,7 +110,7 @@ class ACE_CLASSIX_SAP int control(u_int, /* mode */ int /* site */ ); // Interface for CLASSIX' send mode #endif - + // = HELPER void dump(void) const; @@ -117,7 +121,7 @@ class ACE_CLASSIX_SAP protected: #if 0 - virtual set_mode_(u_int = K_BROADMODE); /* theMode */ + virtual set_mode_(u_int = K_BROADMODE); /* theMode */ // Sets the addressing mode with the current setting of coTarget virtual set_mode_(u_int, /* mode */ int /* site */); // Sets the addressing mode as well as the coTarget diff --git a/ace/CLASSIX/CLASSIX_Select_Reactor.h b/ace/CLASSIX/CLASSIX_Select_Reactor.h index b525c3a9950..baf37704c04 100644 --- a/ace/CLASSIX/CLASSIX_Select_Reactor.h +++ b/ace/CLASSIX/CLASSIX_Select_Reactor.h @@ -6,13 +6,13 @@ // // = LIBRARY // ACE -// +// // = FILENAME // CLASSIX_Reactor.h // // = AUTHOR(S) // Nokia Telecommunications -// +// // ============================================================================ */ @@ -21,13 +21,18 @@ /* ------------------------------------------------------------------------- */ #include "ace/Timer_Queue.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Select_Reactor.h" #include "ace/Message_Block.h" #include "ace/CLASSIX/CLASSIX_SAP.h" class ACE_CLASSIX_Select_Reactor; -class ACE_Export ACE_CLASSIX_Select_Reactor_Notify : +class ACE_Export ACE_CLASSIX_Select_Reactor_Notify : public ACE_Reactor_Notify { // = TITLE @@ -44,20 +49,20 @@ public: ~ACE_CLASSIX_Select_Reactor_Notify(void); virtual int open (ACE_Reactor_Impl *, - ACE_Timer_Queue * = 0, - int = 0 /* dusable_notify_pip */); - // Enables the notification port and register it with the reactor + ACE_Timer_Queue * = 0, + int = 0 /* dusable_notify_pip */); + // Enables the notification port and register it with the reactor virtual int close (void); // Disables the notification port int dispatch_notifications (int &number_of_active_handles, - const ACE_Handle_Set &rd_mask); + const ACE_Handle_Set &rd_mask); // Handles pending threads (if any) that are waiting to unblock the // Select_Reactor. ssize_t notify (ACE_Event_Handler * = 0, - ACE_Reactor_Mask = ACE_Event_Handler::EXCEPT_MASK, - ACE_Time_Value * = 0); + ACE_Reactor_Mask = ACE_Event_Handler::EXCEPT_MASK, + ACE_Time_Value * = 0); // Called by a thread when it wants to unblock the Select_Reactor. // This wakeups the <ACE_Select_Reactor> if currently blocked in // select()/poll(). Pass over both the <Event_Handler> *and* the @@ -94,7 +99,7 @@ private: // <disable_notify_pipe>. ACE_CLASSIX_Port_Core notification_port_; // CLASSIX' IPC port ACE_CLASSIX_SAP notification_sap_; - // The HANDLE that the Select_Reactor is listening on and + // The HANDLE that the Select_Reactor is listening on and // the HANDLE that threads wanting the attention of the // Select_Reactor will write t are the same. // It can be seen that the notification port is implicitly connected to the @@ -105,11 +110,11 @@ private: class ACE_CLASSIX_Select_Reactor : public ACE_Select_Reactor // = TITLE // Implementing a Reactor for monitoring incoming data - // + // // = DESCRIPTION // This class redefines the wait_for_events() method of // <ACE_Select_Reactor> class. - // + // // The wait_for_events() method uses ipcReceive() to monitor // all ENABLED ports for incoming messages. The ipcReceive() is // set up such that it will find out the size of the message but will @@ -124,12 +129,12 @@ class ACE_CLASSIX_Select_Reactor : public ACE_Select_Reactor // thread and it shall not hold up this thread in the handle_input() // routine for too long. This will allow the Reactor to respond to // events more quickly. - // + // // = NOTE // Since chorus does not allow ipcReceive to monitor a subset of // ENABLED ports. One cannot have two ACE_CLASSIX_Select_Reactors // in one actor. - // + // { public: @@ -139,7 +144,7 @@ class ACE_CLASSIX_Select_Reactor : public ACE_Select_Reactor // handle_input() routine. // The handle_input() routine should not hold the reactor for too long. virtual int current_info(ACE_HANDLE /* port */, - size_t& /* msg size */); + size_t& /* msg size */); // Retruns the current messageage to the caleer if the supplied // handle id is the same as the <current_handle_> // Returns 0, if <msg size> constains the size of the message @@ -153,8 +158,8 @@ class ACE_CLASSIX_Select_Reactor : public ACE_Select_Reactor // repository of the default size. ACE_CLASSIX_Select_Reactor (size_t size, - int restart = 0, - ACE_Timer_Queue * = 0); + int restart = 0, + ACE_Timer_Queue * = 0); // Initializes <ACE_CLASSIX_Select_Reactor> with the handler repository of // size <size>. @@ -163,8 +168,8 @@ class ACE_CLASSIX_Select_Reactor : public ACE_Select_Reactor ACE_Time_Value *); // Wait for events to occur. - virtual int set_current_info_(ACE_HANDLE /* handle */, - size_t /* size of data */); + virtual int set_current_info_(ACE_HANDLE /* handle */, + size_t /* size of data */); // record the handler and the size of the message that the handler shall // read next. diff --git a/ace/CLASSIX/CLASSIX_Stream.h b/ace/CLASSIX/CLASSIX_Stream.h index b9282e4450b..75ec415fe38 100644 --- a/ace/CLASSIX/CLASSIX_Stream.h +++ b/ace/CLASSIX/CLASSIX_Stream.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // CLASSIX_Stream.h // // = AUTHOR(S) // Nokia Telecommunications -// +// // ============================================================================ #ifndef ACE_CLASSIX_STREAM_H @@ -19,6 +19,11 @@ /* ------------------------------------------------------------------------- */ #include "ace/CLASSIX/CLASSIX_SAP.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/CLASSIX/CLASSIX_Peer_SAP.h" #include "ace/CLASSIX/CLASSIX_Port_Default.h" @@ -27,14 +32,14 @@ class ACE_CLASSIX_Stream // Provides the stream interface for CLASSIX IPC communications. // // = DESCRIPTION - // This classes provides a stream wrapper over CLASSIX' - // IPC. It is designed to be an alternative to Stream type of + // This classes provides a stream wrapper over CLASSIX' + // IPC. It is designed to be an alternative to Stream type of // communication in the UNIX AF_INET environment. // // To the user, the stream is connection-oriented. The stream // is implemented on top of IPC, it is connectionless and its // reliability is as good as what the raw IPC can offer. - // + // // Since CLASSIX IPC is not intended to go across wide area network, // it can be seen as an // alternative to AF_INET's connection oriented stream, even though @@ -42,57 +47,57 @@ class ACE_CLASSIX_Stream // // This class contains a local sap, peer sap and data holding // delivery mode information. - // + // // When a stream is created, the peer SAP information must be provided. // The local SAP information may be provided in the constructor or // open(). The local SAP information given in open() overrides the // existing one. If the local SAP address is not given at all, it will // allocate a port and use it as the local SAP. - // + // { public: ACE_CLASSIX_Stream(void); // Default constructor, does not setup anything ACE_CLASSIX_Stream(const ACE_CLASSIX_Port_Core&, /* remote port */ - const ACE_CLASSIX_Port& = - *ACE_CLASSIX_DEFAULT_PORT::instance()); /* local address */ - + const ACE_CLASSIX_Port& = + *ACE_CLASSIX_DEFAULT_PORT::instance()); /* local address */ + ACE_CLASSIX_Stream(const ACE_CLASSIX_Port&, /* remote port address */ - const ACE_CLASSIX_Port& = - *ACE_CLASSIX_DEFAULT_PORT::instance());/* local address */ - + const ACE_CLASSIX_Port& = + *ACE_CLASSIX_DEFAULT_PORT::instance());/* local address */ + ACE_CLASSIX_Stream(const KnUniqueId&, /* remote port address */ - const ACE_CLASSIX_Port& = - *ACE_CLASSIX_DEFAULT_PORT::instance());/* local address */ - + const ACE_CLASSIX_Port& = + *ACE_CLASSIX_DEFAULT_PORT::instance());/* local address */ + // = IO // Returns -1, if fault has occured during receive. errno contains // the error condition. // Returns no of bytes received/sent, otherwise. - // - virtual ssize_t send_n (const void *, /* buf */ - size_t, /* n */ - int /* flags */); + // + virtual ssize_t send_n (const void *, /* buf */ + size_t, /* n */ + int /* flags */); // Sends exactly n bytes (keep trying until n bytes are sent) virtual ssize_t send_n (const void *, /* buf */ size_t /* n */) const; // Sends n bytes(keep trying until n bytes are sent) // Uses the current addressing mode - virtual ssize_t send (const void *, /* buf */ - size_t, /* n */ - int /* flags */); + virtual ssize_t send (const void *, /* buf */ + size_t, /* n */ + int /* flags */); // Sends n bytes. Same as send_n(buf, n, flag) - virtual ssize_t send (const void *, /* buf */ - size_t /* n */) const; + virtual ssize_t send (const void *, /* buf */ + size_t /* n */) const; // Sends n bytes. same as send_n(buf, n). - virtual ssize_t reply (const void *, /* buf */ - size_t /* n */) const; + virtual ssize_t reply (const void *, /* buf */ + size_t /* n */) const; // Sends n bytes to the sender of the cureent thread's current message. ssize_t ipcRecv (void *, /* buffer */ - size_t, /* length */ - int = 0, /* flag: 0 or MSG_PEEK */ - ACE_Time_Value* = 0) const; /* timeout */ - // Recv an <n> byte buffer + size_t, /* length */ + int = 0, /* flag: 0 or MSG_PEEK */ + ACE_Time_Value* = 0) const; /* timeout */ + // Recv an <n> byte buffer // Wait up to <timeout> amount of time to receive up to <n> bytes // into <buf> from <handle> (uses the <recv> call). If <recv> times // out a -1 is returned with <errno == ETIMEOUT>. If it succeeds the @@ -101,9 +106,9 @@ class ACE_CLASSIX_Stream // will block until action is possible, else will wait until the // relative time specified in *<timeout> elapses). ssize_t ipcRecv_n (void *, /* buffer */ - size_t, /* length */ - int = 0, /* flag: 0 or MSG_PEEK */ - ACE_Time_Value* = 0) const; /* timeout */ + size_t, /* length */ + int = 0, /* flag: 0 or MSG_PEEK */ + ACE_Time_Value* = 0) const; /* timeout */ // Continue until receives n bytes of data or an error has occurred. // Retruns the no of bytes actually received. // If it is less than expected, errno contains error info. @@ -142,10 +147,10 @@ class ACE_CLASSIX_Stream int is_selectable(void) const; // Retruns 1, if the local SAP is enabled. int is_writer_closed(void) const; - // Retruns 1, if writer side is closed. + // Retruns 1, if writer side is closed. int is_reader_closed(void) const; // Retruns 1, if reader side is closed. - + // = CONTROL int set_peer_sap(const ACE_Addr&); @@ -201,7 +206,7 @@ class ACE_CLASSIX_Stream // = HELPER void dump (void) const; // Dump the state of an object. - + ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. @@ -223,7 +228,7 @@ class ACE_CLASSIX_Stream void set_target_(void); // set the delivery target structure using the existing peer information - virtual int set_mode_(u_int = K_BROADMODE); /* theMode */ + virtual int set_mode_(u_int = K_BROADMODE); /* theMode */ // Sets the addressing mode with the current setting of coTarget virtual int set_mode_(u_int, /* mode */ int /* site */); // Sets the addressing mode as well as the coTarget @@ -235,12 +240,12 @@ class ACE_CLASSIX_Stream ACE_CLASSIX_Port_Core *local_port_; // if non-zero, it will be // deleted on exit. - + ACE_CLASSIX_Peer_SAP peer_sap_; - int peer_sap_closed_; + int peer_sap_closed_; // 0 if it's not closed(default), // 1 if it's closed. - + // Mode applied destination address // Can be changed by control()/set_mode_() // Mode is applicable in IPC classes other than the Stream class. @@ -253,7 +258,7 @@ class ACE_CLASSIX_Stream private: // Disable copy constructor ACE_CLASSIX_Stream(ACE_CLASSIX_Stream const&); - ACE_CLASSIX_Stream const& operator=(ACE_CLASSIX_Stream const&); + ACE_CLASSIX_Stream const& operator=(ACE_CLASSIX_Stream const&); }; /* ------------------------------------------------------------------------- */ diff --git a/ace/CORBA_Handler.h b/ace/CORBA_Handler.h index fbf106356e6..912b7a76c68 100644 --- a/ace/CORBA_Handler.h +++ b/ace/CORBA_Handler.h @@ -19,12 +19,13 @@ #define ACE_CORBA_HANDLER_H #include "ace/Service_Config.h" -#include "ace/Pipe.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Pipe.h" + #if (defined (ACE_HAS_ORBIX) && (ACE_HAS_ORBIX != 0)) || (defined (ACE_HAS_MT_ORBIX) && (ACE_HAS_MT_ORBIX != 0)) #define EXCEPTIONS #define WANT_ORBIX_FDS diff --git a/ace/CORBA_Ref.h b/ace/CORBA_Ref.h index 46c222f6106..e5dbc821641 100644 --- a/ace/CORBA_Ref.h +++ b/ace/CORBA_Ref.h @@ -24,7 +24,7 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ template <class CORBA_REF> diff --git a/ace/Connector.h b/ace/Connector.h index 08d7f877366..6e607beeb4b 100644 --- a/ace/Connector.h +++ b/ace/Connector.h @@ -5,43 +5,44 @@ // // = LIBRARY // ace -// +// // = FILENAME // Connector.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_CONNECTOR_H #define ACE_CONNECTOR_H #include "ace/Service_Config.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Service_Object.h" #include "ace/Map_Manager.h" #include "ace/Svc_Handler.h" #include "ace/Strategies.h" -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - template <class SVC_HANDLER> class ACE_Svc_Tuple { // = TITLE // Holds the ACE_Svc_Handler and its argument and - // <ACE_Timer_Handle> until an asynchronous connection completes. + // <ACE_Timer_Handle> until an asynchronous connection completes. // // = DESCRIPTION // This is a no-brainer... public: // = Initialization methods. - ACE_Svc_Tuple (SVC_HANDLER *, - ACE_HANDLE, - const void * = 0, - long timer_id = -1); + ACE_Svc_Tuple (SVC_HANDLER *, + ACE_HANDLE, + const void * = 0, + long timer_id = -1); // = Get SVC_HANDLER. SVC_HANDLER *svc_handler (void); @@ -114,7 +115,7 @@ public: #endif /* ACE_HAS_TYPENAME_KEYWORD */ ACE_Connector (ACE_Reactor *r = ACE_Reactor::instance (), - int flags = 0); + int flags = 0); // Initialize a connector. <flags> indicates how <SVC_HANDLER>'s // should be initialized prior to being activated. Right now, the // only flag that is processed is <ACE_NONBLOCK>, which enabled @@ -122,7 +123,7 @@ public: virtual int open (ACE_Reactor *r = ACE_Reactor::instance (), - int flags = 0); + int flags = 0); // Initialize a connector. <flags> indicates how <SVC_HANDLER>'s // should be initialized prior to being activated. Right now, the // only flag that is processed is <ACE_NONBLOCK>, which enabled @@ -134,13 +135,13 @@ public: // = Connection establishment methods. virtual int connect (SVC_HANDLER *&svc_handler, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults, - const ACE_PEER_CONNECTOR_ADDR &local_addr - = (ACE_PEER_CONNECTOR_ADDR &) ACE_PEER_CONNECTOR_ADDR_ANY, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0); + const ACE_PEER_CONNECTOR_ADDR &remote_addr, + const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults, + const ACE_PEER_CONNECTOR_ADDR &local_addr + = (ACE_PEER_CONNECTOR_ADDR &) ACE_PEER_CONNECTOR_ADDR_ANY, + int reuse_addr = 0, + int flags = O_RDWR, + int perms = 0); // Initiate connection of <svc_handler> to peer at <remote_addr> // using <synch_options>. If the caller wants to designate the // selected <local_addr> they can (and can also insist that the @@ -150,10 +151,10 @@ public: // within connect with certain permissions. virtual int connect_n (size_t n, - SVC_HANDLER *svc_handlers[], - ACE_PEER_CONNECTOR_ADDR remote_addrs[], + SVC_HANDLER *svc_handlers[], + ACE_PEER_CONNECTOR_ADDR remote_addrs[], ASYS_TCHAR *failed_svc_handlers = 0, - const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults); + const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults); // Initiate connection of <n> <svc_handlers> to peers at // <remote_addrs> using <synch_options>. Returns -1 if failure // occurs and 0 otherwise. If <failed_svc_handlers> is non-NULL, a @@ -198,12 +199,12 @@ protected: // else 0. virtual int connect_svc_handler (SVC_HANDLER *&svc_handler, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms); + const ACE_PEER_CONNECTOR_ADDR &remote_addr, + ACE_Time_Value *timeout, + const ACE_PEER_CONNECTOR_ADDR &local_addr, + int reuse_addr, + int flags, + int perms); // Bridge method for connecting the <svc_handler> to the // <remote_addr>. The default behavior delegates to the // <PEER_CONNECTOR::connect>. @@ -241,13 +242,13 @@ protected: // = Demultiplexing hooks. virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); + ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); // Terminate the Client ACE_Connector by iterating over any // unconnected ACE_Svc_Handler's and removing them from the // ACE_Reactor. - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); + virtual int handle_timeout (const ACE_Time_Value &tv, + const void *arg); // This method is called if a connection times out before // completing. @@ -260,8 +261,8 @@ protected: // Default version does no work and returns -1. Must be overloaded // by application developer to do anything meaningful. - int create_AST (SVC_HANDLER *, - const ACE_Synch_Options &); + int create_AST (SVC_HANDLER *, + const ACE_Synch_Options &); // Creates and inserts an ACE_Svc_Tuple into the <handler_map_>. // so that we can continue accepting this connection asynchronously. @@ -305,17 +306,17 @@ class ACE_Strategy_Connector : public ACE_Connector <SVC_HANDLER, ACE_PEER_CONNE // particular concurrency mechanism. public: ACE_Strategy_Connector (ACE_Reactor *r = ACE_Reactor::instance (), - ACE_Creation_Strategy<SVC_HANDLER> * = 0, - ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> * = 0, - ACE_Concurrency_Strategy<SVC_HANDLER> * = 0, - int flags = 0); + ACE_Creation_Strategy<SVC_HANDLER> * = 0, + ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> * = 0, + ACE_Concurrency_Strategy<SVC_HANDLER> * = 0, + int flags = 0); // Initialize a connector. <flags> indicates how <SVC_HANDLER>'s // should be initialized prior to being activated. Right now, the // only flag that is processed is <ACE_NONBLOCK>, which enabled // non-blocking I/O on the <SVC_HANDLER> when it is opened. virtual int open (ACE_Reactor *r, - int flags); + int flags); // Initialize a connector. <flags> indicates how <SVC_HANDLER>'s // should be initialized prior to being activated. Right now, the // only flag that is processed is <ACE_NONBLOCK>, which enabled @@ -323,10 +324,10 @@ public: // Default strategies would be created and used. virtual int open (ACE_Reactor *r = ACE_Reactor::instance (), - ACE_Creation_Strategy<SVC_HANDLER> * = 0, - ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> * = 0, - ACE_Concurrency_Strategy<SVC_HANDLER> * = 0, - int flags = 0); + ACE_Creation_Strategy<SVC_HANDLER> * = 0, + ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> * = 0, + ACE_Concurrency_Strategy<SVC_HANDLER> * = 0, + int flags = 0); // Initialize a connector. <flags> indicates how <SVC_HANDLER>'s // should be initialized prior to being activated. Right now, the // only flag that is processed is <ACE_NONBLOCK>, which enabled @@ -337,18 +338,18 @@ public: virtual int close (void); // Close down the Connector - + // = Define some useful typedefs traits. - typedef ACE_Creation_Strategy<SVC_HANDLER> + typedef ACE_Creation_Strategy<SVC_HANDLER> CREATION_STRATEGY; - typedef ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> + typedef ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> CONNECT_STRATEGY; - typedef ACE_Concurrency_Strategy<SVC_HANDLER> + typedef ACE_Concurrency_Strategy<SVC_HANDLER> CONCURRENCY_STRATEGY; - typedef ACE_Connector <SVC_HANDLER, ACE_PEER_CONNECTOR_2> + typedef ACE_Connector <SVC_HANDLER, ACE_PEER_CONNECTOR_2> SUPER; - // = Strategies accessors + // = Strategies accessors virtual ACE_Creation_Strategy<SVC_HANDLER> *creation_strategy (void) const; virtual ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> *connect_strategy (void) const; virtual ACE_Concurrency_Strategy<SVC_HANDLER> *concurrency_strategy (void) const; @@ -370,12 +371,12 @@ protected: // else 0. virtual int connect_svc_handler (SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms); + const ACE_PEER_CONNECTOR_ADDR &remote_addr, + ACE_Time_Value *timeout, + const ACE_PEER_CONNECTOR_ADDR &local_addr, + int reuse_addr, + int flags, + int perms); // Bridge method for connecting the new connection into the // <SVC_HANDLER>. The default behavior delegates to the // <PEER_CONNECTOR::connect> in the <Connect_Strategy>. diff --git a/ace/Containers.h b/ace/Containers.h index 093c98c7999..73d73c54b8f 100644 --- a/ace/Containers.h +++ b/ace/Containers.h @@ -20,13 +20,13 @@ #include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -template <class T> +template <class T> class ACE_Double_Linked_List; -template <class T> +template <class T> class ACE_Double_Linked_List_Iterator; class ACE_Export ACE_DLList_Node diff --git a/ace/Containers_T.h b/ace/Containers_T.h index f8ed5cef14d..ab84e75a73b 100644 --- a/ace/Containers_T.h +++ b/ace/Containers_T.h @@ -18,12 +18,13 @@ #define ACE_CONTAINERS_T_H #include "ace/ACE.h" -#include "ace/Containers.h" /* Need ACE_DLList_Node */ #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Containers.h" /* Need ACE_DLList_Node */ + class ACE_Allocator; template <class T> diff --git a/ace/DEV.h b/ace/DEV.h index 5bf209be58e..9f573163f6a 100644 --- a/ace/DEV.h +++ b/ace/DEV.h @@ -5,25 +5,26 @@ // // = LIBRARY // ace -// +// // = FILENAME // DEV.h // // = AUTHOR // Gerhard Lenzer -// +// // ============================================================================ #ifndef ACE_DEV_H #define ACE_DEV_H #include "ace/IO_SAP.h" -#include "ace/DEV_Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/DEV_Addr.h" + // The following is necessary since many C++ compilers don't support // typedef'd types inside of classes used as formal template // arguments... ;-(. Luckily, using the C++ preprocessor I can hide @@ -41,7 +42,7 @@ class ACE_Export ACE_DEV : public ACE_IO_SAP { // = TITLE // Defines the member functions for the base class of the - // ACE_DEV abstraction. + // ACE_DEV abstraction. public: int close (void); // Close down the DEVICE @@ -59,7 +60,7 @@ public: protected: ACE_DEV (void); - // Ensure that this class is an abstract base class + // Ensure that this class is an abstract base class }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) diff --git a/ace/DEV_Addr.h b/ace/DEV_Addr.h index 2836cabc595..9f98f1a4f6d 100644 --- a/ace/DEV_Addr.h +++ b/ace/DEV_Addr.h @@ -5,29 +5,30 @@ // // = LIBRARY // ace -// +// // = FILENAME // DEV_Addr.h // // = AUTHOR // Gerhard Lenzer and Douglas C. Schmidt -// +// // ============================================================================ #ifndef ACE_DEV_ADDR_H #define ACE_DEV_ADDR_H #include "ace/Addr.h" -#include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/ACE.h" + class ACE_Export ACE_DEV_Addr : public ACE_Addr { // = TITLE - // Defines device address family address format. + // Defines device address family address format. public: // = Initialization methods. ACE_DEV_Addr (void); @@ -43,29 +44,29 @@ public: // Create a ACE_DEV_Addr from a device name. void set (LPCTSTR devname); - // Create a ACE_Addr from a ACE_DEV pathname. + // Create a ACE_Addr from a ACE_DEV pathname. ACE_DEV_Addr &operator= (const ACE_DEV_Addr &); // Assignment operator. virtual void *get_addr (void) const; - // Return a pointer to the address. + // Return a pointer to the address. #if defined (UNICODE) virtual int addr_to_string (wchar_t *addr, size_t) const; - // Transform the current address into string format. + // Transform the current address into string format. #endif /* UNICODE */ virtual int addr_to_string (char *addr, size_t) const; - // Transform the current address into string format. + // Transform the current address into string format. int operator == (const ACE_DEV_Addr &SAP) const; - // Compare two addresses for equality. + // Compare two addresses for equality. int operator != (const ACE_DEV_Addr &SAP) const; - // Compare two addresses for inequality. + // Compare two addresses for inequality. - LPCTSTR get_path_name (void) const; + LPCTSTR get_path_name (void) const; // Return the path name used for the rendezvous point. void dump (void) const; diff --git a/ace/DEV_Connector.h b/ace/DEV_Connector.h index a43b4e2ae5f..9db7328b091 100644 --- a/ace/DEV_Connector.h +++ b/ace/DEV_Connector.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // DEV_Connector.h // // = AUTHOR // Gerhard Lenzer and Douglas C. Schmidt -// +// // ============================================================================ #ifndef ACE_DEV_CONNECTOR_H @@ -20,24 +20,24 @@ #include "ace/DEV_IO.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_DEV_Connector : public ACE_DEV { // = TITLE - // Defines an active connection factory for the ACE_DEV wrappers. + // Defines an active connection factory for the ACE_DEV wrappers. public: ACE_DEV_Connector (void); // Default constructor. - ACE_DEV_Connector (ACE_DEV_IO &new_io, - const ACE_DEV_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0); + ACE_DEV_Connector (ACE_DEV_IO &new_io, + const ACE_DEV_Addr &remote_sap, + ACE_Time_Value *timeout = 0, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int reuse_addr = 0, + int flags = O_RDWR, + int perms = 0); // Actively connect and produce a <new_stream> if things go well. // The <remote_sap> is the address that we are trying to connect // with. The <timeout> is the amount of time to wait to connect. @@ -54,13 +54,13 @@ public: // The <flags> and <perms> arguments are passed down to the open() // method. - int connect (ACE_DEV_IO &new_io, - const ACE_DEV_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0); + int connect (ACE_DEV_IO &new_io, + const ACE_DEV_Addr &remote_sap, + ACE_Time_Value *timeout = 0, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int reuse_addr = 0, + int flags = O_RDWR, + int perms = 0); // Actively connect and produce a <new_stream> if things go well. // The <remote_sap> is the address that we are trying to connect // with. The <timeout> is the amount of time to wait to connect. diff --git a/ace/DEV_IO.h b/ace/DEV_IO.h index ad82d31927f..990e1165b40 100644 --- a/ace/DEV_IO.h +++ b/ace/DEV_IO.h @@ -5,25 +5,26 @@ // // = LIBRARY // ace -// +// // = FILENAME // DEV_IO.h // // = AUTHOR // Gerhard Lenzer and Douglas C. Schmidt -// +// // ============================================================================ -#ifndef ACE_DEV_IO_H +#ifndef ACE_DEV_IO_H #define ACE_DEV_IO_H #include "ace/DEV.h" -#include "ace/DEV_Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/DEV_Addr.h" + class ACE_Export ACE_DEV_IO : public ACE_DEV { // = TITLE @@ -41,33 +42,33 @@ public: ssize_t recv (void *buf, size_t n) const; // Recv upto <n> bytes in <buf>. - ssize_t send_n (const void *buf, size_t n) const; - // Send n bytes, keep trying until n are sent. + ssize_t send_n (const void *buf, size_t n) const; + // Send n bytes, keep trying until n are sent. - ssize_t recv_n (void *buf, size_t n) const; - // Recv n bytes, keep trying until n are received. + ssize_t recv_n (void *buf, size_t n) const; + // Recv n bytes, keep trying until n are received. #if defined (ACE_HAS_STREAM_PIPES) - ssize_t recv (ACE_Str_Buf *cntl, - ACE_Str_Buf *data, - int *band, - int *flags) const; + ssize_t recv (ACE_Str_Buf *cntl, + ACE_Str_Buf *data, + int *band, + int *flags) const; // Recv bytes via STREAM pipes using "band" mode. - ssize_t send (const ACE_Str_Buf *cntl, - const ACE_Str_Buf *data, - int band, - int flags) const; + ssize_t send (const ACE_Str_Buf *cntl, + const ACE_Str_Buf *data, + int band, + int flags) const; // Send bytes via STREAM pipes using "band" mode. - ssize_t recv (ACE_Str_Buf *cntl, - ACE_Str_Buf *data, - int *flags) const; + ssize_t recv (ACE_Str_Buf *cntl, + ACE_Str_Buf *data, + int *flags) const; // Recv <cntl> and <data> via STREAM pipes. - ssize_t send (const ACE_Str_Buf *cntl, - const ACE_Str_Buf *data, - int flags = 0) const; + ssize_t send (const ACE_Str_Buf *cntl, + const ACE_Str_Buf *data, + int flags = 0) const; // Send <cntl> and <data> via STREAM pipes. #endif /* ACE_HAS_STREAM_PIPES */ diff --git a/ace/Date_Time.h b/ace/Date_Time.h index 10ebea907a2..b6a7d3b610c 100644 --- a/ace/Date_Time.h +++ b/ace/Date_Time.h @@ -5,7 +5,7 @@ // // = LIBRARY // ace -// +// // = FILENAME // ACE_Date_Time.h // @@ -20,7 +20,7 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_Date_Time @@ -30,12 +30,12 @@ class ACE_Export ACE_Date_Time public: // constructor with init values, no check for validy ACE_Date_Time (long day = 0, - long month = 0, - long year = 0, - long hour = 0, - long minute = 0, - long second = 0, - long microsec = 0); + long month = 0, + long year = 0, + long hour = 0, + long minute = 0, + long second = 0, + long microsec = 0); // Set/get portions of ACE_Date_Time, no check for validity. long day (void); diff --git a/ace/Dirent.h b/ace/Dirent.h index 3adda60f32b..f606c77fc1b 100644 --- a/ace/Dirent.h +++ b/ace/Dirent.h @@ -10,7 +10,7 @@ // Dirent.h // // = DESCRIPTION -// Define a portable directory-entry manipulation interface. +// Define a portable directory-entry manipulation interface. // // = AUTHOR // Douglas C. Schmidt <schmidt@cs.wustl.edu> @@ -23,7 +23,7 @@ #include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Dirent diff --git a/ace/Dump.h b/ace/Dump.h index bccc5d62eb7..2f44c2795c3 100644 --- a/ace/Dump.h +++ b/ace/Dump.h @@ -5,7 +5,7 @@ // // = LIBRARY // ace -// +// // = FILENAME // Dump.h // @@ -18,7 +18,7 @@ // To turn on this feature simply compile with -DACE_NDEBUG // // There are several interesting aspects to this design: -// +// // 1. It uses the External Polymorphism pattern to avoid having to // derive all ACE classes from a common base class that has virtual // methods (this is crucial to avoid unnecessary overhead). In @@ -36,16 +36,16 @@ // this. Note, however, that this scheme doesn't generalize to // work with multiple-inheritance or virtual base classes. // -// Future work includes: -// +// Future work includes: +// // 1. Using a dynamic object table rather than a static table -// -// 2. Adding support to allow particular classes of objects to +// +// 2. Adding support to allow particular classes of objects to // be selectively dumped. // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_DUMP_H @@ -54,7 +54,7 @@ #include "ace/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_Dumpable @@ -80,7 +80,7 @@ private: // Pointer to the object that is being stored. }; -class ACE_Export ACE_Dumpable_Ptr +class ACE_Export ACE_Dumpable_Ptr { // = TITLE // A smart pointer stored in the in-memory object database @@ -121,7 +121,7 @@ public: private: ACE_ODB (void); // Ensure we have a Singleton... - struct Tuple + struct Tuple { const void *this_; // Pointer to the object that is registered. @@ -144,7 +144,7 @@ private: Tuple object_table_[ACE_ODB::MAX_TABLE_SIZE]; // The current implementation is very simple-minded and will be // changed to be dynamic. - + int current_size_; // Current size of <object_table_>. }; diff --git a/ace/Dump_T.h b/ace/Dump_T.h index 857a69f1d63..ca4f5e45d7b 100644 --- a/ace/Dump_T.h +++ b/ace/Dump_T.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Dump.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_DUMP_T_H @@ -20,7 +20,7 @@ #include "ace/Dump.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ template <class Concrete> @@ -31,7 +31,7 @@ class ACE_Dumpable_Adapter : public ACE_Dumpable // class and is instantiated with the implementation of the // concrete component class <class Concrete>. // - // = DESCRIPTION + // = DESCRIPTION // This design is similar to the Adapter and Decorator patterns // from the ``Gang of Four'' book. Note that <class Concrete> // need not inherit from a common class since ACE_Dumpable diff --git a/ace/Dynamic.h b/ace/Dynamic.h index 1d84ecab301..23960bd3632 100644 --- a/ace/Dynamic.h +++ b/ace/Dynamic.h @@ -18,13 +18,14 @@ #define ACE_DYNAMIC_H #include "ace/ACE.h" -#include "ace/Synch_T.h" -#include "ace/Singleton.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Synch_T.h" +#include "ace/Singleton.h" + class ACE_Export ACE_Dynamic { // = TITLE diff --git a/ace/Dynamic_Service.h b/ace/Dynamic_Service.h index 5f0e152f648..45caa8ef4f5 100644 --- a/ace/Dynamic_Service.h +++ b/ace/Dynamic_Service.h @@ -5,22 +5,18 @@ // // = LIBRARY // ace -// +// // = FILENAME // Dynamic_Service.h // // = AUTHOR -// Prashant Jain, Doug Schmidt -// +// Prashant Jain, Doug Schmidt +// // ============================================================================ #ifndef ACE_DYNAMIC_SERVICE_H #define ACE_DYNAMIC_SERVICE_H -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - template <class SERVICE> class ACE_Dynamic_Service { @@ -30,7 +26,7 @@ class ACE_Dynamic_Service // // = DESCRIPTION // Uses "name" for lookup in the ACE service repository. Obtains - // the object and returns it as the appropriate type. + // the object and returns it as the appropriate type. public: static SERVICE *instance (const char *name); // Return instance using <name> to search the Service_Repository. @@ -40,11 +36,11 @@ public: }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Dynamic_Service.cpp" +# include "ace/Dynamic_Service.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Dynamic_Service.cpp") +# pragma implementation ("Dynamic_Service.cpp") #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_DYNAMIC_SERVICE_H */ diff --git a/ace/Env_Value_T.h b/ace/Env_Value_T.h index be9ab570dfb..a8a2599caed 100644 --- a/ace/Env_Value_T.h +++ b/ace/Env_Value_T.h @@ -5,23 +5,23 @@ // // = LIBRARY // ACE -// +// // = DESCRIPTION // Template to encapsulate getting a value from an environment variable // and using a supplied default value if not in the environment. // // = AUTHOR // Chris Cleeland (derived from work by Carlos O'Ryan) -// +// // ============================================================================ #ifndef ACE_ENV_VALUE_T_H #define ACE_ENV_VALUE_T_H -#include "ace/OS.h" // Need to get ACE_static_cast definition +#include "ace/OS.h" // Need to get ACE_static_cast definition #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ template <class T> @@ -41,11 +41,11 @@ public: // Default constructor which isn't bound to a specific environment // variable name or a default value. Before being useful it must // <open()>ed. - + ACE_Env_Value (const char *varname, const T &vardefault); // Constructor that calls <open>. - + ~ACE_Env_Value (void); // Destroy the value. @@ -65,7 +65,7 @@ private: // Disallow copying and assignment. void fetch_value (void); - + const char *varname_; T value_; }; diff --git a/ace/Event_Handler.h b/ace/Event_Handler.h index b8918111c12..6c818af7607 100644 --- a/ace/Event_Handler.h +++ b/ace/Event_Handler.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Event_Handler.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_EVENT_HANDLER_H @@ -20,7 +20,7 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ // Forward declaration. @@ -30,7 +30,7 @@ class ACE_Thread_Manager; typedef u_long ACE_Reactor_Mask; -class ACE_Export ACE_Event_Handler +class ACE_Export ACE_Event_Handler { // = TITLE // Provides an abstract interface for handling various types of @@ -41,7 +41,7 @@ class ACE_Export ACE_Event_Handler // handle an exception raised on an I/O descriptor, handle a // timer's expiration, or handle a signal. public: - enum + enum { LO_PRIORITY = 0, HI_PRIORITY = 10, @@ -60,16 +60,16 @@ public: TIMER_MASK = (1 << 5), QOS_MASK = (1 << 6), GROUP_QOS_MASK = (1 << 7), - ALL_EVENTS_MASK = READ_MASK | - WRITE_MASK | - EXCEPT_MASK | - ACCEPT_MASK | - CONNECT_MASK | - TIMER_MASK | - QOS_MASK | + ALL_EVENTS_MASK = READ_MASK | + WRITE_MASK | + EXCEPT_MASK | + ACCEPT_MASK | + CONNECT_MASK | + TIMER_MASK | + QOS_MASK | GROUP_QOS_MASK, - RWE_MASK = READ_MASK | - WRITE_MASK | + RWE_MASK = READ_MASK | + WRITE_MASK | EXCEPT_MASK, DONT_CALL = (1 << 9) }; @@ -82,7 +82,7 @@ public: virtual void set_handle (ACE_HANDLE); // Set the I/O handle. - // = Get/set priority + // = Get/set priority // Priorities run from MIN_PRIORITY (which is the "lowest priority") // to MAX_PRIORITY (which is the "highest priority"). @@ -102,11 +102,11 @@ public: // Called when execption events occur (e.g., SIGURG). virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg = 0); + const void *arg = 0); // Called when timer expires. virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask); + ACE_Reactor_Mask close_mask); // Called when object is removed from the ACE_Reactor virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); @@ -151,7 +151,7 @@ protected: int priority_; // Priority of this Event_Handler. - // = Pointers to the various event demultiplexors. + // = Pointers to the various event demultiplexors. ACE_Reactor *reactor_; }; @@ -164,15 +164,15 @@ public: ACE_Notification_Buffer (void); ACE_Notification_Buffer (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask); + ACE_Reactor_Mask mask); ~ACE_Notification_Buffer (void); // Default dtor. ACE_Event_Handler *eh_; - // Pointer to the Event_Handler that will be dispatched + // Pointer to the Event_Handler that will be dispatched // by the main event loop. - + ACE_Reactor_Mask mask_; // Mask that indicates which method to call. }; diff --git a/ace/Event_Handler_T.h b/ace/Event_Handler_T.h index 248bb62824b..f32a110d011 100644 --- a/ace/Event_Handler_T.h +++ b/ace/Event_Handler_T.h @@ -20,7 +20,7 @@ #include "ace/Event_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (ACE_HAS_TEMPLATE_TYPEDEFS) diff --git a/ace/FIFO.h b/ace/FIFO.h index a51b4028b4d..1e5b20392a0 100644 --- a/ace/FIFO.h +++ b/ace/FIFO.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // FIFO.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_FIFO_H @@ -20,7 +20,7 @@ #include "ace/IPC_SAP.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_FIFO : public ACE_IPC_SAP diff --git a/ace/FIFO_Recv.h b/ace/FIFO_Recv.h index b857b3e9633..c1f9d0aad9c 100644 --- a/ace/FIFO_Recv.h +++ b/ace/FIFO_Recv.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // FIFO_Recv.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_FIFO_RECV_H @@ -20,30 +20,30 @@ #include "ace/FIFO.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_FIFO_Recv : public ACE_FIFO { // = TITLE // Receiver side of the bytestream C++ wrapper for UNIX - // FIFOs. + // FIFOs. public: // = Initialization methods. ACE_FIFO_Recv (void); // Default constructor. - ACE_FIFO_Recv (const char *rendezvous, - int flags = O_CREAT | O_RDONLY, - int perms = ACE_DEFAULT_FILE_PERMS, - int persistent = 1, + ACE_FIFO_Recv (const char *rendezvous, + int flags = O_CREAT | O_RDONLY, + int perms = ACE_DEFAULT_FILE_PERMS, + int persistent = 1, LPSECURITY_ATTRIBUTES sa = 0); // Open up a bytestream named pipe for reading. - int open (const char *rendezvous, - int flags = O_CREAT | O_RDONLY, - int perms = ACE_DEFAULT_FILE_PERMS, - int persistent = 1, + int open (const char *rendezvous, + int flags = O_CREAT | O_RDONLY, + int perms = ACE_DEFAULT_FILE_PERMS, + int persistent = 1, LPSECURITY_ATTRIBUTES sa = 0); // Open up a bytestream named pipe for reading. @@ -55,7 +55,7 @@ public: ssize_t recv_n (void *buf, size_t len); // Recv <buf> of exactly <len> bytes (block until done). - + void dump (void) const; // Dump the state of an object. diff --git a/ace/FIFO_Recv_Msg.h b/ace/FIFO_Recv_Msg.h index af68b412cf2..7f5cabcfb2d 100644 --- a/ace/FIFO_Recv_Msg.h +++ b/ace/FIFO_Recv_Msg.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // FIFO_Recv_Msg.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_FIFO_RECV_MSG_H @@ -20,7 +20,7 @@ #include "ace/FIFO_Recv.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_FIFO_Recv_Msg : public ACE_FIFO_Recv @@ -32,17 +32,17 @@ public: ACE_FIFO_Recv_Msg (void); // Default constructor. - ACE_FIFO_Recv_Msg (const char *rendezvous, - int flags = O_CREAT | O_RDONLY, - int perms = ACE_DEFAULT_FILE_PERMS, - int persistent = 1, + ACE_FIFO_Recv_Msg (const char *rendezvous, + int flags = O_CREAT | O_RDONLY, + int perms = ACE_DEFAULT_FILE_PERMS, + int persistent = 1, LPSECURITY_ATTRIBUTES sa = 0); // Open up a record-oriented named pipe for reading. - int open (const char *rendezvous, - int flags = O_CREAT | O_RDONLY, - int perms = ACE_DEFAULT_FILE_PERMS, - int persistent = 1, + int open (const char *rendezvous, + int flags = O_CREAT | O_RDONLY, + int perms = ACE_DEFAULT_FILE_PERMS, + int persistent = 1, LPSECURITY_ATTRIBUTES sa = 0); // Open up a record-oriented named pipe for reading. @@ -53,15 +53,15 @@ public: // Recv <msg> as a buffer. #if defined (ACE_HAS_STREAM_PIPES) - ssize_t recv (ACE_Str_Buf *data, - ACE_Str_Buf *cntl, - int *flags); + ssize_t recv (ACE_Str_Buf *data, + ACE_Str_Buf *cntl, + int *flags); // Recv <data> and <cntl> message via Stream pipes. - ssize_t recv (int *band, - ACE_Str_Buf *data, - ACE_Str_Buf *cntl, - int *flags); + ssize_t recv (int *band, + ACE_Str_Buf *data, + ACE_Str_Buf *cntl, + int *flags); // Recv <data> and <cntl> message via Stream pipes in "band" mode. #endif /* ACE_HAS_STREAM_PIPES */ diff --git a/ace/FIFO_Send.h b/ace/FIFO_Send.h index 8e7e15633c8..65a36178071 100644 --- a/ace/FIFO_Send.h +++ b/ace/FIFO_Send.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // FIFO_Send.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_FIFO_SEND_H @@ -20,27 +20,27 @@ #include "ace/FIFO.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_FIFO_Send : public ACE_FIFO { // = TITLE - // Sender side for the bytestream C++ wrapper for UNIX FIFOs + // Sender side for the bytestream C++ wrapper for UNIX FIFOs public: // = Initialization methods. ACE_FIFO_Send (void); // Default constructor. - ACE_FIFO_Send (const char *rendezvous, - int flags = O_WRONLY, - int perms = ACE_DEFAULT_FILE_PERMS, + ACE_FIFO_Send (const char *rendezvous, + int flags = O_WRONLY, + int perms = ACE_DEFAULT_FILE_PERMS, LPSECURITY_ATTRIBUTES sa = 0); // Open up a bytestream named pipe for writing. - int open (const char *rendezvous, - int flags = O_WRONLY, - int perms = ACE_DEFAULT_FILE_PERMS, + int open (const char *rendezvous, + int flags = O_WRONLY, + int perms = ACE_DEFAULT_FILE_PERMS, LPSECURITY_ATTRIBUTES sa = 0); // Open up a bytestream named pipe for writing. diff --git a/ace/FIFO_Send_Msg.h b/ace/FIFO_Send_Msg.h index 6e6e3373e3b..20dc659b880 100644 --- a/ace/FIFO_Send_Msg.h +++ b/ace/FIFO_Send_Msg.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // FIFO_Send_Msg.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_FIFO_SEND_MSG_H @@ -20,28 +20,28 @@ #include "ace/FIFO_Send.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_FIFO_Send_Msg : public ACE_FIFO_Send { // = TITLE // Sender side for the Record oriented C++ wrapper for UNIX - // FIFOs. + // FIFOs. public: // = Initialization methods. ACE_FIFO_Send_Msg (void); // Default constructor. - ACE_FIFO_Send_Msg (const char *rendezvous, - int flags = O_WRONLY, - int perms = ACE_DEFAULT_FILE_PERMS, + ACE_FIFO_Send_Msg (const char *rendezvous, + int flags = O_WRONLY, + int perms = ACE_DEFAULT_FILE_PERMS, LPSECURITY_ATTRIBUTES sa = 0); // Open up a record-oriented named pipe for writing. - int open (const char *rendezvous, - int flags = O_WRONLY, - int perms = ACE_DEFAULT_FILE_PERMS, + int open (const char *rendezvous, + int flags = O_WRONLY, + int perms = ACE_DEFAULT_FILE_PERMS, LPSECURITY_ATTRIBUTES sa = 0); // Open up a record-oriented named pipe for writing. @@ -52,15 +52,15 @@ public: // Send <buf> of exactly <len> bytes (block until done). #if defined (ACE_HAS_STREAM_PIPES) - ssize_t send (const ACE_Str_Buf *data, - const ACE_Str_Buf *cntl = 0, - int flags = 0); + ssize_t send (const ACE_Str_Buf *data, + const ACE_Str_Buf *cntl = 0, + int flags = 0); // Send <data> and <cntl> message via Stream pipes. - ssize_t send (int band, - const ACE_Str_Buf *data, - const ACE_Str_Buf *cntl = 0, - int flags = MSG_BAND); + ssize_t send (int band, + const ACE_Str_Buf *data, + const ACE_Str_Buf *cntl = 0, + int flags = MSG_BAND); // Send <data> and <cntl> message via Stream pipes in "band" mode. #endif /* ACE_HAS_STREAM_PIPES */ diff --git a/ace/FILE.h b/ace/FILE.h index ec8c2cd2494..7164e81ba2c 100644 --- a/ace/FILE.h +++ b/ace/FILE.h @@ -5,25 +5,26 @@ // // = LIBRARY // ace -// +// // = FILENAME // FILE.h // // = AUTHOR // Gerhard Lenzer -// +// // ============================================================================ #ifndef ACE_FILE_H #define ACE_FILE_H #include "ace/IO_SAP.h" -#include "ace/FILE_Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/FILE_Addr.h" + // The following is necessary since many C++ compilers don't support // typedef'd types inside of classes used as formal template // arguments... ;-(. Luckily, using the C++ preprocessor I can hide @@ -42,7 +43,7 @@ class ACE_Export ACE_FILE_Info // = TITLE // Abstracts basic OS FILE information. public: - mode_t mode_; + mode_t mode_; // mode of file nlink_t nlink_; @@ -56,7 +57,7 @@ class ACE_Export ACE_FILE : public ACE_IO_SAP { // = TITLE // Defines the member functions for the base class of the - // ACE_FILE abstraction. + // ACE_FILE abstraction. public: int close (void); // Close down the ACE_FILE @@ -86,7 +87,7 @@ public: protected: ACE_FILE (void); - // Ensure that this class is an abstract base class + // Ensure that this class is an abstract base class }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) diff --git a/ace/FILE_Addr.h b/ace/FILE_Addr.h index d928c8a8209..04f37a63236 100644 --- a/ace/FILE_Addr.h +++ b/ace/FILE_Addr.h @@ -5,29 +5,30 @@ // // = LIBRARY // ace -// +// // = FILENAME // FILE_Addr.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_FILE_ADDR_H #define ACE_FILE_ADDR_H #include "ace/Addr.h" -#include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/ACE.h" + class ACE_Export ACE_FILE_Addr : public ACE_Addr { // = TITLE - // Defines the FILE address family address format. + // Defines the FILE address family address format. public: // = Initialization methods. ACE_FILE_Addr (void); @@ -40,32 +41,32 @@ public: // Acts like a copy constructor. ACE_FILE_Addr (LPCTSTR filename); - // Create a ACE_FILE_Addr from a pathname. + // Create a ACE_FILE_Addr from a pathname. void set (LPCTSTR filename); - // Create a ACE_FILE_Addr from a pathname. + // Create a ACE_FILE_Addr from a pathname. ACE_FILE_Addr &operator= (const ACE_FILE_Addr &); // Assignment operator. virtual void *get_addr (void) const; - // Return a pointer to the address. + // Return a pointer to the address. #if defined (UNICODE) virtual int addr_to_string (wchar_t *addr, size_t) const; - // Transform the current address into string format. + // Transform the current address into string format. #endif /* UNICODE */ virtual int addr_to_string (char *addr, size_t) const; - // Transform the current address into string format. + // Transform the current address into string format. int operator == (const ACE_FILE_Addr &SAP) const; - // Compare two addresses for equality. + // Compare two addresses for equality. int operator != (const ACE_FILE_Addr &SAP) const; - // Compare two addresses for inequality. + // Compare two addresses for inequality. - LPCTSTR get_path_name (void) const; + LPCTSTR get_path_name (void) const; // Return the path name used for the rendezvous point. void dump (void) const; diff --git a/ace/FILE_Connector.h b/ace/FILE_Connector.h index d144f0f27d3..3802c2dbaa0 100644 --- a/ace/FILE_Connector.h +++ b/ace/FILE_Connector.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // FILE_Connector.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_FILE_CONNECTOR_H @@ -20,25 +20,25 @@ #include "ace/FILE_IO.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_FILE_Connector { // = TITLE - // Defines an active connection factory for the ACE_FILE wrappers. + // Defines an active connection factory for the ACE_FILE wrappers. public: // = Initialization methods. ACE_FILE_Connector (void); // Default constructor. - ACE_FILE_Connector (ACE_FILE_IO &new_io, - const ACE_FILE_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0); + ACE_FILE_Connector (ACE_FILE_IO &new_io, + const ACE_FILE_Addr &remote_sap, + ACE_Time_Value *timeout = 0, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int reuse_addr = 0, + int flags = O_RDWR, + int perms = 0); // Actively connect and produce a <new_stream> if things go well. // The <remote_sap> is the address that we are trying to connect // with. The <timeout> is the amount of time to wait to connect. @@ -55,13 +55,13 @@ public: // The <flags> and <perms> arguments are passed down to the open() // method. - int connect (ACE_FILE_IO &new_io, - const ACE_FILE_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0); + int connect (ACE_FILE_IO &new_io, + const ACE_FILE_Addr &remote_sap, + ACE_Time_Value *timeout = 0, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int reuse_addr = 0, + int flags = O_RDWR, + int perms = 0); // Actively connect and produce a <new_stream> if things go well. // The <remote_sap> is the address that we are trying to connect // with. The <timeout> is the amount of time to wait to connect. diff --git a/ace/FILE_IO.h b/ace/FILE_IO.h index e717783317a..25b506a93b6 100644 --- a/ace/FILE_IO.h +++ b/ace/FILE_IO.h @@ -5,25 +5,26 @@ // // = LIBRARY // ace -// +// // = FILENAME // FILE_IO.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ -#ifndef ACE_FILE_IO_H +#ifndef ACE_FILE_IO_H #define ACE_FILE_IO_H #include "ace/FILE.h" -#include "ace/FILE_Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/FILE_Addr.h" + class ACE_Export ACE_FILE_IO : public ACE_FILE { // = TITLE @@ -41,33 +42,33 @@ public: ssize_t recv (void *buf, size_t n) const; // Recv upto <n> bytes in <buf>. - ssize_t send_n (const void *buf, size_t n) const; - // Send n bytes, keep trying until n are sent. + ssize_t send_n (const void *buf, size_t n) const; + // Send n bytes, keep trying until n are sent. - ssize_t recv_n (void *buf, size_t n) const; - // Recv n bytes, keep trying until n are received. + ssize_t recv_n (void *buf, size_t n) const; + // Recv n bytes, keep trying until n are received. #if defined (ACE_HAS_STREAM_PIPES) - ssize_t send (const ACE_Str_Buf *cntl, - const ACE_Str_Buf *data, - int flags = 0) const; + ssize_t send (const ACE_Str_Buf *cntl, + const ACE_Str_Buf *data, + int flags = 0) const; // Send bytes via STREAM pipes. - ssize_t recv (ACE_Str_Buf *cntl, - ACE_Str_Buf *data, - int *flags) const; + ssize_t recv (ACE_Str_Buf *cntl, + ACE_Str_Buf *data, + int *flags) const; // Recv bytes via STREAM pipes. - ssize_t send (const ACE_Str_Buf *cntl, - const ACE_Str_Buf *data, - int band, - int flags) const; + ssize_t send (const ACE_Str_Buf *cntl, + const ACE_Str_Buf *data, + int band, + int flags) const; // Send bytes via STREAM pipes using "band" mode. - ssize_t recv (ACE_Str_Buf *cntl, - ACE_Str_Buf *data, - int *band, - int *flags) const; + ssize_t recv (ACE_Str_Buf *cntl, + ACE_Str_Buf *data, + int *band, + int *flags) const; // Recv bytes via STREAM pipes using "band" mode. #endif /* ACE_HAS_STREAM_PIPES */ @@ -109,7 +110,7 @@ public: int get_local_addr (ACE_Addr &) const; // Return the local endpoint address in the referenced ACE_Addr. // Returns 0 if successful, else -1. - + int get_remote_addr (ACE_Addr &) const; // Return the address of the remotely connected peer (if there is // one), in the referenced ACE_Addr. Returns 0 if successful, else diff --git a/ace/Filecache.h b/ace/Filecache.h index 7422f6dd243..8a392c6f290 100644 --- a/ace/Filecache.h +++ b/ace/Filecache.h @@ -19,14 +19,15 @@ #define ACE_FILECACHE_H #include "ace/Mem_Map.h" -#include "ace/Synch_T.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/SString.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Synch_T.h" +#include "ace/Hash_Map_Manager.h" +#include "ace/SString.h" + enum ACE_Filecache_Flag { ACE_NOMAP = 0, diff --git a/ace/Free_List.h b/ace/Free_List.h index f4583c7bc47..44a9ef0e3e0 100644 --- a/ace/Free_List.h +++ b/ace/Free_List.h @@ -6,27 +6,28 @@ // // = LIBRARY // ace -// +// // = FILENAME // Free_List.h // // = AUTHOR // Darrell Brunsch (brunsch@cs.wustl.edu) -// +// // ============================================================================ #ifndef ACE_FREE_LIST_H #define ACE_FREE_LIST_H #include "ace/OS.h" -#include "ace/Synch_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Synch_T.h" + template <class T> -class ACE_Free_List +class ACE_Free_List { // = TITLE // Implements a free list. @@ -40,11 +41,11 @@ public: virtual void add (T *element) = 0; // Inserts an element onto the free list (if it isn't past the high // water mark). - + virtual T *remove (void) = 0; // Takes a element off the freelist and returns it. It creates // <inc> new elements if the size is at or below the low water mark. - + virtual size_t size (void) = 0; // Returns the current size of the free list. @@ -53,7 +54,7 @@ public: }; template <class T, class ACE_LOCK> -class ACE_Locked_Free_List : public ACE_Free_List<T> +class ACE_Locked_Free_List : public ACE_Free_List<T> { // = TITLE // Implements a free list. @@ -65,9 +66,9 @@ class ACE_Locked_Free_List : public ACE_Free_List<T> public: // = Initialization and termination. ACE_Locked_Free_List (int mode = ACE_FREE_LIST_WITH_POOL, - size_t prealloc = ACE_DEFAULT_FREE_LIST_PREALLOC, - size_t lwm = ACE_DEFAULT_FREE_LIST_LWM, - size_t hwm = ACE_DEFAULT_FREE_LIST_HWM, + size_t prealloc = ACE_DEFAULT_FREE_LIST_PREALLOC, + size_t lwm = ACE_DEFAULT_FREE_LIST_LWM, + size_t hwm = ACE_DEFAULT_FREE_LIST_HWM, size_t inc = ACE_DEFAULT_FREE_LIST_INC); // Constructor takes a <mode> (i.e., ACE_FREE_LIST_WITH_POOL or // ACE_PURE_FREE_LIST), a count of the number of nodes to @@ -82,11 +83,11 @@ public: virtual void add (T *element); // Inserts an element onto the free list (if it isn't past the high // water mark). - + virtual T *remove (void); // Takes a element off the freelist and returns it. It creates // <inc> new elements if the size is at or below the low water mark. - + virtual size_t size (void); // Returns the current size of the free list. @@ -119,7 +120,7 @@ protected: size_t size_; // Keeps track of the size of the list. - ACE_LOCK mutex_; + ACE_LOCK mutex_; // Synchronization variable for <ACE_Timer_Queue>. private: diff --git a/ace/Functor.h b/ace/Functor.h index c0a9ed4c6e9..8443817ed5f 100644 --- a/ace/Functor.h +++ b/ace/Functor.h @@ -30,7 +30,7 @@ #include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Command_Base diff --git a/ace/Functor_T.h b/ace/Functor_T.h index ae596e6ff1a..471170262e4 100644 --- a/ace/Functor_T.h +++ b/ace/Functor_T.h @@ -30,7 +30,7 @@ #include "ace/Functor.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ template <class RECEIVER, class ACTION> @@ -48,7 +48,7 @@ class ACE_Command_Callback : public ACE_Command_Base public: ACE_Command_Callback (RECEIVER &recvr, ACTION action); - // Constructor: sets the <receiver_> of the Command to recvr, and the + // Constructor: sets the <receiver_> of the Command to recvr, and the // <action_> of the Command to <action>. virtual ~ACE_Command_Callback (void) {} diff --git a/ace/Future.h b/ace/Future.h index 839adc35df9..36d65b46cb0 100644 --- a/ace/Future.h +++ b/ace/Future.h @@ -5,15 +5,15 @@ // // = LIBRARY // ace -// +// // = FILENAME // Future.h // // = AUTHOR // Andres Kruse <Andres.Kruse@cern.ch>, Douglas C. Schmidt // <schmidt@cs.wustl.edu>, and Per Andersson -// <Per.Andersson@hfera.ericsson.se>. -// +// <Per.Andersson@hfera.ericsson.se>. +// // ============================================================================ #ifndef ACE_FUTURE_H @@ -22,7 +22,7 @@ #include "ace/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (ACE_HAS_THREADS) @@ -37,42 +37,42 @@ class ACE_Future_Rep // ACE_Future_Rep<T> // // = DESCRIPTION - // An ACE_Future_Rep<T> object encapsules a pointer to an + // An ACE_Future_Rep<T> object encapsules a pointer to an // object of class T which is the result of an asynchronous // method invocation. It is pointed to by ACE_Future<T> object[s] // and only accessible through them. private: friend class ACE_Future<T>; - + // Create, attach, detach and assign encapsulates the reference // count handling and the object lifetime of ACE_Future_Rep<T> // instances. - + static ACE_Future_Rep<T> *create (void); // Create a ACE_Future_Rep<T> and initialize the reference count - + static ACE_Future_Rep<T> *attach (ACE_Future_Rep<T> *&rep); // Precondition(rep != 0) // Increase the reference count and return argument. Uses // the attribute "value_ready_mutex_" to synchronize reference // count updating - + static void detach (ACE_Future_Rep<T> *&rep); // Precondition(rep != 0) // Decreases the reference count and and deletes rep if // there are no more references to rep. - + static void assign (ACE_Future_Rep<T> *&rep, - ACE_Future_Rep<T> *new_rep); + ACE_Future_Rep<T> *new_rep); // Precondition(rep != 0 && new_rep != 0) // Decreases the rep's reference count and and deletes rep if there // are no more references to rep. Then assigns new_rep to rep - + int set (const T &r); // Set the result value. int get (T &value, - ACE_Time_Value *tv); + ACE_Time_Value *tv); // Wait up to <tv> time to get the <value>. operator T (); @@ -109,7 +109,7 @@ private: }; template <class T> -class ACE_Future +class ACE_Future { // = TITLE // This class implements a ``single write, multiple read'' @@ -138,7 +138,7 @@ public: int cancel (const T &r); // Cancel an <ACE_Future> and assign the value <r>. It is used if a // client does not want to wait for <T> to be produced. - + int cancel (void); // Cancel an <ACE_Future>. Put the future into its initial // state. Returns 0 on succes and -1 on failure. It is now possible @@ -159,7 +159,7 @@ public: // the result to all waiting clients. int get (T &value, - ACE_Time_Value *tv = 0); + ACE_Time_Value *tv = 0); // Wait up to <tv> time to get the <value>. operator T (); diff --git a/ace/Get_Opt.h b/ace/Get_Opt.h index 49758895474..0b03e7458dc 100644 --- a/ace/Get_Opt.h +++ b/ace/Get_Opt.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Get_Opt.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_GET_OPT_H @@ -20,7 +20,7 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_Get_Opt @@ -31,26 +31,26 @@ class ACE_Export ACE_Get_Opt // = DESCRIPTION // This is a C++ wrapper for getopt(3c). public: - ACE_Get_Opt (int argc, - ASYS_TCHAR **argv, - const ASYS_TCHAR *optstring, - int skip_argv0 = 1, - int report_errors = 0); + ACE_Get_Opt (int argc, + ASYS_TCHAR **argv, + const ASYS_TCHAR *optstring, + int skip_argv0 = 1, + int report_errors = 0); // Initialize the internal data when the first call is made. Start // processing options with <argv>-element 0 + <skip_argv0>; the // sequence of previously skipped non-option <argv>-elements is // empty. - // + // // <optstring> is a string containing the legitimate option // characters. A colon in <optstring> means that the previous // character is an option that wants an argument. The argument is // taken from the rest of the current <argv>-element, or from the // following <argv>-element, and returned in <optarg>. - // + // // If an option character is seen that is not listed in <optstring>, // return '?' after printing an error message. If you set <opterr> // to zero, the error message is suppressed but we still return '?'. - // + // // If a char in <optstring> is followed by a colon, that means it // wants an arg, so the following text in the same <argv>-element, // or the text of the following <argv>-element, is returned in @@ -68,12 +68,12 @@ public: // element (aside from the initial '-') are option characters. If // <operator()> is called repeatedly, it returns successively each // of the option characters from each of the option elements. - // + // // If <operator()> finds another option character, it returns that // character, updating <optind> and <nextchar> so that the next call // to <operator()> can resume the scan with the following option // character or <argv>-element. - // + // // If there are no more option characters, <operator()> returns // <EOF>. Then <optind> is the index in <argv> of the first // <argv>-element that is not an option. (The <argv>-elements have @@ -85,28 +85,28 @@ public: // For communication from <operator()> to the caller. When // <operator()> finds an option that takes an argument, the argument // value is returned here. - + int optind; // Index in <argv> of the next element to be scanned. This is used // for communication to and from the caller and for communication // between successive calls to <operator()>. On entry to // <operator()>, zero means this is the first call; initialize. - // + // // When <get_opt> returns <EOF>, this is the index of the first of // the non-option elements that the caller should itself scan. - // + // // Otherwise, <optind> communicates from one call to the next how // much of <argv> has been scanned so far. int opterr; // Callers store zero here to inhibit the error message for // unrecognized options. - + int argc_; // Holds the <argc> count. ASYS_TCHAR **argv_; - // Holds the <argv> pointer. + // Holds the <argv> pointer. void dump (void) const; // Dump the state of an object. @@ -115,17 +115,17 @@ public: // Declare the dynamic allocation hooks. private: - + ASYS_TCHAR *nextchar_; // The next char to be scanned in the option-element in which the // last option character we returned was found. This allows us to // pick up the scan where we left off. - // + // // If this is zero, or a null string, it means resume the scan // by advancing to the next <argv>-element. const ASYS_TCHAR *optstring_; - // Holds the option string. + // Holds the option string. }; #if defined (__ACE_INLINE__) diff --git a/ace/Handle_Set.h b/ace/Handle_Set.h index 3c809e4e5e0..d46cfcd44f7 100644 --- a/ace/Handle_Set.h +++ b/ace/Handle_Set.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Handle_Set.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_HANDLE_SET_H @@ -20,19 +20,19 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class ACE_Export ACE_Handle_Set +class ACE_Export ACE_Handle_Set { // = TITLE // C++ wrapper for the socket <FD_SET> abstraction. public: friend class ACE_Handle_Set_Iterator; - // = Initialization and termination. + // = Initialization and termination. - enum + enum { MAXSIZE = ACE_DEFAULT_SELECT_REACTOR_SIZE }; @@ -128,7 +128,7 @@ private: class ACE_Export ACE_Handle_Set_Iterator { // = TITLE - // Iterator for the <ACE_Handle_Set> abstraction. + // Iterator for the <ACE_Handle_Set> abstraction. public: ACE_Handle_Set_Iterator (const ACE_Handle_Set &hs); // Constructor. @@ -158,11 +158,11 @@ private: // The <Handle_Set> we are iterating through. #if defined (ACE_WIN32) - u_int handle_index_; -#elif !defined (ACE_HAS_BIG_FD_SET) - int handle_index_; + u_int handle_index_; +#elif !defined (ACE_HAS_BIG_FD_SET) + int handle_index_; #elif defined (ACE_HAS_BIG_FD_SET) - int handle_index_; + int handle_index_; u_long oldlsb_; #endif /* ACE_WIN32 */ // Index of the bit we're examining in the current <word_num_> word. diff --git a/ace/Hash_Map_Manager.h b/ace/Hash_Map_Manager.h index 98ba6f40b20..7ef64bba8d2 100644 --- a/ace/Hash_Map_Manager.h +++ b/ace/Hash_Map_Manager.h @@ -18,12 +18,13 @@ #define ACE_HASH_MAP_MANAGER_H #include "ace/OS.h" -#include "ace/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Synch.h" + class ACE_Allocator; template <class EXT_ID, class INT_ID> @@ -34,8 +35,8 @@ class ACE_Hash_Map_Entry public: // = Initialization and termination methods. ACE_Hash_Map_Entry (const EXT_ID &ext_id, - const INT_ID &int_id, - ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next = 0, + const INT_ID &int_id, + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next = 0, ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev = 0); // Constructor. @@ -119,11 +120,11 @@ public: // Initialize a <Hash_Map_Manager> with default size. ACE_Hash_Map_Manager (size_t size, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = 0); // Initialize a <Hash_Map_Manager> with size <length>. int open (size_t size = ACE_DEFAULT_MAP_SIZE, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = 0); // Initialize a <Hash_Map_Manager> with <size> elements. int close (void); @@ -134,7 +135,7 @@ public: // Initialize a <Hash_Map_Manager> with size <length>. int bind (const EXT_ID &item, - const INT_ID &int_id); + const INT_ID &int_id); // Associate <ext_id> with <int_id>. If <ext_id> is already in the // map then the <ACE_Hash_Map_Entry> is not changed. Returns 0 if a // new entry is bound successfully, returns 1 if an attempt is made @@ -148,7 +149,7 @@ public: // created entry, or the existing one. int trybind (const EXT_ID &ext_id, - INT_ID &int_id); + INT_ID &int_id); // Associate <ext_id> with <int_id> if and only if <ext_id> is not // in the map. If <ext_id> is already in the map then the <int_id> // parameter is assigned the existing value in the map. Returns 0 @@ -156,16 +157,16 @@ public: // made to bind an existing entry, and returns -1 if failures occur. int trybind (const EXT_ID &ext_id, - INT_ID &int_id, + INT_ID &int_id, ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry); // Same as a normal trybind, except the map entry is also passed // back to the caller. The entry in this case will either be the // newly created entry, or the existing one. int rebind (const EXT_ID &ext_id, - const INT_ID &int_id, - EXT_ID &old_ext_id, - INT_ID &old_int_id); + const INT_ID &int_id, + EXT_ID &old_ext_id, + INT_ID &old_int_id); // Associate <ext_id> with <int_id>. If <ext_id> is not in the map // then behaves just like <bind>. Otherwise, store the old values // of <ext_id> and <int_id> into the "out" parameters and rebind the @@ -176,16 +177,16 @@ public: // and returns -1 if failures occur. int rebind (const EXT_ID &ext_id, - const INT_ID &int_id, - EXT_ID &old_ext_id, - INT_ID &old_int_id, + const INT_ID &int_id, + EXT_ID &old_ext_id, + INT_ID &old_int_id, ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry); // Same as a normal rebind, except the map entry is also passed back // to the caller. The entry in this case will either be the newly // created entry, or the existing one. int find (const EXT_ID &ext_id, - INT_ID &int_id); + INT_ID &int_id); // Locate <ext_id> and pass out parameter via <int_id>. If found, // return 0, returns -1 if not found. @@ -193,7 +194,7 @@ public: // Returns 0 if the <ext_id> is in the mapping, otherwise -1. int find (const EXT_ID &ext_id, - ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry); + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry); // Locate <ext_id> and pass out parameter via <entry>. If found, // return 0, returns -1 if not found. @@ -203,7 +204,7 @@ public: // <int_id>s are *not* dynamically allocated...) int unbind (const EXT_ID &ext_id, - INT_ID &int_id); + INT_ID &int_id); // Break any association of <ext_id>. Returns the value of <int_id> // in case the caller needs to deallocate memory. @@ -270,7 +271,7 @@ protected: int rebind_i (const EXT_ID &ext_id, const INT_ID &int_id, - EXT_ID &old_ext_id, + EXT_ID &old_ext_id, INT_ID &old_int_id); // Performs rebind. Must be called with locks held. @@ -347,11 +348,11 @@ class ACE_Hash_Map_Iterator_Base // // = DESCRIPTION // This class factors out common code from its templatized - // subclasses. + // subclasses. public: // = Initialization method. ACE_Hash_Map_Iterator_Base (ACE_Hash_Map_Manager <EXT_ID, INT_ID, ACE_LOCK> &mm, - int head); + int head); // Contructor. If head != 0, the iterator constructed is positioned // at the head of the map, it is positioned at the end otherwise. @@ -417,7 +418,7 @@ class ACE_Hash_Map_Iterator : public ACE_Hash_Map_Iterator_Base<EXT_ID, INT_ID, public: // = Initialization method. ACE_Hash_Map_Iterator (ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> &mm, - int tail = 0); + int tail = 0); // = Iteration methods. @@ -462,7 +463,7 @@ class ACE_Hash_Map_Reverse_Iterator : public ACE_Hash_Map_Iterator_Base<EXT_ID, public: // = Initialization method. ACE_Hash_Map_Reverse_Iterator (ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> &mm, - int head = 0); + int head = 0); // = Iteration methods. diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h index c2d962b3198..ad6c72bf016 100644 --- a/ace/High_Res_Timer.h +++ b/ace/High_Res_Timer.h @@ -20,7 +20,7 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_High_Res_Timer diff --git a/ace/INET_Addr.h b/ace/INET_Addr.h index d66b8ff515f..3f3ddf2a414 100644 --- a/ace/INET_Addr.h +++ b/ace/INET_Addr.h @@ -5,25 +5,26 @@ // // = LIBRARY // ace -// +// // = FILENAME // INET_Addr.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_INET_ADDR_H #define ACE_INET_ADDR_H #include "ace/ACE.h" -#include "ace/Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Addr.h" + class ACE_Export ACE_INET_Addr : public ACE_Addr { // = TITLE @@ -35,13 +36,13 @@ public: ACE_INET_Addr (const ACE_INET_Addr &); // Copy constructor. - + ACE_INET_Addr (const sockaddr_in *, int len); // Creates an <ACE_INET_Addr> from a sockaddr_in structure. ACE_INET_Addr (u_short port_number, const ASYS_TCHAR host_name[]); // Creates an <ACE_INET_Addr> from a <port_number> and the remote - // <host_name>. + // <host_name>. ACE_INET_Addr (const ASYS_TCHAR address[]); // Initializes an <ACE_INET_Addr> from the <address>, which can be @@ -72,16 +73,16 @@ public: int set (const ACE_INET_Addr &); // Initializes from another <ACE_INET_Addr>. - int set (u_short port_number, const ASYS_TCHAR host_name[], - int encode = 1); + int set (u_short port_number, const ASYS_TCHAR host_name[], + int encode = 1); // Initializes an <ACE_INET_Addr> from a <port_number> and the // remote <host_name>. If <encode> is enabled then <port_number> is // converted into network byte order, otherwise it is assumed to be // in network byte order already and are passed straight through. - int set (u_short port_number, - ACE_UINT32 ip_addr = INADDR_ANY, - int encode = 1); + int set (u_short port_number, + ACE_UINT32 ip_addr = INADDR_ANY, + int encode = 1); // Initializes an <ACE_INET_Addr> from a <port_number> and an // Internet <ip_addr>. If <encode> is enabled then <port_number> // and <ip_addr> are converted into network byte order, otherwise @@ -145,7 +146,7 @@ public: // is non-reentrant since it returns a pointer to a static data // area). - const char *get_host_addr (void) const; + const char *get_host_addr (void) const; // Return the "dotted decimal" Internet address. ACE_UINT32 get_ip_address (void) const; @@ -160,7 +161,7 @@ public: // Compare two addresses for inequality. virtual u_long hash (void) const; - // Computes and returns hash value. + // Computes and returns hash value. void dump (void) const; // Dump the state of an object. diff --git a/ace/IOStream.h b/ace/IOStream.h index 560d5be4004..c1ecb5c9604 100644 --- a/ace/IOStream.h +++ b/ace/IOStream.h @@ -20,7 +20,7 @@ #include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if !defined (ACE_LACKS_ACE_IOSTREAM) diff --git a/ace/IOStream_T.h b/ace/IOStream_T.h index 90229fe02e7..86e0c6bf645 100644 --- a/ace/IOStream_T.h +++ b/ace/IOStream_T.h @@ -25,7 +25,7 @@ #include "ace/IOStream.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if !defined (ACE_LACKS_ACE_IOSTREAM) diff --git a/ace/IO_Cntl_Msg.h b/ace/IO_Cntl_Msg.h index b650057588f..e9420b4048d 100644 --- a/ace/IO_Cntl_Msg.h +++ b/ace/IO_Cntl_Msg.h @@ -5,26 +5,22 @@ // // = LIBRARY // ace -// +// // = FILENAME // IO_Cntl_Msg.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_IO_CNTL_MSG_H #define ACE_IO_CNTL_MSG_H -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - class ACE_Export ACE_IO_Cntl_Msg { // = TITLE - // Data format for IOCTL messages + // Data format for IOCTL messages public: enum ACE_IO_Cntl_Cmds { diff --git a/ace/IO_SAP.h b/ace/IO_SAP.h index 6704bd8f4b1..24774993885 100644 --- a/ace/IO_SAP.h +++ b/ace/IO_SAP.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // IO_SAP.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_IO_SAP_H @@ -20,7 +20,7 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_IO_SAP @@ -31,16 +31,16 @@ class ACE_Export ACE_IO_SAP public: enum { - INVALID_HANDLE = -1 // Be consistent with Winsock + INVALID_HANDLE = -1 // Be consistent with Winsock }; ~ACE_IO_SAP (void); // Default dtor. int control (int cmd, void *) const; - // Interface for ioctl. + // Interface for ioctl. - // = Common I/O handle options related to files. + // = Common I/O handle options related to files. int enable (int value) const; // Enable asynchronous I/O (ACE_SIGIO), urgent data (ACE_SIGURG), @@ -53,10 +53,10 @@ public: // which is passed as the <value>. ACE_HANDLE get_handle (void) const; - // Get the underlying handle. + // Get the underlying handle. void set_handle (ACE_HANDLE handle); - // Set the underlying handle. + // Set the underlying handle. void dump (void) const; // Dump the state of an object. @@ -66,14 +66,14 @@ public: protected: ACE_IO_SAP (void); - // Ensure that ACE_IO_SAP is an abstract base class. + // Ensure that ACE_IO_SAP is an abstract base class. private: ACE_HANDLE handle_; - // Underlying I/O handle. + // Underlying I/O handle. static pid_t pid_; - // Cache the process ID. + // Cache the process ID. }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) diff --git a/ace/IPC_SAP.h b/ace/IPC_SAP.h index c39bac13ec3..e6ee95e1d45 100644 --- a/ace/IPC_SAP.h +++ b/ace/IPC_SAP.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // IPC_SAP.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_IPC_SAP_H @@ -20,7 +20,7 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_IPC_SAP @@ -33,7 +33,7 @@ public: // Default dtor. int control (int cmd, void *) const; - // Interface for ioctl. + // Interface for ioctl. // = Common I/O handle options related to sockets. @@ -48,10 +48,10 @@ public: // which is passed as the <value>. ACE_HANDLE get_handle (void) const; - // Get the underlying handle. + // Get the underlying handle. void set_handle (ACE_HANDLE handle); - // Set the underlying handle. + // Set the underlying handle. void dump (void) const; // Dump the state of an object. @@ -69,7 +69,7 @@ private: // Underlying I/O handle. static pid_t pid_; - // Cache the process ID. + // Cache the process ID. }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) diff --git a/ace/LOCK_SOCK_Acceptor.h b/ace/LOCK_SOCK_Acceptor.h index 6cfda36eb7c..f7838ca79dd 100644 --- a/ace/LOCK_SOCK_Acceptor.h +++ b/ace/LOCK_SOCK_Acceptor.h @@ -4,13 +4,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // LOCK_SOCK_Acceptor.h // // = AUTHOR // James Hu and Irfan Pyarali -// +// // ============================================================================ #ifndef ACE_LOCK_SOCK_ACCEPTOR_H @@ -19,7 +19,7 @@ #include "ace/SOCK_Acceptor.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ template <class ACE_LOCK> @@ -27,7 +27,7 @@ class ACE_LOCK_SOCK_Acceptor : public ACE_SOCK_Acceptor { // = TITLE // Specialize <ACE_SOCK_Acceptor> to lock around <accept>; - // + // // = DESCRIPTION // This class is necessary since some OS platforms (e.g., // Solaris 2.5) do not allow multiple threads/processes to diff --git a/ace/LSOCK.h b/ace/LSOCK.h index 981d6cc0c9f..4774f1a6578 100644 --- a/ace/LSOCK.h +++ b/ace/LSOCK.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // LSOCK.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_LOCAL_SOCK_H @@ -19,26 +19,26 @@ #include "ace/SOCK.h" -#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) - #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) + class ACE_Export ACE_LSOCK { // = TITLE // Create a Local ACE_SOCK, which is used for passing file - // descriptors. + // descriptors. public: #if defined (ACE_HAS_MSG) - int send_handle (const ACE_HANDLE handle) const; - // Send an open FD to another process. + int send_handle (const ACE_HANDLE handle) const; + // Send an open FD to another process. - int recv_handle (ACE_HANDLE &handles, - char *pbuf = 0, - int *len = 0) const; - // Recv an open FD from another process. + int recv_handle (ACE_HANDLE &handles, + char *pbuf = 0, + int *len = 0) const; + // Recv an open FD from another process. #endif /* ACE_HAS_MSG */ void dump (void) const; @@ -48,7 +48,7 @@ public: // Declare the dynamic allocation hooks. protected: - // = Ensure that ACE_LSOCK is an abstract base class + // = Ensure that ACE_LSOCK is an abstract base class ACE_LSOCK (void); // Default constructor. @@ -64,7 +64,7 @@ protected: private: ACE_HANDLE aux_handle_; - // An auxiliary handle used to avoid virtual base classes... + // An auxiliary handle used to avoid virtual base classes... }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) diff --git a/ace/LSOCK_Acceptor.h b/ace/LSOCK_Acceptor.h index df226630ee8..711e6561c5a 100644 --- a/ace/LSOCK_Acceptor.h +++ b/ace/LSOCK_Acceptor.h @@ -5,19 +5,24 @@ // // = LIBRARY // ace -// +// // = FILENAME // LSOCK_Aceeptor.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_LOCAL_SOCK_ACCEPTOR_H #define ACE_LOCAL_SOCK_ACCEPTOR_H #include "ace/SOCK_Acceptor.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/UNIX_Addr.h" #include "ace/LSOCK_Stream.h" @@ -36,24 +41,24 @@ public: ACE_LSOCK_Acceptor (void); // Default constructor. - ACE_LSOCK_Acceptor (const ACE_Addr &local_sap, - int reuse_addr = 0, - int protocol_family = PF_UNIX, - int backlog = 5, - int protocol = 0); + ACE_LSOCK_Acceptor (const ACE_Addr &local_sap, + int reuse_addr = 0, + int protocol_family = PF_UNIX, + int backlog = 5, + int protocol = 0); // Initiate a passive mode socket. - int open (const ACE_Addr &local_sap, - int reuse_addr = 0, - int protocol_family = PF_UNIX, - int backlog = 5, - int protocol = 0); + int open (const ACE_Addr &local_sap, + int reuse_addr = 0, + int protocol_family = PF_UNIX, + int backlog = 5, + int protocol = 0); // Initiate a passive mode socket. - int accept (ACE_LSOCK_Stream &new_ipc_sap, - ACE_Addr * = 0, - ACE_Time_Value *timeout = 0, - int restart = 1, + int accept (ACE_LSOCK_Stream &new_ipc_sap, + ACE_Addr * = 0, + ACE_Time_Value *timeout = 0, + int restart = 1, int reset_new_handle = 0) const; // Accept a new data transfer connection. diff --git a/ace/LSOCK_CODgram.h b/ace/LSOCK_CODgram.h index 81cba17ff0d..ba2baaaaa6b 100644 --- a/ace/LSOCK_CODgram.h +++ b/ace/LSOCK_CODgram.h @@ -5,26 +5,27 @@ // // = LIBRARY // ace -// +// // = FILENAME // LSOCK_CODgram.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_LOCAL_SOCK_CODGRAM_H #define ACE_LOCAL_SOCK_CODGRAM_H #include "ace/LSOCK.h" -#include "ace/SOCK_CODgram.h" -#include "ace/Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/SOCK_CODgram.h" +#include "ace/Addr.h" + #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) class ACE_Export ACE_LSOCK_CODgram : public ACE_SOCK_CODgram, public ACE_LSOCK @@ -37,16 +38,16 @@ public: ACE_LSOCK_CODgram (void); // Default constructor. - ACE_LSOCK_CODgram (const ACE_Addr &remote_sap, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int protocol_family = PF_UNIX, - int protocol = 0); + ACE_LSOCK_CODgram (const ACE_Addr &remote_sap, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int protocol_family = PF_UNIX, + int protocol = 0); // Initiate a connected-datagram. - int open (const ACE_Addr &remote_sap, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int protocol_family = PF_UNIX, - int protocol = 0); + int open (const ACE_Addr &remote_sap, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int protocol_family = PF_UNIX, + int protocol = 0); // Initiate a connected-datagram. ACE_HANDLE get_handle (void) const; diff --git a/ace/LSOCK_Connector.h b/ace/LSOCK_Connector.h index 7443dbfd67c..f3a648ffe87 100644 --- a/ace/LSOCK_Connector.h +++ b/ace/LSOCK_Connector.h @@ -5,26 +5,27 @@ // // = LIBRARY // ace -// +// // = FILENAME // LSOCK_Connector.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_LOCAL_SOCK_CONNECTOR_H #define ACE_LOCAL_SOCK_CONNECTOR_H #include "ace/SOCK_Connector.h" -#include "ace/LSOCK_Stream.h" -#include "ace/UNIX_Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/LSOCK_Stream.h" +#include "ace/UNIX_Addr.h" + #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) class ACE_Export ACE_LSOCK_Connector : public ACE_SOCK_Connector @@ -37,15 +38,15 @@ public: ACE_LSOCK_Connector (void); // Default constructor. - ACE_LSOCK_Connector (ACE_LSOCK_Stream &new_stream, - const ACE_UNIX_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = 0, - int perms = 0, - int protocol_family = PF_UNIX, - int protocol = 0); + ACE_LSOCK_Connector (ACE_LSOCK_Stream &new_stream, + const ACE_UNIX_Addr &remote_sap, + ACE_Time_Value *timeout = 0, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int reuse_addr = 0, + int flags = 0, + int perms = 0, + int protocol_family = PF_UNIX, + int protocol = 0); // Actively connect and produce a <new_stream> if things go well. // The <remote_sap> is the address that we are trying to connect // with. The <timeout> is the amount of time to wait to connect. @@ -60,15 +61,15 @@ public: // the OS do the binding. If <reuse_addr> == 1 then the // <local_addr> is reused, even if it hasn't been cleanedup yet. - int connect (ACE_LSOCK_Stream &new_stream, - const ACE_UNIX_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = 0, - int perms = 0, - int protcol_family = PF_UNIX, - int protocol = 0); + int connect (ACE_LSOCK_Stream &new_stream, + const ACE_UNIX_Addr &remote_sap, + ACE_Time_Value *timeout = 0, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int reuse_addr = 0, + int flags = 0, + int perms = 0, + int protcol_family = PF_UNIX, + int protocol = 0); // Actively connect and produce a <new_stream> if things go well. // The <remote_sap> is the address that we are trying to connect // with. The <timeout> is the amount of time to wait to connect. diff --git a/ace/LSOCK_Dgram.h b/ace/LSOCK_Dgram.h index c70c43971f6..5de995e2fe8 100644 --- a/ace/LSOCK_Dgram.h +++ b/ace/LSOCK_Dgram.h @@ -6,44 +6,45 @@ // // = LIBRARY // ace -// +// // = FILENAME // LSOCK_Dgram.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_LOCAL_SOCK_DGRAM_H #define ACE_LOCAL_SOCK_DGRAM_H #include "ace/SOCK_Dgram.h" -#include "ace/LSOCK.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/LSOCK.h" + #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) class ACE_Export ACE_LSOCK_Dgram : public ACE_SOCK_Dgram, public ACE_LSOCK { // = TITLE - // Create a Local ACE_SOCK datagram. + // Create a Local ACE_SOCK datagram. public: // = Initialization methods. ACE_LSOCK_Dgram (void); // Default constructor. - ACE_LSOCK_Dgram (const ACE_Addr &local, - int protocol_family = PF_UNIX, - int protocol = 0); + ACE_LSOCK_Dgram (const ACE_Addr &local, + int protocol_family = PF_UNIX, + int protocol = 0); // Initiate a local dgram. - int open (const ACE_Addr &local, - int protocol_family = PF_UNIX, - int protocol = 0); + int open (const ACE_Addr &local, + int protocol_family = PF_UNIX, + int protocol = 0); // Initiate a local dgram. ACE_HANDLE get_handle (void) const; diff --git a/ace/LSOCK_Stream.h b/ace/LSOCK_Stream.h index f690ff9cead..3381721833c 100644 --- a/ace/LSOCK_Stream.h +++ b/ace/LSOCK_Stream.h @@ -5,32 +5,33 @@ // // = LIBRARY // ace -// +// // = FILENAME // LSOCK_Stream.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_LOCAL_SOCK_STREAM_H #define ACE_LOCAL_SOCK_STREAM_H #include "ace/SOCK_Stream.h" -#include "ace/UNIX_Addr.h" -#include "ace/LSOCK.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/UNIX_Addr.h" +#include "ace/LSOCK.h" + #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) class ACE_Export ACE_LSOCK_Stream : public ACE_SOCK_Stream, public ACE_LSOCK { // = TITLE - // Create a Local ACE_SOCK stream. + // Create a Local ACE_SOCK stream. public: // = Send/recv methods. ssize_t send_msg (const iovec iov[], @@ -46,7 +47,7 @@ public: ACE_HANDLE get_handle (void) const; // Get handle. - void set_handle (ACE_HANDLE fd); + void set_handle (ACE_HANDLE fd); // Overrides set_handle from the base classes. // = Meta-type info @@ -58,10 +59,10 @@ public: ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. - int get_local_addr (ACE_Addr &) const; + int get_local_addr (ACE_Addr &) const; // This method simply returns the "local" addr. - int get_remote_addr (ACE_Addr &) const; + int get_remote_addr (ACE_Addr &) const; // This method returns the "local" addr since it's the same value // for UNIX domain sockets. }; diff --git a/ace/Local_Name_Space.h b/ace/Local_Name_Space.h index 5e8396998f8..09f1b6863b5 100644 --- a/ace/Local_Name_Space.h +++ b/ace/Local_Name_Space.h @@ -20,14 +20,15 @@ #define ACE_LOCAL_NAME_SPACE_H #include "ace/SString.h" -#include "ace/Containers.h" -#include "ace/Malloc_T.h" -#include "ace/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Containers.h" +#include "ace/Malloc_T.h" +#include "ace/Synch.h" + class ACE_Export ACE_NS_String { // = TITLE @@ -45,8 +46,8 @@ public: // Default "no-op" constructor. ACE_NS_String (ACE_USHORT16 *dst, - const ACE_USHORT16 *src, - size_t len); + const ACE_USHORT16 *src, + size_t len); // Initialization method. ACE_NS_String (const ACE_WString &); diff --git a/ace/Local_Name_Space_T.h b/ace/Local_Name_Space_T.h index 2c232c6d8c4..c061acf3781 100644 --- a/ace/Local_Name_Space_T.h +++ b/ace/Local_Name_Space_T.h @@ -20,14 +20,15 @@ #define ACE_LOCAL_NAME_SPACE_T_H #include "ace/Name_Space.h" -#include "ace/Naming_Context.h" -#include "ace/SString.h" -#include "ace/Local_Name_Space.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Naming_Context.h" +#include "ace/SString.h" +#include "ace/Local_Name_Space.h" + // A short-hand name for our set of name/value/type tuples passed back // to callers. typedef ACE_Unbounded_Set<ACE_WString> ACE_WSTRING_SET; diff --git a/ace/Local_Tokens.h b/ace/Local_Tokens.h index 3752ba29588..9df94d986d1 100644 --- a/ace/Local_Tokens.h +++ b/ace/Local_Tokens.h @@ -40,14 +40,15 @@ #define ACE_LOCAL_MUTEX_H #include "ace/Synch_T.h" -#include "ace/Containers.h" -#include "ace/Synch_Options.h" -#include "ace/Map_Manager.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Containers.h" +#include "ace/Synch_Options.h" +#include "ace/Map_Manager.h" + // 1. class ACE_Export ACE_TOKEN_CONST { diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h index de8676c929b..ee6bcc67f97 100644 --- a/ace/Log_Msg.h +++ b/ace/Log_Msg.h @@ -90,7 +90,7 @@ #include "ace/Log_Record.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (__Lynx__) @@ -151,7 +151,7 @@ public: static void enable_debug_messages(); // Sets the LM_DEBUG flag in the default priority mask used to // initialize ACE_Log_Msg instances. - + ACE_Log_Msg (void); // Initialize logger. diff --git a/ace/Log_Priority.h b/ace/Log_Priority.h index e398d0da873..3d66d35fc32 100644 --- a/ace/Log_Priority.h +++ b/ace/Log_Priority.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Log_Priority.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_LOG_PRIORITY_H @@ -27,38 +27,38 @@ enum ACE_Log_Priority // These values are defined using powers of two so that it's // possible to form a mask to turn them on or off dynamically. - // = Note, this first argument *must* start at 1! + // = Note, this first argument *must* start at 1! LM_SHUTDOWN = 01, // Shutdown the logger (decimal 1). - LM_TRACE = 02, + LM_TRACE = 02, // Messages indicating function-calling sequence (decimal 2). - LM_DEBUG = 04, + LM_DEBUG = 04, // Messages that contain information normally of use only when // debugging a program (decimal 4). - LM_INFO = 010, + LM_INFO = 010, // Informational messages (decimal 8). - LM_NOTICE = 020, + LM_NOTICE = 020, // Conditions that are not error conditions, but that may require // special handling (decimal 16). - LM_WARNING = 040, + LM_WARNING = 040, // Warning messages (decimal 32). - LM_STARTUP = 0100, + LM_STARTUP = 0100, // Initialize the logger (decimal 64). - LM_ERROR = 0200, + LM_ERROR = 0200, // Error messages (decimal 128). - LM_CRITICAL = 0400, + LM_CRITICAL = 0400, // Critical conditions, such as hard device errors (decimal 256). - LM_ALERT = 01000, + LM_ALERT = 01000, // A condition that should be corrected immediately, such as a // corrupted system database (decimal 512). diff --git a/ace/Log_Record.h b/ace/Log_Record.h index de38ba930e1..5cf45662344 100644 --- a/ace/Log_Record.h +++ b/ace/Log_Record.h @@ -17,15 +17,16 @@ // These need to go outside of the #ifdef to avoid problems with // circular dependencies... #include "ace/ACE.h" -#include "ace/Log_Priority.h" -#ifndef ACE_LACKS_PRAGMA_ONCE -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Log_Priority.h" -#if !defined (ACE_LOG_RECORD_H) +#ifndef ACE_LOG_RECORD_H #define ACE_LOG_RECORD_H +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Export ACE_Log_Record { public: diff --git a/ace/Malloc.h b/ace/Malloc.h index bb78ccbf2f2..57e240da004 100644 --- a/ace/Malloc.h +++ b/ace/Malloc.h @@ -18,12 +18,13 @@ #define ACE_MALLOC_H #include "ace/ACE.h" -#include "ace/Malloc_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Malloc_Base.h" + #if defined (ACE_HAS_MALLOC_STATS) #include "ace/Synch_T.h" #if defined (ACE_HAS_THREADS) diff --git a/ace/Malloc_Base.h b/ace/Malloc_Base.h index 6bd7abe5cf5..ff7dac57a08 100644 --- a/ace/Malloc_Base.h +++ b/ace/Malloc_Base.h @@ -17,10 +17,6 @@ #ifndef ACE_MALLOC_BASE_H #define ACE_MALLOC_BASE_H -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - // The definition of this class is located in Malloc.cpp. class ACE_Export ACE_Allocator diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h index fce3ae24943..4c49896d923 100644 --- a/ace/Malloc_T.h +++ b/ace/Malloc_T.h @@ -18,14 +18,15 @@ #define ACE_MALLOC_T_H #include "ace/ACE.h" -#include "ace/Synch.h" -#include "ace/Malloc.h" -#include "ace/Free_List.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Synch.h" +#include "ace/Malloc.h" +#include "ace/Free_List.h" + template <class T> class ACE_Cached_Mem_Pool_Node { @@ -114,8 +115,8 @@ public: ACE_Allocator_Adapter (LPCTSTR pool_name = 0); ACE_Allocator_Adapter (LPCTSTR pool_name, - LPCTSTR lock_name, - MEMORY_POOL_OPTIONS options = 0) + LPCTSTR lock_name, + MEMORY_POOL_OPTIONS options = 0) : allocator_ (pool_name, lock_name, options) { ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter"); @@ -264,8 +265,8 @@ public: // name (if necessary). ACE_Malloc (LPCTSTR pool_name, - LPCTSTR lock_name, - const ACE_MEM_POOL_OPTIONS *options = 0); + LPCTSTR lock_name, + const ACE_MEM_POOL_OPTIONS *options = 0); // Initialize ACE_Malloc. This constructor passes <pool_name> to // initialize the memory pool, and uses <lock_name> to automatically // extract out the name used for the underlying lock name (if @@ -274,8 +275,8 @@ public: #if !defined (ACE_HAS_TEMPLATE_TYPEDEFS) ACE_Malloc (LPCTSTR pool_name, - LPCTSTR lock_name, - const void *options = 0); + LPCTSTR lock_name, + const void *options = 0); // This is necessary to work around template bugs with certain C++ // compilers. #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ diff --git a/ace/Managed_Object.h b/ace/Managed_Object.h index 32ba8d4f20e..1eee00516c3 100644 --- a/ace/Managed_Object.h +++ b/ace/Managed_Object.h @@ -18,12 +18,13 @@ #define ACE_MANAGED_OBJECT_H #include "ace/OS.h" -#include "ace/Object_Manager.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Object_Manager.h" + template <class TYPE> class ACE_Cleanup_Adapter : public ACE_Cleanup { diff --git a/ace/Map_Manager.h b/ace/Map_Manager.h index bb3182cb48a..4d305266dcf 100644 --- a/ace/Map_Manager.h +++ b/ace/Map_Manager.h @@ -18,12 +18,13 @@ #define ACE_MAP_MANAGER_H #include "ace/OS.h" -#include "ace/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Synch.h" + // Forward declaration. class ACE_Allocator; @@ -106,11 +107,11 @@ public: // Initialize a <Map_Manager> with the <ACE_DEFAULT_MAP_SIZE>. ACE_Map_Manager (size_t size, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = 0); // Initialize a <Map_Manager> with <size> entries. int open (size_t length = ACE_DEFAULT_MAP_SIZE, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = 0); // Initialize a <Map_Manager> with size <length>. int close (void); @@ -122,7 +123,7 @@ public: // resources. int trybind (const EXT_ID &ext_id, - INT_ID &int_id); + INT_ID &int_id); // Associate <ext_id> with <int_id> if and only if <ext_id> is not // in the map. If <ext_id> is already in the map then the <int_id> // parameter is overwritten with the existing value in the map @@ -131,16 +132,16 @@ public: // failures occur. int bind (const EXT_ID &ext_id, - const INT_ID &int_id); + const INT_ID &int_id); // Associate <ext_id> with <int_id>. If <ext_id> is already in the // map then the <Map_Entry> is not changed. Returns 0 if a new // entry is bound successfully, returns 1 if an attempt is made to // bind an existing entry, and returns -1 if failures occur. int rebind (const EXT_ID &ext_id, - const INT_ID &int_id, - EXT_ID &old_ext_id, - INT_ID &old_int_id); + const INT_ID &int_id, + EXT_ID &old_ext_id, + INT_ID &old_int_id); // Associate <ext_id> with <int_id>. If <ext_id> is not in the // map then behaves just like <bind>. Otherwise, store the old // values of <ext_id> and <int_id> into the "out" parameters and @@ -217,7 +218,7 @@ protected: // called with locks held. int rebind_i (const EXT_ID &ext_id, const INT_ID &int_id, - EXT_ID &old_ext_id, INT_ID &old_int_id); + EXT_ID &old_ext_id, INT_ID &old_int_id); // Performs a rebinding of <ext_it> to <int_id>. Must be called // with locks held. @@ -294,7 +295,7 @@ class ACE_Map_Iterator_Base // // = DESCRIPTION // This class factors out common code from its templatized - // subclasses. + // subclasses. public: // = Initialization method. ACE_Map_Iterator_Base (ACE_Map_Manager <EXT_ID, INT_ID, ACE_LOCK> &mm, diff --git a/ace/Mem_Map.h b/ace/Mem_Map.h index 1f3ab930882..54daf4b0b62 100644 --- a/ace/Mem_Map.h +++ b/ace/Mem_Map.h @@ -20,7 +20,7 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_Mem_Map diff --git a/ace/Memory_Pool.h b/ace/Memory_Pool.h index 5d25ec7666c..1c7223e4cfa 100644 --- a/ace/Memory_Pool.h +++ b/ace/Memory_Pool.h @@ -5,19 +5,24 @@ // // = LIBRARY // ace -// +// // = FILENAME // ACE_Memory_Pool.h // // = AUTHOR // Doug Schmidt and Prashant Jain -// +// // ============================================================================ #ifndef ACE_MEMORY_POOL_H #define ACE_MEMORY_POOL_H #include "ace/ACE.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Event_Handler.h" #include "ace/Signal.h" #include "ace/Mem_Map.h" @@ -25,10 +30,6 @@ #include "ace/SV_Semaphore_Complex.h" #endif /* !ACE_WIN32 */ -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - #if !defined (ACE_LACKS_SBRK) class ACE_Export ACE_Sbrk_Memory_Pool_Options { @@ -36,7 +37,7 @@ class ACE_Export ACE_Sbrk_Memory_Pool_Options // Helper class for constructor options. // // = DESCRIPTION - // This should be a nested class, but that breaks too many + // This should be a nested class, but that breaks too many // compilers. }; @@ -47,20 +48,20 @@ class ACE_Export ACE_Sbrk_Memory_Pool public: typedef ACE_Sbrk_Memory_Pool_Options OPTIONS; - ACE_Sbrk_Memory_Pool (LPCTSTR backing_store_name = 0, - const OPTIONS *options = 0); + ACE_Sbrk_Memory_Pool (LPCTSTR backing_store_name = 0, + const OPTIONS *options = 0); // Initialize the pool. - + virtual ~ACE_Sbrk_Memory_Pool (void); // = Implementor operations. - virtual void *init_acquire (size_t nbytes, - size_t &rounded_bytes, - int &first_time); - // Ask system for initial chunk of local memory. + virtual void *init_acquire (size_t nbytes, + size_t &rounded_bytes, + int &first_time); + // Ask system for initial chunk of local memory. - virtual void *acquire (size_t nbytes, - size_t &rounded_bytes); + virtual void *acquire (size_t nbytes, + size_t &rounded_bytes); // Acquire at least NBYTES from the memory pool. ROUNDED_BYTES is // the actual number of bytes allocated. @@ -106,14 +107,14 @@ class ACE_Export ACE_Shared_Memory_Pool_Options // Helper class for constructor options. // // = DESCRIPTION - // This should be a nested class, but that breaks too many + // This should be a nested class, but that breaks too many // compilers. public: // = Initialization method. ACE_Shared_Memory_Pool_Options (char *base_addr = ACE_DEFAULT_BASE_ADDR, - size_t max_segments = ACE_DEFAULT_MAX_SEGMENTS, - size_t file_perms = ACE_DEFAULT_FILE_PERMS, - off_t minimum_bytes = 0); + size_t max_segments = ACE_DEFAULT_MAX_SEGMENTS, + size_t file_perms = ACE_DEFAULT_FILE_PERMS, + off_t minimum_bytes = 0); char *base_addr_; // Base address of the memory-mapped backing store. @@ -138,18 +139,18 @@ public: typedef ACE_Shared_Memory_Pool_Options OPTIONS; ACE_Shared_Memory_Pool (LPCTSTR backing_store_name = 0, - const OPTIONS *options = 0); + const OPTIONS *options = 0); // Initialize the pool. virtual ~ACE_Shared_Memory_Pool (void); - virtual void *init_acquire (size_t nbytes, - size_t &rounded_bytes, - int &first_time); + virtual void *init_acquire (size_t nbytes, + size_t &rounded_bytes, + int &first_time); // Ask system for initial chunk of local memory. - virtual void *acquire (size_t nbytes, - size_t &rounded_bytes); + virtual void *acquire (size_t nbytes, + size_t &rounded_bytes); // Acquire at least NBYTES from the memory pool. ROUNDED_BYTES is // the actual number of bytes allocated. Also acquires an internal // semaphore that ensures proper serialization of Memory_Pool @@ -185,14 +186,14 @@ protected: // Implement the algorithm for rounding up the request to an // appropriate chunksize. - virtual int commit_backing_store_name (size_t rounded_bytes, - off_t &offset); + virtual int commit_backing_store_name (size_t rounded_bytes, + off_t &offset); // Commits a new shared memory segment if necessary after an // acquire() or a signal. <offset> is set to the new offset into // the backing store. // = Keeps track of all the segments being used. - struct SHM_TABLE + struct SHM_TABLE { key_t key_; // Shared memory segment key. @@ -223,11 +224,11 @@ protected: // Base shared memory key for the segment. virtual int find_seg (const void *const searchPtr, - off_t &offset, + off_t &offset, size_t &counter); // find the segment that contains the searchPtr - virtual int in_use (off_t &offset, + virtual int in_use (off_t &offset, size_t &counter); // Determine how much memory is currently in use. @@ -246,7 +247,7 @@ class ACE_Export ACE_Local_Memory_Pool_Options // Helper class for constructor options. // // = DESCRIPTION - // This should be a nested class, but that breaks too many + // This should be a nested class, but that breaks too many // compilers. }; @@ -260,23 +261,23 @@ public: typedef ACE_Local_Memory_Pool_Options OPTIONS; ACE_Local_Memory_Pool (LPCTSTR backing_store_name = 0, - const OPTIONS *options = 0); + const OPTIONS *options = 0); // Initialize the pool. - + virtual ~ACE_Local_Memory_Pool (void); - - virtual void *init_acquire (size_t nbytes, - size_t &rounded_bytes, - int &first_time); - // Ask system for initial chunk of local memory. - - virtual void *acquire (size_t nbytes, - size_t &rounded_bytes); + + virtual void *init_acquire (size_t nbytes, + size_t &rounded_bytes, + int &first_time); + // Ask system for initial chunk of local memory. + + virtual void *acquire (size_t nbytes, + size_t &rounded_bytes); // Acquire at least NBYTES from the memory pool. ROUNDED_BYTES is // the actual number of bytes allocated. virtual int release (void); - // Instruct the memory pool to release all of its resources. + // Instruct the memory pool to release all of its resources. virtual int sync (ssize_t len = -1, int flags = MS_SYNC); // Sync <len> bytes of the memory region to the backing store @@ -318,16 +319,16 @@ class ACE_Export ACE_MMAP_Memory_Pool_Options // Helper class for constructor options. // // = DESCRIPTION - // This should be a nested class, but that breaks too many + // This should be a nested class, but that breaks too many // compilers. public: // = Initialization method. ACE_MMAP_Memory_Pool_Options (void *base_addr = ACE_DEFAULT_BASE_ADDR, - int use_fixed_addr = 1, - int write_each_page = 1, - off_t minimum_bytes = 0, - u_int flags = 0, - int guess_on_fault = 1, + int use_fixed_addr = 1, + int write_each_page = 1, + off_t minimum_bytes = 0, + u_int flags = 0, + int guess_on_fault = 1, LPSECURITY_ATTRIBUTES sa = 0); void *base_addr_; @@ -366,25 +367,25 @@ public: // = Initialization and termination methods. ACE_MMAP_Memory_Pool (LPCTSTR backing_store_name = 0, - const OPTIONS *options = 0); + const OPTIONS *options = 0); // Initialize the pool. virtual ~ACE_MMAP_Memory_Pool (void); - virtual void *init_acquire (size_t nbytes, - size_t &rounded_bytes, - int &first_time); - // Ask system for initial chunk of shared memory. + virtual void *init_acquire (size_t nbytes, + size_t &rounded_bytes, + int &first_time); + // Ask system for initial chunk of shared memory. - virtual void *acquire (size_t nbytes, - size_t &rounded_bytes); + virtual void *acquire (size_t nbytes, + size_t &rounded_bytes); // Acquire at least <nbytes> from the memory pool. <rounded_bytes> // is the actual number of bytes allocated. Also acquires an // internal semaphore that ensures proper serialization of // <ACE_MMAP_Memory_Pool> initialization across processes. virtual int release (void); - // Instruct the memory pool to release all of its resources. + // Instruct the memory pool to release all of its resources. virtual int sync (ssize_t len = -1, int flags = MS_SYNC); // Sync the memory region to the backing store starting at @@ -448,7 +449,7 @@ protected: int flags_; // Flags passed into <ACE_OS::mmap>. - + int write_each_page_; // Should we write a byte to each page to forceably allocate memory // for this backing store? @@ -471,11 +472,11 @@ protected: class ACE_Export ACE_Lite_MMAP_Memory_Pool : public ACE_MMAP_Memory_Pool { // = TITLE - // Make a ``lighter-weight'' memory pool based <ACE_Mem_Map>. - // + // Make a ``lighter-weight'' memory pool based <ACE_Mem_Map>. + // // = DESCRIPTION // This implementation allows memory to be shared between - // processes. However, unlike the <ACE_MMAP_Memory_Pool> + // processes. However, unlike the <ACE_MMAP_Memory_Pool> // the sync() methods are no-ops, which means that we don't pay // for the price of flushing the memory to the backing store on // every update. Naturally, this trades off increased @@ -484,11 +485,11 @@ public: // = Initialization and termination methods. ACE_Lite_MMAP_Memory_Pool (LPCTSTR backing_store_name = 0, - const OPTIONS *options = 0); + const OPTIONS *options = 0); // Initialize the pool. - + virtual ~ACE_Lite_MMAP_Memory_Pool (void); - + virtual int sync (ssize_t len = -1, int flags = MS_SYNC); // Overwrite the default sync behavior with no-op diff --git a/ace/Message_Block.h b/ace/Message_Block.h index a6b8c5a7ad9..9a10728ed9a 100644 --- a/ace/Message_Block.h +++ b/ace/Message_Block.h @@ -16,15 +16,15 @@ #include "ace/ACE.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #ifndef ACE_MESSAGE_BLOCK_H #define ACE_MESSAGE_BLOCK_H #include "ace/Malloc.h" -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - // Forward declaration. class ACE_Data_Block; class ACE_Lock; @@ -122,7 +122,7 @@ public: u_long priority = 0, const ACE_Time_Value & execution_time = ACE_Time_Value::zero, const ACE_Time_Value & deadline_time = ACE_Time_Value::max_time, - ACE_Allocator *data_block_allocator = 0); + ACE_Allocator *data_block_allocator = 0); // Create an initialized message of type <type> containing <size> // bytes. The <cont> argument initializes the continuation field in // the <Message_Block>. If <data> == 0 then we create and own the @@ -153,7 +153,7 @@ public: u_long priority = 0, const ACE_Time_Value & execution_time = ACE_Time_Value::zero, const ACE_Time_Value & deadline_time = ACE_Time_Value::max_time, - ACE_Allocator *data_block_allocator = 0); + ACE_Allocator *data_block_allocator = 0); // Create an initialized message of type <type> containing <size> // bytes. The <cont> argument initializes the continuation field in // the <Message_Block>. If <data> == 0 then we create and own the @@ -352,7 +352,7 @@ private: const ACE_Time_Value & execution_time, const ACE_Time_Value & deadline_time, ACE_Data_Block *db, - ACE_Allocator *data_block_allocator); + ACE_Allocator *data_block_allocator); // Perform the actual initialization. int release_i (ACE_Lock *lock); @@ -370,7 +370,7 @@ private: const ACE_Time_Value & execution_time, const ACE_Time_Value & deadline_time, ACE_Data_Block *db, - ACE_Allocator *data_block_allocator); + ACE_Allocator *data_block_allocator); // Perform the actual initialization. size_t rd_ptr_; @@ -430,7 +430,7 @@ public: ACE_Allocator *allocator_strategy, ACE_Lock *locking_strategy, ACE_Message_Block::Message_Flags flags, - ACE_Allocator *data_block_allocator); + ACE_Allocator *data_block_allocator); // Initialize. virtual ~ACE_Data_Block (void); @@ -669,13 +669,13 @@ class ACE_Export ACE_Deadline_Message_Strategy : public ACE_Dynamic_Message_Stra // Deadline based message priority strategy. // // = DESCRIPTION - // Assigns dynamic message priority according to time to deadline. The - // message priority is divided into high and low order bit fields. The - // high order bit field is used for dynamic message priority, which is - // updated whenever the convert_priority (...) method is called. The - // low order bit field is used for static message priority and is left - // unchanged. The partitioning of the priority value into high and low - // order bit fields is done according to the arguments passed to the + // Assigns dynamic message priority according to time to deadline. The + // message priority is divided into high and low order bit fields. The + // high order bit field is used for dynamic message priority, which is + // updated whenever the convert_priority (...) method is called. The + // low order bit field is used for static message priority and is left + // unchanged. The partitioning of the priority value into high and low + // order bit fields is done according to the arguments passed to the // strategy object's constructor. // public: @@ -702,16 +702,16 @@ class ACE_Export ACE_Laxity_Message_Strategy : public ACE_Dynamic_Message_Strate // Laxity based message priority strategy. // // = DESCRIPTION - // Assigns dynamic message priority according to laxity (time to - // deadline minus worst case execution time). The message priority is + // Assigns dynamic message priority according to laxity (time to + // deadline minus worst case execution time). The message priority is // divided into high and low order bit fields. The high order - // bit field is used for dynamic message priority, which is - // updated whenever the convert_priority (...) method is called. The - // low order bit field is used for static message priority and is left - // unchanged. The partitioning of the priority value into high and low - // order bit fields is done according to the arguments passed to the + // bit field is used for dynamic message priority, which is + // updated whenever the convert_priority (...) method is called. The + // low order bit field is used for static message priority and is left + // unchanged. The partitioning of the priority value into high and low + // order bit fields is done according to the arguments passed to the // strategy object's constructor. - // + // public: ACE_Laxity_Message_Strategy (u_long static_bit_field_mask = 0x3FFUL, // 2^(10) - 1 u_long static_bit_field_shift = 10, // 10 low order bits diff --git a/ace/Message_Block_T.h b/ace/Message_Block_T.h index e80c4c98165..330b391da47 100644 --- a/ace/Message_Block_T.h +++ b/ace/Message_Block_T.h @@ -20,7 +20,7 @@ #include "ace/Message_Block.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ template <class ACE_LOCK> diff --git a/ace/Message_Queue.h b/ace/Message_Queue.h index de665e0e2d9..e9766f1ac95 100644 --- a/ace/Message_Queue.h +++ b/ace/Message_Queue.h @@ -18,12 +18,13 @@ #define ACE_MESSAGE_QUEUE_H #include "ace/Message_Block.h" -#include "ace/IO_Cntl_Msg.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/IO_Cntl_Msg.h" + // Forward decls. class ACE_Notification_Strategy; template <ACE_SYNCH_DECL> class ACE_Message_Queue_Iterator; diff --git a/ace/Message_Queue_T.h b/ace/Message_Queue_T.h index bab88c1d548..e5628daffce 100644 --- a/ace/Message_Queue_T.h +++ b/ace/Message_Queue_T.h @@ -20,7 +20,7 @@ #include "ace/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (VXWORKS) @@ -45,9 +45,9 @@ public: friend class ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE>; // = Traits - typedef ACE_Message_Queue_Iterator<ACE_SYNCH_USE> + typedef ACE_Message_Queue_Iterator<ACE_SYNCH_USE> ITERATOR; - typedef ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE> + typedef ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE> REVERSE_ITERATOR; // = Initialization and termination methods. diff --git a/ace/Method_Object.h b/ace/Method_Object.h index 0295f92d2f3..348ccdad669 100644 --- a/ace/Method_Object.h +++ b/ace/Method_Object.h @@ -5,7 +5,7 @@ // // = LIBRARY // ace -// +// // = FILENAME // Method_Object.h // @@ -15,8 +15,8 @@ // Please don't use it directly since it may go away at some point. // // = AUTHOR -// Douglas C. Schmidt <schmidt@cs.wustl.edu> -// +// Douglas C. Schmidt <schmidt@cs.wustl.edu> +// // ============================================================================ #ifndef ACE_METHOD_OBJECT_H @@ -24,12 +24,12 @@ #include "ace/Method_Request.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Maintain backwards compatibility so that Steve Huston doesn't go // postal... ;-) typedef ACE_Method_Request ACE_Method_Object; -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - #endif /* ACE_METHOD_OBJECT_H */ diff --git a/ace/Method_Request.h b/ace/Method_Request.h index eb4276e4368..5b9ab460f0e 100644 --- a/ace/Method_Request.h +++ b/ace/Method_Request.h @@ -5,14 +5,14 @@ // // = LIBRARY // ace -// +// // = FILENAME // Method_Request.h // // = AUTHOR // Andres Kruse <Andres.Kruse@cern.ch> and Douglas C. Schmidt -// <schmidt@cs.wustl.edu> -// +// <schmidt@cs.wustl.edu> +// // ============================================================================ #ifndef ACE_METHOD_REQUEST_H @@ -21,10 +21,10 @@ #include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class ACE_Export ACE_Method_Request +class ACE_Export ACE_Method_Request { // = TITLE // Reifies a method into a request. Subclasses provide diff --git a/ace/Module.h b/ace/Module.h index 3cb5614a42c..c32d41ef5f4 100644 --- a/ace/Module.h +++ b/ace/Module.h @@ -5,25 +5,26 @@ // // = LIBRARY // ace -// +// // = FILENAME // Module.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_MODULE_H #define ACE_MODULE_H #include "ace/ACE.h" -#include "ace/Task_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Task_T.h" + class ACE_Export ACE_Module_Base { // = TITLE @@ -45,7 +46,7 @@ public: M_DELETE_WRITER = 2, // Indicates that close() should delete the reader Task. - M_DELETE = 3 + M_DELETE = 3 // Indicates that close() deletes the Tasks. Don't change this // value without updating the same enum in class ACE_Stream... // The <M_DELETE_READER> and <M_DELETE_WRITER> flags may be or'ed @@ -58,7 +59,7 @@ class ACE_Module : public ACE_Module_Base { // = TITLE // An abstraction for managing a bi-directional flow of messages. - // + // // = DESCRIPTION // This is based on the Module concept in System V Streams, // which contains a pair of Tasks, one for handling upstream @@ -72,22 +73,22 @@ public: ACE_Module (void); // Create an empty Module. - ~ACE_Module (void); + ~ACE_Module (void); // Shutdown the Module. - ACE_Module (const ASYS_TCHAR *module_name, - ACE_Task<ACE_SYNCH_USE> *writer = 0, - ACE_Task<ACE_SYNCH_USE> *reader = 0, - void *args = 0, - int flags = M_DELETE); + ACE_Module (const ASYS_TCHAR *module_name, + ACE_Task<ACE_SYNCH_USE> *writer = 0, + ACE_Task<ACE_SYNCH_USE> *reader = 0, + void *args = 0, + int flags = M_DELETE); // Create an initialized module with <module_name> as its identity // and <reader> and <writer> as its tasks. - int open (const ASYS_TCHAR *module_name, - ACE_Task<ACE_SYNCH_USE> *writer = 0, - ACE_Task<ACE_SYNCH_USE> *reader = 0, - void *a = 0, - int flags = M_DELETE); + int open (const ASYS_TCHAR *module_name, + ACE_Task<ACE_SYNCH_USE> *writer = 0, + ACE_Task<ACE_SYNCH_USE> *reader = 0, + void *a = 0, + int flags = M_DELETE); // Create an initialized module with <module_name> as its identity // and <reader> and <writer> as its tasks. Previously register // reader or writers or closed down and deleted according to the @@ -100,8 +101,8 @@ public: // <flags> values in calls to c'tor(), open(), reader() and // writer(). A previous value M_DELETE[_XXX] can not be overridden. // Should not be called from within ACE_Task::module_closed(). - - // = ACE_Task manipulation routines + + // = ACE_Task manipulation routines ACE_Task<ACE_SYNCH_USE> *writer (void); // Get the writer task. @@ -122,16 +123,16 @@ public: // also be deleted, depending on the old flags_ value. Should not // be called from within ACE_Task::module_closed() - ACE_Task<ACE_SYNCH_USE> *sibling (ACE_Task<ACE_SYNCH_USE> *orig); + ACE_Task<ACE_SYNCH_USE> *sibling (ACE_Task<ACE_SYNCH_USE> *orig); // Set and get pointer to sibling <ACE_Task> in an <ACE_Module> - // = Identify the module + // = Identify the module const ASYS_TCHAR *name (void) const; // Get the module name. void name (const ASYS_TCHAR *); // Set the module name. - // = Argument to the Tasks. + // = Argument to the Tasks. void *arg (void) const; // Get the argument passed to the tasks. @@ -139,7 +140,7 @@ public: // Set the argument passed to the tasks. void link (ACE_Module<ACE_SYNCH_USE> *m); - // Link to other modules in the ustream stack + // Link to other modules in the ustream stack ACE_Module<ACE_SYNCH_USE> *next (void); // Get the next pointer to the module above in the stream. @@ -158,7 +159,7 @@ private: // Implements the close operation for either the reader or the // writer task (depending on <which>). - ACE_Task<ACE_SYNCH_USE> *q_pair_[2]; + ACE_Task<ACE_SYNCH_USE> *q_pair_[2]; // Pair of Tasks that form the "read-side" and "write-side" of the // ACE_Module partitioning. diff --git a/ace/Msg_WFMO_Reactor.h b/ace/Msg_WFMO_Reactor.h index 53287a6e4d8..941bb3e8972 100644 --- a/ace/Msg_WFMO_Reactor.h +++ b/ace/Msg_WFMO_Reactor.h @@ -21,7 +21,7 @@ #include "ace/WFMO_Reactor.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (ACE_WIN32) @@ -100,7 +100,7 @@ protected: // Check for activity on remaining handles. virtual int dispatch_window_messages (void); - // Dispatches window messages. + // Dispatches window messages. }; #endif /* ACE_WIN32 */ diff --git a/ace/Multiplexor.h b/ace/Multiplexor.h index 6a77bd47d2f..081cbabb2a2 100644 --- a/ace/Multiplexor.h +++ b/ace/Multiplexor.h @@ -5,7 +5,7 @@ // // = LIBRARY // ace -// +// // = FILENAME // Multiplexor.h // @@ -15,20 +15,21 @@ // of need. // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_MULTIPLEXOR_H #define ACE_MULTIPLEXOR_H #include "ace/Module.h" -#include "ace/Map_Manager.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Map_Manager.h" + #if defined (ACE_HAS_THREADS) #if 0 @@ -42,7 +43,7 @@ class ACE_Export ACE_Driver public: ACE_Driver (void); ~ACE_Driver (void); - + virtual int link_from_below (ACE_Module *mod); virtual ACE_Module *alloc_module (ACE_Driver *) = 0; virtual int unlink_from_below (ACE_Module *); @@ -55,7 +56,7 @@ class ACE_Export ACE_Multiplexor // = DESCRIPTION // public: - // = Constructors and destructors + // = Constructors and destructors ACE_Multiplexor (void); ~ACE_Multiplexor (void); diff --git a/ace/NT_Service.h b/ace/NT_Service.h index c1244ec9f85..280fbf9d584 100644 --- a/ace/NT_Service.h +++ b/ace/NT_Service.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // NT_Service.h // // = AUTHOR // Steve Huston -// +// // ============================================================================ #ifndef ACE_NT_SERVICE_H @@ -20,7 +20,7 @@ #include "ace/inc_user_config.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 != 0 diff --git a/ace/Name_Proxy.h b/ace/Name_Proxy.h index 2e442cf1a31..446afbc9cc7 100644 --- a/ace/Name_Proxy.h +++ b/ace/Name_Proxy.h @@ -22,16 +22,17 @@ #define ACE_NAME_PROXY_H #include "ace/INET_Addr.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/SOCK_Connector.h" #include "ace/SOCK_Stream.h" #include "ace/Service_Config.h" #include "ace/Synch_Options.h" #include "ace/Name_Request_Reply.h" -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - class ACE_Export ACE_Name_Proxy : public ACE_Event_Handler { // = TITLE @@ -47,12 +48,12 @@ public: // = Establish a binding with the ACE_Name Server. ACE_Name_Proxy (const ACE_INET_Addr &remote_addr, // Address of ACE_Name Server. - ACE_Synch_Options& options = - ACE_Synch_Options::defaults); + ACE_Synch_Options& options = + ACE_Synch_Options::defaults); int open (const ACE_INET_Addr &remote_addr, // Address of ACE_Name Server. - ACE_Synch_Options& options = - ACE_Synch_Options::defaults); + ACE_Synch_Options& options = + ACE_Synch_Options::defaults); int request_reply (ACE_Name_Request &request); // Perform the request and wait for the reply. diff --git a/ace/Name_Request_Reply.h b/ace/Name_Request_Reply.h index fe43ed7ea0b..77470882185 100644 --- a/ace/Name_Request_Reply.h +++ b/ace/Name_Request_Reply.h @@ -22,12 +22,13 @@ #define ACE_NAME_REQUEST_REPLY_H #include "ace/Time_Value.h" -#include "ace/SString.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/SString.h" + class ACE_Export ACE_Name_Request { // = TITLE @@ -65,13 +66,13 @@ public: // Default constructor. ACE_Name_Request (ACE_INT32 msg_type, // Type of request. - const ACE_USHORT16 name[], // - const size_t name_length, - const ACE_USHORT16 value[], - const size_t value_length, - const char type[], - const size_t type_length, - ACE_Time_Value *timeout = 0); // Max time willing to wait for request. + const ACE_USHORT16 name[], // + const size_t name_length, + const ACE_USHORT16 value[], + const size_t value_length, + const char type[], + const size_t type_length, + ACE_Time_Value *timeout = 0); // Max time willing to wait for request. // Create a <ACE_Name_Request> message. void init (void); diff --git a/ace/Name_Space.h b/ace/Name_Space.h index 553da801745..b6f627757d0 100644 --- a/ace/Name_Space.h +++ b/ace/Name_Space.h @@ -18,14 +18,15 @@ #define ACE_NAME_SPACE_H #include "ace/ACE.h" -#include "ace/SString.h" -#include "ace/Containers.h" -#include "ace/Name_Proxy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/SString.h" +#include "ace/Containers.h" +#include "ace/Name_Proxy.h" + typedef ACE_Unbounded_Set<ACE_WString> ACE_WSTRING_SET; class ACE_Export ACE_Name_Binding @@ -35,8 +36,8 @@ class ACE_Export ACE_Name_Binding public: // = Initialization and termination. ACE_Name_Binding (const ACE_WString &n, - const ACE_WString &v, - const char *t); + const ACE_WString &v, + const char *t); // Main constructor that initializes all the fields. ACE_Name_Binding (void); @@ -74,11 +75,11 @@ class ACE_Export ACE_Name_Space { // = TITLE // Abstract base class that provides an abstract interface to - // the database without exposing any implemenation details. + // the database without exposing any implemenation details. // // = DESCRIPTION // Manages a Naming Service Name Space. Provides the basic - // methods -- bind, unbind, rebind, find, and listnames. + // methods -- bind, unbind, rebind, find, and listnames. public: virtual ~ACE_Name_Space (void); @@ -86,14 +87,14 @@ public: // called. virtual int bind (const ACE_WString &name_in, - const ACE_WString &value_in, - const char *type_in = "") = 0; + const ACE_WString &value_in, + const char *type_in = "") = 0; // Bind a new name to a naming context (Wide character strings). virtual int rebind (const ACE_WString &name_in, - const ACE_WString &value_in, - const char *type_in = "") = 0; + const ACE_WString &value_in, + const char *type_in = "") = 0; // Overwrite the value or type of an existing name in a // ACE_Name_Space or bind a new name to the context, if it didn't // exist yet. (Wide charcter strings interface). @@ -103,40 +104,40 @@ public: // Interface). virtual int resolve (const ACE_WString &name_in, - ACE_WString &value_out, - char *&type_out) = 0; + ACE_WString &value_out, + char *&type_out) = 0; // Get value and type of a given name binding (Wide chars). The // caller is responsible for deleting both <value_out> and <type_out>! virtual int list_names (ACE_WSTRING_SET &set_out, - const ACE_WString &pattern_in) = 0; + const ACE_WString &pattern_in) = 0; // Get a set of names matching a specified pattern (wchars). Matching // means the names must begin with the pattern string. virtual int list_values (ACE_WSTRING_SET &set_out, - const ACE_WString &pattern_in) = 0; + const ACE_WString &pattern_in) = 0; // Get a set of values matching a specified pattern (wchars). Matching // means the values must begin with the pattern string. virtual int list_types (ACE_WSTRING_SET &set_out, - const ACE_WString &pattern_in) = 0; + const ACE_WString &pattern_in) = 0; // Get a set of types matching a specified pattern (wchars). Matching // means the types must begin with the pattern string. virtual int list_name_entries (ACE_BINDING_SET &set, - const ACE_WString &pattern) = 0; + const ACE_WString &pattern) = 0; // Get a set of names matching a specified pattern (wchars). Matching // means the names must begin with the pattern string. Returns the // complete binding associated each pattern match. virtual int list_value_entries (ACE_BINDING_SET &set, - const ACE_WString &pattern) = 0; + const ACE_WString &pattern) = 0; // Get a set of values matching a specified pattern (wchars). Matching // means the values must begin with the pattern string. Returns the // complete binding associated each pattern match. virtual int list_type_entries (ACE_BINDING_SET &set, - const ACE_WString &pattern) = 0; + const ACE_WString &pattern) = 0; // Get a set of types matching a specified pattern (wchars). Matching // means the types must begin with the pattern string. Returns the // complete binding associated each pattern match. diff --git a/ace/Naming_Context.h b/ace/Naming_Context.h index 7ca37dd3fd1..a8b51c9c3a5 100644 --- a/ace/Naming_Context.h +++ b/ace/Naming_Context.h @@ -18,16 +18,17 @@ #define ACE_NAMING_CONTEXT_H #include "ace/ACE.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/SString.h" #include "ace/Containers.h" #include "ace/Service_Object.h" #include "ace/Name_Proxy.h" #include "ace/Name_Space.h" -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - // Forward decl class ACE_Name_Options; @@ -23,7 +23,7 @@ # include "ace/inc_user_config.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ // Get OS.h to compile on some of the platforms without DIR info yet. diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h index 846cda63454..b47274e39b6 100644 --- a/ace/Object_Manager.h +++ b/ace/Object_Manager.h @@ -20,7 +20,7 @@ #include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ // Forward declarations. diff --git a/ace/Obstack.h b/ace/Obstack.h index 7313aa2acb0..a65c4ef1a8c 100644 --- a/ace/Obstack.h +++ b/ace/Obstack.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Obstack.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_OBSTACK_H @@ -20,16 +20,16 @@ #include "ace/Malloc.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_Obchunk { // = TITLE - // Defines the state that represents a "chunk" of memory. + // Defines the state that represents a "chunk" of memory. public: friend class ACE_Obstack; - + ACE_Obchunk (size_t size); // Constructor. @@ -75,7 +75,7 @@ public: char *copy (const char *data, size_t len); // Copy the data into the current Obchunk. - + void release (void); // "Release" the entire stack of Obchunks, putting it back on the // free list. diff --git a/ace/Parse_Node.h b/ace/Parse_Node.h index 88b7fb7aaa8..b6975d1355d 100644 --- a/ace/Parse_Node.h +++ b/ace/Parse_Node.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Parse_Node.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_PARSE_NODE_H @@ -20,7 +20,7 @@ #include "ace/Service_Types.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_Parse_Node @@ -92,7 +92,7 @@ class ACE_Export ACE_Remove_Node : public ACE_Parse_Node public: ACE_Remove_Node (const char *name); ~ACE_Remove_Node (void); - + virtual void apply (void); void dump (void) const; @@ -273,7 +273,7 @@ class ACE_Export ACE_Static_Function_Node : public ACE_Location_Node // = TITLE // Keeps track of the symbol name for a function that is not // linked in from a DLL, but is statically linked with the - // application. + // application. public: ACE_Static_Function_Node (const char *func_name); virtual void *symbol (ACE_Service_Object_Exterminator * = 0); diff --git a/ace/Pipe.h b/ace/Pipe.h index d11ca761678..8fa5cd5ce47 100644 --- a/ace/Pipe.h +++ b/ace/Pipe.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Pipe.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_PIPE_H @@ -20,7 +20,7 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_Pipe @@ -31,7 +31,7 @@ class ACE_Export ACE_Pipe // // = DESCRIPTION // Uses "name" for lookup in the ACE service repository. Obtains - // the object and returns it as the appropriate type. + // the object and returns it as the appropriate type. public: // = Initialization and termination. ACE_Pipe (void); @@ -61,7 +61,7 @@ public: // This is the "read" side of the pipe. Note, however, that // processes can also write to this handle as well since pipes are // bi-directional. - + ACE_HANDLE write_handle (void) const; // This is the "write" side of the pipe. Note, however, that // processes can also read to this handle as well since pipes are diff --git a/ace/Priority_Reactor.h b/ace/Priority_Reactor.h index 241ebd7d419..3857a488533 100644 --- a/ace/Priority_Reactor.h +++ b/ace/Priority_Reactor.h @@ -18,12 +18,13 @@ #define ACE_PRIORITY_REACTOR_H #include "ace/Containers.h" -#include "ace/Select_Reactor.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Select_Reactor.h" + class ACE_Export ACE_Priority_Reactor : public ACE_Select_Reactor { // = TITLE @@ -37,13 +38,13 @@ public: // = Initialization and termination methods. ACE_Priority_Reactor (ACE_Sig_Handler * = 0, - ACE_Timer_Queue * = 0); + ACE_Timer_Queue * = 0); // Initialize <ACE_Priority_Reactor> with the default size. ACE_Priority_Reactor (size_t size, - int restart = 0, - ACE_Sig_Handler * = 0, - ACE_Timer_Queue * = 0); + int restart = 0, + ACE_Sig_Handler * = 0, + ACE_Timer_Queue * = 0); // Initialize <ACE_Priority_Reactor> with size <size>. virtual ~ACE_Priority_Reactor (void); @@ -59,11 +60,11 @@ protected: // = Dispatching methods. virtual int dispatch_io_set (int number_of_active_handles, - int &number_dispatched, - int mask, - ACE_Handle_Set &dispatch_mask, - ACE_Handle_Set &ready_mask, - ACE_EH_PTMF callback); + int &number_dispatched, + int mask, + ACE_Handle_Set &dispatch_mask, + ACE_Handle_Set &ready_mask, + ACE_EH_PTMF callback); // We simply override this function to implement the priority // dispatching. diff --git a/ace/Proactor.h b/ace/Proactor.h index 22b4256ac15..2766a512b48 100644 --- a/ace/Proactor.h +++ b/ace/Proactor.h @@ -20,6 +20,11 @@ #define ACE_PROACTOR_H #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Asynch_IO.h" #include "ace/Thread_Manager.h" #include "ace/Event_Handler.h" @@ -31,10 +36,6 @@ #include "ace/Free_List.h" #include "ace/Pipe.h" -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \ (defined (ACE_HAS_AIO_CALLS)) // This only works on Win32 platforms and on Unix platforms supporting @@ -70,13 +71,13 @@ public: // Constructor. int timeout (TIMER_QUEUE &timer_queue, - ACE_Handler *handler, - const void *arg, - const ACE_Time_Value &cur_time); + ACE_Handler *handler, + const void *arg, + const ACE_Time_Value &cur_time); // This method is called when the timer expires. int cancellation (TIMER_QUEUE &timer_queue, - ACE_Handler *handler); + ACE_Handler *handler); // This method is called when the timer is canceled. int deletion (TIMER_QUEUE &timer_queue, @@ -90,7 +91,7 @@ protected: // Set the proactor. This will fail, if one is already set! ACE_Proactor *proactor_; - // Handle to the proactor. This is needed for the completion port. + // Handle to the proactor. This is needed for the completion port. }; class ACE_Export ACE_Proactor : public ACE_Event_Handler @@ -115,20 +116,20 @@ public: // <register_aio_with_proactor> call is used by // <ACE_Asynch_Operation> to store some information with the // Proactor after an <aio_> call is issued, so that the Proactor can - // retrive this information to do <aio_return> and <aio_error>. + // retrive this information to do <aio_return> and <aio_error>. #if defined (ACE_HAS_AIO_CALLS) friend class ACE_Asynch_Accept_Handler; // For POSIX4 implementation, this class takes care of doing the // Asynch_Accept. - + friend class ACE_AIO_Accept_Handler; // We need also this class with the Proactor to take care of // Asynch_Accept when we use AIO_CONTROL_BLOCKS. #endif /* ACE_HAS_AIO_CALLS */ // = Here are the typedefs that the <ACE_Proactor> uses. - + // @@ Can these typedefs be capitalized? typedef ACE_Timer_Queue_T<ACE_Handler *, ACE_Proactor_Handle_Timeout_Upcall, @@ -166,10 +167,10 @@ public: enum POSIX_COMPLETION_STRATEGY { // Use the real time signals and do <sigtimedwait> on the - // signals. + // signals. RT_SIGNALS, // Store the <aio> control blocks with the <Proactor> and do - // <aio_suspend> on them, + // <aio_suspend> on them, AIO_CONTROL_BLOCKS }; // For Posix4-Compliat-Unix systems how the completion of the @@ -217,14 +218,14 @@ public: // Close the IO completion port. virtual int register_handle (ACE_HANDLE handle, - const void *completion_key); + const void *completion_key); // This method adds the <handle> to the I/O completion port. This // function is a no-op function for Unix systems. // = Timer management. virtual long schedule_timer (ACE_Handler &handler, - const void *act, - const ACE_Time_Value &time); + const void *act, + const ACE_Time_Value &time); // Schedule a <handler> that will expire after <time>. If it // expires then <act> is passed in as the value to the <handler>'s // <handle_timeout> callback method. This method returns a @@ -236,27 +237,27 @@ public: // failure (which is guaranteed never to be a valid <timer_id>. virtual long schedule_repeating_timer (ACE_Handler &handler, - const void *act, - const ACE_Time_Value &interval); + const void *act, + const ACE_Time_Value &interval); // Same as above except <interval> it is used to reschedule the // <handler> automatically. virtual long schedule_timer (ACE_Handler &handler, - const void *act, - const ACE_Time_Value &time, - const ACE_Time_Value &interval); + const void *act, + const ACE_Time_Value &time, + const ACE_Time_Value &interval); // This combines the above two methods into one. Mostly for backward // compatibility. virtual int cancel_timer (ACE_Handler &handler, - int dont_call_handle_close = 1); + int dont_call_handle_close = 1); // Cancel all timers associated with this <handler>. Returns number // of timers cancelled. virtual int cancel_timer (long timer_id, - const void **act = 0, - int dont_call_handle_close = 1); + const void **act = 0, + int dont_call_handle_close = 1); // Cancel the single <ACE_Handler> that matches the <timer_id> value // (which was returned from the <schedule> method). If <act> is // non-NULL then it will be set to point to the ``magic cookie'' @@ -291,7 +292,7 @@ public: size_t number_of_threads (void) const; void number_of_threads (size_t threads); - // Number of thread used as a parameter to CreatIoCompletionPort. + // Number of thread used as a parameter to CreatIoCompletionPort. Timer_Queue *timer_queue (void) const; void timer_queue (Timer_Queue *); @@ -308,11 +309,11 @@ public: POSIX_COMPLETION_STRATEGY posix_completion_strategy (void); // Return the completion strategy used. - + int notify_asynch_accept (ACE_Asynch_Accept::Result* result); // Asynch_Accept calls this function to notify an accept to the - // Proactor. -#endif /* ACE_HAS_AIO_CALLS */ + // Proactor. +#endif /* ACE_HAS_AIO_CALLS */ protected: virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); @@ -320,14 +321,14 @@ protected: // when a Win32 object becomes signaled). virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask); + ACE_Reactor_Mask close_mask); // Called when object is removed from the ACE_Reactor. void application_specific_code (ACE_Asynch_Result *asynch_result, - u_long bytes_transferred, - int success, - const void *completion_key, - u_long error); + u_long bytes_transferred, + int success, + const void *completion_key, + u_long error); // Protect against structured exceptions caused by user code when // dispatching handles. @@ -351,15 +352,15 @@ protected: // Access needed to: convert Asynch_Timer into an OVERLAPPED Asynch_Timer (ACE_Handler &handler, - const void *act, - const ACE_Time_Value &tv, - ACE_HANDLE event = ACE_INVALID_HANDLE); + const void *act, + const ACE_Time_Value &tv, + ACE_HANDLE event = ACE_INVALID_HANDLE); protected: virtual void complete (u_long bytes_transferred, - int success, - const void *completion_key, - u_long error = 0); + int success, + const void *completion_key, + u_long error = 0); // This method calls the <handler>'s handle_timeout method ACE_Time_Value time_; @@ -370,7 +371,7 @@ protected: POSIX_COMPLETION_STRATEGY posix_completion_strategy_; // Flag that indicates how the completion status is got from the OS // on the POSIX4-Compliant-Unix systems. - + sigset_t RT_completion_signals_; // These signals are used for completion notification by the // Proactor. @@ -380,30 +381,30 @@ protected: // user has specified someother signals in any of the // read/write/transmit operations, some other signals might also // have got masked. - + ACE_AIO_Accept_Handler* aio_accept_handler_; // This class takes care of doing <accept> when we use // AIO_CONTROL_BLOCKS strategy. - + aiocb *aiocb_list_ [ACE_RTSIG_MAX]; // Use an array to keep track of all the aio's issued - // currently. We'll limit the array size to Maximum RT signals that + // currently. We'll limit the array size to Maximum RT signals that // can be queued in a process. This is the upper limit how many aio // operations can be pending at a time. - + size_t aiocb_list_max_size_; // To maintain the maximum size of the array (list). - + size_t aiocb_list_cur_size_; // To maintain the current size of the array (list). #elif defined (ACE_WIN32) ACE_HANDLE completion_port_; // Handle for the completion port. Unix doesnt have completion // ports. - + size_t number_of_threads_; // This number is passed to the <CreatIOCompletionPort> system - // call. + // call. #endif /* ACE_HAS_AIO_CALLS */ Timer_Queue *timer_queue_; @@ -447,7 +448,7 @@ class ACE_Export ACE_Proactor public: class Timer_Queue {}; ACE_Proactor (size_t /* number_of_threads */ = 0, - Timer_Queue * /* tq */ = 0) {} + Timer_Queue * /* tq */ = 0) {} virtual int handle_events (void) { return -1; } virtual int handle_events (ACE_Time_Value &) { return -1; } diff --git a/ace/Process.h b/ace/Process.h index 3bcaa596d4a..0b0580a17df 100644 --- a/ace/Process.h +++ b/ace/Process.h @@ -20,7 +20,7 @@ #include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_Process_Options diff --git a/ace/Process_Manager.h b/ace/Process_Manager.h index 62e347b70af..f9ddd2b05f5 100644 --- a/ace/Process_Manager.h +++ b/ace/Process_Manager.h @@ -5,25 +5,26 @@ // // = LIBRARY // ace -// +// // = FILENAME -// Process_Manager.h +// Process_Manager.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_PROCESS_MANAGER_H #define ACE_PROCESS_MANAGER_H #include "ace/Synch.h" -#include "ace/Process.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Process.h" + class ACE_Export ACE_Process_Descriptor { // = TITLE @@ -37,7 +38,7 @@ private: pid_t proc_id_; // Unique process ID. - + gid_t grp_id_; // Unique group ID. @@ -51,7 +52,7 @@ class ACE_Export ACE_Process_Manager // Manages a pool of processs. // // = DESCRIPTION - // This class allows operations on groups of processs atomically. + // This class allows operations on groups of processs atomically. public: friend class ACE_Process_Control; @@ -64,10 +65,10 @@ public: ACE_Process_Manager (size_t size = ACE_Process_Manager::DEFAULT_SIZE); ~ACE_Process_Manager (void); - int open (size_t size = DEFAULT_SIZE); + int open (size_t size = DEFAULT_SIZE); // Initialize the manager with room for SIZE processs. - int close (void); + int close (void); // Release all resources. pid_t spawn (ACE_Process_Options &options); @@ -78,11 +79,11 @@ public: int spawn_n (size_t n, ACE_Process_Options &options); // Create N new processs. - + // Returns: on success a unique group id that can be used to control // all of the processs in the same group. On failure, returns -1. - int wait (ACE_Time_Value *timeout = 0); + int wait (ACE_Time_Value *timeout = 0); // Block until there are no more processs running or <timeout> // expires. Returns 0 on success and -1 on failure. diff --git a/ace/Profile_Timer.h b/ace/Profile_Timer.h index 4d0bafee63f..daae4348146 100644 --- a/ace/Profile_Timer.h +++ b/ace/Profile_Timer.h @@ -18,13 +18,14 @@ #define ACE_PROFILE_TIMER_H #include "ace/ACE.h" -#include "ace/Time_Value.h" -#include "ace/High_Res_Timer.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Time_Value.h" +#include "ace/High_Res_Timer.h" + class ACE_Export ACE_Profile_Timer { // = TITLE @@ -36,13 +37,13 @@ public: { // = TITLE // Keeps track of the various user, system, and elapsed (real) - // times. - // + // times. + // // = DESCRIPTION // If <ACE_HAS_FLOATING_POINT> is enabled these values are in // microseconds, otherwise, they are in seconds. public: - ACE_timer_t real_time; + ACE_timer_t real_time; ACE_timer_t user_time; ACE_timer_t system_time; }; diff --git a/ace/RB_Tree.h b/ace/RB_Tree.h index 1bb7c589beb..e7a0c2ce470 100644 --- a/ace/RB_Tree.h +++ b/ace/RB_Tree.h @@ -20,7 +20,7 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class RB_Tree_Node_Base @@ -221,7 +221,7 @@ public: private: // = Declare private and do not define. - + // Explicitly prevent assignment and copy construction of iterators ACE_UNIMPLEMENTED_FUNC (RB_Tree_Iterator (const RB_Tree_Iterator<KEY, T> &)) ACE_UNIMPLEMENTED_FUNC (void operator = (const RB_Tree_Iterator<KEY, T> &)) diff --git a/ace/Reactor.h b/ace/Reactor.h index 6620583f63d..87e1bf8b71c 100644 --- a/ace/Reactor.h +++ b/ace/Reactor.h @@ -23,6 +23,10 @@ class ACE_Reactor_Impl; // programs. #include "ace/Handle_Set.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Timer Queue is a complicated template class. A simple forward // declaration will not work #include "ace/Timer_Queue.h" @@ -35,10 +39,6 @@ class ACE_Reactor_Impl; // forward declaration will be useful here #include "ace/Signal.h" -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - class ACE_Export ACE_Reactor { // = TITLE @@ -74,8 +74,8 @@ public: static void close_singleton (void); // Delete the dynamically allocated Singleton - // = Reactor event loop management methods. - + // = Reactor event loop management methods. + // Note that these method ONLY work on the "Singleton Reactor," // i.e., the one returned from <ACE_Reactor::instance>. static int run_event_loop (void); diff --git a/ace/Reactor_Impl.h b/ace/Reactor_Impl.h index d4edb289073..e5ed3b2f18f 100644 --- a/ace/Reactor_Impl.h +++ b/ace/Reactor_Impl.h @@ -22,7 +22,7 @@ #include "ace/Timer_Queue.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ // Event_Handler.h contains the definition of ACE_Reactor_Mask diff --git a/ace/Read_Buffer.h b/ace/Read_Buffer.h index 9ad4ad605de..14f9dd066dd 100644 --- a/ace/Read_Buffer.h +++ b/ace/Read_Buffer.h @@ -18,12 +18,13 @@ #define ACE_READ_BUFFER_H #include "ace/ACE.h" -#include "ace/Malloc.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Malloc.h" + class ACE_Export ACE_Read_Buffer { // = TITLE diff --git a/ace/Registry.h b/ace/Registry.h index 330a0e95d62..6a24b82df84 100644 --- a/ace/Registry.h +++ b/ace/Registry.h @@ -20,7 +20,7 @@ #include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (ACE_WIN32) @@ -171,7 +171,7 @@ public: // Friend factory enum { MAX_OBJECT_NAME_SIZE = BUFSIZ, - MAX_CONTEXT_NAME_SIZE = MAXPATHLEN + 1 }; + MAX_CONTEXT_NAME_SIZE = MAXPATHLEN + 1 }; // Max sizes of names // (Not too sure about this value) @@ -188,45 +188,45 @@ public: // The following interfaces are for objects int bind_new (const Name &name, - const Object &object); + const Object &object); // Insert <object> with <name> into <this> context // This will fail if <name> already exists // (Name version) int bind_new (const Istring &name, - const Object &object); + const Object &object); // Insert <object> with <name> into <this> context // This will fail if <name> already exists // (String version) int bind (const Name &name, - const Object &object); + const Object &object); // Insert or update <object> with <name> into <this> context // This will not fail if <name> already exists // (Name version) int bind (const Istring &name, - const Object &object); + const Object &object); // Insert or update <object> with <name> into <this> context // This will not fail if <name> already exists // (String version) int rebind (const Name &name, - const Object &object); + const Object &object); // Update <object> with <name> in <this> context // (Name version) int rebind (const Istring &name, - const Object &object); + const Object &object); // Update <object> with <name> in <this> context int resolve (const Name &name, - Object &object); + Object &object); // Find <object> with <name> in <this> context // (Name version) int resolve (const Istring &name, - Object &object); + Object &object); // Find <object> with <name> in <this> context int unbind (const Name &name); @@ -243,57 +243,57 @@ public: // Create new <naming_context> int bind_new_context (const Name &name, - Naming_Context &naming_context, - u_long persistence = REG_OPTION_NON_VOLATILE, - u_long security_access = KEY_ALL_ACCESS, - LPSECURITY_ATTRIBUTES security_attributes = 0); + Naming_Context &naming_context, + u_long persistence = REG_OPTION_NON_VOLATILE, + u_long security_access = KEY_ALL_ACCESS, + LPSECURITY_ATTRIBUTES security_attributes = 0); // Insert <naming_context> with <name> relative to <this> context // This will fail if <name> already exists // (Name version) int bind_new_context (const Istring &name, - Naming_Context &naming_context, - u_long persistence = REG_OPTION_NON_VOLATILE, - u_long security_access = KEY_ALL_ACCESS, - LPSECURITY_ATTRIBUTES security_attributes = 0); + Naming_Context &naming_context, + u_long persistence = REG_OPTION_NON_VOLATILE, + u_long security_access = KEY_ALL_ACCESS, + LPSECURITY_ATTRIBUTES security_attributes = 0); // Insert <naming_context> with <name> relative to <this> context // This will fail if <name> already exists int bind_context (const Name &name, - /* const */ Naming_Context &naming_context, - u_long persistence = REG_OPTION_NON_VOLATILE, - u_long security_access = KEY_ALL_ACCESS, - LPSECURITY_ATTRIBUTES security_attributes = 0); + /* const */ Naming_Context &naming_context, + u_long persistence = REG_OPTION_NON_VOLATILE, + u_long security_access = KEY_ALL_ACCESS, + LPSECURITY_ATTRIBUTES security_attributes = 0); // Insert or update <naming_context> with <name> relative to <this> context // This will not fail if <name> already exists // (Name version) int bind_context (const Istring &name, - /* const */ Naming_Context &naming_context, - u_long persistence = REG_OPTION_NON_VOLATILE, - u_long security_access = KEY_ALL_ACCESS, - LPSECURITY_ATTRIBUTES security_attributes = 0); + /* const */ Naming_Context &naming_context, + u_long persistence = REG_OPTION_NON_VOLATILE, + u_long security_access = KEY_ALL_ACCESS, + LPSECURITY_ATTRIBUTES security_attributes = 0); // Insert or update <naming_context> with <name> relative to <this> context // This will not fail if <name> already exists int rebind_context (const Name &name, - /* const */ Naming_Context &naming_context); + /* const */ Naming_Context &naming_context); // Rename <naming_context> to <name> // (Name version) int rebind_context (const Istring &name, - /* const */ Naming_Context &naming_context); + /* const */ Naming_Context &naming_context); // Rename <naming_context> to <name> int resolve_context (const Name &name, - Naming_Context &naming_context, - u_long security_access = KEY_ALL_ACCESS); + Naming_Context &naming_context, + u_long security_access = KEY_ALL_ACCESS); // Find <naming_context> with <name> in <this> context // (Name version) int resolve_context (const Istring &name, - Naming_Context &naming_context, - u_long security_access = KEY_ALL_ACCESS); + Naming_Context &naming_context, + u_long security_access = KEY_ALL_ACCESS); // Find <naming_context> with <name> in <this> context int unbind_context (const Name &name); @@ -307,8 +307,8 @@ public: // Same as unbind_context() with <this> as naming_context int list (u_long how_many, - Binding_List &list, - Binding_Iterator &iterator); + Binding_List &list, + Binding_Iterator &iterator); // listing function: iterator creator // This is useful when there are many objects and contexts // in <this> context and you only want to look at a few entries @@ -398,7 +398,7 @@ public: // Next entry int next_n (u_long how_many, - Binding_List &list); + Binding_List &list); // Next <how_many> entries int destroy (void); @@ -426,51 +426,51 @@ public: // Base class for state { public: - Iteration_State (Binding_Iterator &iterator); + Iteration_State (Binding_Iterator &iterator); - virtual int next_n (u_long how_many, - Binding_List &list) = 0; - // Next <how_many> entries + virtual int next_n (u_long how_many, + Binding_List &list) = 0; + // Next <how_many> entries - void reset (); - // Reset state + void reset (); + // Reset state protected: - Binding_Iterator *parent_; - // Pointer to parent iterator + Binding_Iterator *parent_; + // Pointer to parent iterator - u_long index_; + u_long index_; }; private: class ACE_Export Object_Iteration : public Iteration_State { public: - Object_Iteration (Binding_Iterator &iterator); + Object_Iteration (Binding_Iterator &iterator); - int next_n (u_long how_many, - Binding_List &list); - // Next <how_many> entries + int next_n (u_long how_many, + Binding_List &list); + // Next <how_many> entries }; class ACE_Export Context_Iteration : public Iteration_State { public: - Context_Iteration (Binding_Iterator &iterator); + Context_Iteration (Binding_Iterator &iterator); - int next_n (u_long how_many, - Binding_List &list); - // Next <how_many> entries + int next_n (u_long how_many, + Binding_List &list); + // Next <how_many> entries }; class ACE_Export Iteration_Complete : public Iteration_State { public: - Iteration_Complete (Binding_Iterator &iterator); + Iteration_Complete (Binding_Iterator &iterator); - int next_n (u_long how_many, - Binding_List &list); - // Next <how_many> entries + int next_n (u_long how_many, + Binding_List &list); + // Next <how_many> entries }; friend class Iteration_State; @@ -504,8 +504,8 @@ class ACE_Export ACE_Predefined_Naming_Contexts // predefined registries. public: static int connect (ACE_Registry::Naming_Context &naming_context, - HKEY predefined = HKEY_LOCAL_MACHINE, - LPCTSTR machine_name = 0); + HKEY predefined = HKEY_LOCAL_MACHINE, + LPCTSTR machine_name = 0); // Factory method for connecting to predefined registries. This // method works for both remote and local machines. However, for // remote machines, HKEY_CLASSES_ROOT and HKEY_CURRENT_USER types diff --git a/ace/Registry_Name_Space.h b/ace/Registry_Name_Space.h index 8ce4ea191e8..e84fbef7b30 100644 --- a/ace/Registry_Name_Space.h +++ b/ace/Registry_Name_Space.h @@ -20,7 +20,7 @@ #include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if (defined (ACE_WIN32) && defined (UNICODE)) diff --git a/ace/Remote_Name_Space.h b/ace/Remote_Name_Space.h index a94036d53ef..3ba0b8edce9 100644 --- a/ace/Remote_Name_Space.h +++ b/ace/Remote_Name_Space.h @@ -18,15 +18,16 @@ #define ACE_REMOTE_NAME_SPACE_H #include "ace/ACE.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/SString.h" #include "ace/Containers.h" #include "ace/Name_Proxy.h" #include "ace/Name_Space.h" -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - typedef ACE_Unbounded_Set<ACE_WString> ACE_WSTRING_SET; class ACE_Export ACE_Remote_Name_Space : public ACE_Name_Space diff --git a/ace/Remote_Tokens.h b/ace/Remote_Tokens.h index a91bba25809..f9fd4ee6664 100644 --- a/ace/Remote_Tokens.h +++ b/ace/Remote_Tokens.h @@ -5,30 +5,31 @@ // // = LIBRARY // ACE -// +// // = FILENAME // Remote_Tokens.h // // = AUTHOR // Douglas C. Schmidt (schmidt@cs.wustl.edu) and // Tim Harrison (harrison@cs.wustl.edu) -// +// // ============================================================================ #ifndef ACE_REMOTE_MUTEX_H #define ACE_REMOTE_MUTEX_H #include "ace/INET_Addr.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/SOCK_Connector.h" #include "ace/SOCK_Stream.h" #include "ace/Synch_Options.h" #include "ace/Local_Tokens.h" #include "ace/Token_Request_Reply.h" -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - class ACE_Export ACE_Remote_Token_Proxy : public ACE_Token_Proxy { // = TITLE @@ -51,8 +52,8 @@ public: // Death. int open (const char *name, - int ignore_deadlock = 0, - int debug = 0); + int ignore_deadlock = 0, + int debug = 0); // Same as Token_Proxy. <name> is the string uniquely identifying // the token. <ignore_deadlock> can be 1 to disable deadlock // notifications. <debug> prints debug messages. @@ -67,9 +68,9 @@ public: // remote tokens. virtual int acquire (int notify = 0, - void (*sleep_hook)(void *) = 0, - ACE_Synch_Options &options = - ACE_Synch_Options::synch); + void (*sleep_hook)(void *) = 0, + ACE_Synch_Options &options = + ACE_Synch_Options::synch); // Acquire the distributed token. If notify is specified and the // token is already held, the owner is notified. options contains // the timeout value for the acquire call. The timer is kept at the @@ -83,8 +84,8 @@ public: // EWOULDBLOCK if the token was already held. virtual int renew (int requeue_position = 0, - ACE_Synch_Options &options = - ACE_Synch_Options::synch); + ACE_Synch_Options &options = + ACE_Synch_Options::synch); // Renew the token by offering to release it if there are any other // waiters, otherwise get the token back immediately. This renew // has the same semantics as ACE_Local_Mutex release. It is @@ -98,14 +99,14 @@ public: // the position in the waiter list.) virtual int release (ACE_Synch_Options &options = - ACE_Synch_Options::synch); + ACE_Synch_Options::synch); // Release the distributed token. Similar to ACE_Local_Mutex, if the // caller is not the owner, it is removed from the waiter list (if // applicable.) Returns 0 on success, -1 on failure with <errno> == // problem. virtual int remove (ACE_Synch_Options &options = - ACE_Synch_Options::synch); + ACE_Synch_Options::synch); // Become interface compliant for ACE_Guard<>. This has no // functionality. @@ -130,7 +131,7 @@ protected: // if shadows report deadlock, go remote anyway int request_reply (ACE_Token_Request &request, - ACE_Synch_Options &options); + ACE_Synch_Options &options); // Perform the request and wait for the reply. }; @@ -153,8 +154,8 @@ public: // Null creation. Remote_Token_Proxy::open must be called. ACE_Remote_Mutex (const char *token_name, - int ignore_deadlock = 0, - int debug = 0); + int ignore_deadlock = 0, + int debug = 0); // Calls Remote_Token_Proxy::open for you. void dump (void) const; @@ -186,8 +187,8 @@ public: ACE_Remote_RLock (void); ACE_Remote_RLock (const char *token_name, - int ignore_deadlock = 0, - int debug = 0); + int ignore_deadlock = 0, + int debug = 0); ACE_Remote_RLock (const ACE_Remote_RLock &mutex); @@ -222,8 +223,8 @@ public: ACE_Remote_WLock (void); ACE_Remote_WLock (const char *token_name, - int ignore_deadlock = 0, - int debug = 0); + int ignore_deadlock = 0, + int debug = 0); ACE_Remote_WLock (const ACE_Remote_WLock &mutex); diff --git a/ace/SOCK.h b/ace/SOCK.h index a32ee1cddbb..9edfed18905 100644 --- a/ace/SOCK.h +++ b/ace/SOCK.h @@ -5,33 +5,34 @@ // // = LIBRARY // ace -// +// // = FILENAME // SOCK.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// //============================================================================ #ifndef ACE_SOCK_H #define ACE_SOCK_H #include "ace/ACE.h" -#include "ace/Addr.h" -#include "ace/IPC_SAP.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Addr.h" +#include "ace/IPC_SAP.h" + class ACE_Export ACE_SOCK : public ACE_IPC_SAP { // = TITLE // An abstract class which forms the basis for more specific // classes (such as ACE_SOCK_Acceptor and ACE_SOCK_Connector). // Do not instantiate this class. - // + // // = DESCRIPTION // This class provides functions that are common to all of the // SOCK-type classes. ACE_SOCK provides the ability to get and @@ -41,15 +42,15 @@ public: ~ACE_SOCK (void); // Default ctor/dtor. - int set_option (int level, - int option, - void *optval, + int set_option (int level, + int option, + void *optval, int optlen) const; // Wrapper around the setsockopt() system call. - int get_option (int level, - int option, - void *optval, + int get_option (int level, + int option, + void *optval, int *optlen) const; // Wrapper around the getsockopt() system call. @@ -70,17 +71,17 @@ public: ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. - int open (int type, - int protocol_family, + int open (int type, + int protocol_family, int protocol, int reuse_addr); // Wrapper around the <socket> system call. protected: ACE_SOCK (int type, - int protocol_family, + int protocol_family, int protocol = 0, - int reuse_addr = 0); + int reuse_addr = 0); // Constructor with arguments to call the <socket> system call. ACE_SOCK (void); diff --git a/ace/SOCK_Acceptor.h b/ace/SOCK_Acceptor.h index a49611e64c1..381100bd9bb 100644 --- a/ace/SOCK_Acceptor.h +++ b/ace/SOCK_Acceptor.h @@ -5,25 +5,26 @@ // // = LIBRARY // ace -// +// // = FILENAME // SOCK_Acceptor.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SOCK_ACCEPTOR_H #define ACE_SOCK_ACCEPTOR_H #include "ace/SOCK_Stream.h" -#include "ace/Time_Value.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Time_Value.h" + class ACE_Export ACE_SOCK_Acceptor : public ACE_SOCK { // = TITLE @@ -34,28 +35,28 @@ public: ACE_SOCK_Acceptor (void); // Default constructor. - ACE_SOCK_Acceptor (const ACE_Addr &local_sap, - int reuse_addr = 0, - int protocol_family = PF_INET, - int backlog = 5, - int protocol = 0); + ACE_SOCK_Acceptor (const ACE_Addr &local_sap, + int reuse_addr = 0, + int protocol_family = PF_INET, + int backlog = 5, + int protocol = 0); // Initiate a passive mode socket. ~ACE_SOCK_Acceptor (void); // Default dtor. - int open (const ACE_Addr &local_sap, - int reuse_addr = 0, - int protocol_family = PF_INET, - int backlog = 5, - int protocol = 0); + int open (const ACE_Addr &local_sap, + int reuse_addr = 0, + int protocol_family = PF_INET, + int backlog = 5, + int protocol = 0); // Initiate a passive mode socket. - + // = Passive connection acceptance method. - int accept (ACE_SOCK_Stream &new_stream, - ACE_Addr *remote_addr = 0, - ACE_Time_Value *timeout = 0, - int restart = 1, + int accept (ACE_SOCK_Stream &new_stream, + ACE_Addr *remote_addr = 0, + ACE_Time_Value *timeout = 0, + int restart = 1, int reset_new_handle = 0) const; // Accept a new data transfer connection. A <timeout> of 0 means // block forever, a <timeout> of {0, 0} means poll. <restart> == 1 @@ -72,15 +73,15 @@ public: // Declare the dynamic allocation hooks. protected: - ACE_HANDLE shared_accept (ACE_Addr *remote_addr, - ACE_Time_Value *, - int restart, + ACE_HANDLE shared_accept (ACE_Addr *remote_addr, + ACE_Time_Value *, + int restart, int reset_new_handle) const; // Shared by both the ACE_LSOCK_Acceptor and ACE_SOCK_Acceptor. private: - int get_remote_addr (ACE_Addr &) const; - // Do not allow this function to percolate up to this interface... + int get_remote_addr (ACE_Addr &) const; + // Do not allow this function to percolate up to this interface... }; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) diff --git a/ace/SOCK_CODgram.h b/ace/SOCK_CODgram.h index 623dad627ae..7eeac05577a 100644 --- a/ace/SOCK_CODgram.h +++ b/ace/SOCK_CODgram.h @@ -5,25 +5,26 @@ // // = LIBRARY // ace -// +// // = FILENAME // SOCK_CODgram.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SOCK_CODGRAM_H #define ACE_SOCK_CODGRAM_H #include "ace/SOCK_IO.h" -#include "ace/Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Addr.h" + class ACE_Export ACE_SOCK_CODgram : public ACE_SOCK_IO { // = TITLE @@ -34,22 +35,22 @@ public: ACE_SOCK_CODgram (void); // Default constructor. - ACE_SOCK_CODgram (const ACE_Addr &remote_sap, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int protocol_family = PF_INET, - int protocol = 0, - int reuse_addr = 0); + ACE_SOCK_CODgram (const ACE_Addr &remote_sap, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int protocol_family = PF_INET, + int protocol = 0, + int reuse_addr = 0); ~ACE_SOCK_CODgram (void); // Default dtor. // Initiate a connected dgram. - int open (const ACE_Addr &remote_sap, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int protocol_family = PF_INET, - int protocol = 0, - int reuse_addr = 0); + int open (const ACE_Addr &remote_sap, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int protocol_family = PF_INET, + int protocol = 0, + int reuse_addr = 0); // Initiate a connected dgram. void dump (void) const; diff --git a/ace/SOCK_Connector.h b/ace/SOCK_Connector.h index 175e6666d2a..57d52903f52 100644 --- a/ace/SOCK_Connector.h +++ b/ace/SOCK_Connector.h @@ -5,25 +5,26 @@ // // = LIBRARY // ace -// +// // = FILENAME -// SOCK_Connector.h +// SOCK_Connector.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SOCK_CONNECTOR_H #define ACE_SOCK_CONNECTOR_H #include "ace/SOCK_Stream.h" -#include "ace/Time_Value.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Time_Value.h" + class ACE_Export ACE_SOCK_Connector { // = TITLE @@ -37,15 +38,15 @@ public: ACE_SOCK_Connector (void); // Default constructor. - ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = 0, - int perms = 0, - int protocol_family = PF_INET, - int protocol = 0); + ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, + const ACE_Addr &remote_sap, + ACE_Time_Value *timeout = 0, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int reuse_addr = 0, + int flags = 0, + int perms = 0, + int protocol_family = PF_INET, + int protocol = 0); // Actively connect and produce a <new_stream> if things go well. // The <remote_sap> is the address that we are trying to connect // with. The <timeout> is the amount of time to wait to connect. @@ -63,15 +64,15 @@ public: ~ACE_SOCK_Connector (void); // Default dtor. - int connect (ACE_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = 0, - int perms = 0, - int protocol_family = PF_INET, - int protocol = 0); + int connect (ACE_SOCK_Stream &new_stream, + const ACE_Addr &remote_sap, + ACE_Time_Value *timeout = 0, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int reuse_addr = 0, + int flags = 0, + int perms = 0, + int protocol_family = PF_INET, + int protocol = 0); // Actively connect and produce a <new_stream> if things go well. // The <remote_sap> is the address that we are trying to connect // with. The <timeout> is the amount of time to wait to connect. @@ -87,9 +88,9 @@ public: // <local_addr> is reused, even if it hasn't been cleanedup yet. // = Completion routine. - int complete (ACE_SOCK_Stream &new_stream, - ACE_Addr *remote_sap = 0, - ACE_Time_Value *timeout = 0); + int complete (ACE_SOCK_Stream &new_stream, + ACE_Addr *remote_sap = 0, + ACE_Time_Value *timeout = 0); // Try to complete a non-blocking connection. // If connection completion is successful then <new_stream> contains // the connected ACE_SOCK_Stream. If <remote_sap> is non-NULL then it diff --git a/ace/SOCK_Dgram.h b/ace/SOCK_Dgram.h index 671ddfe6b45..edaa691a9ab 100644 --- a/ace/SOCK_Dgram.h +++ b/ace/SOCK_Dgram.h @@ -5,37 +5,38 @@ // // = LIBRARY // ace -// +// // = FILENAME // SOCK_Dgram.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // =========================================================================== #ifndef ACE_SOCK_DGRAM_H #define ACE_SOCK_DGRAM_H #include "ace/SOCK.h" -#include "ace/Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Addr.h" + class ACE_Export ACE_SOCK_Dgram : public ACE_SOCK { // = TITLE // Defines the member functions for the ACE_SOCK datagram - // abstraction. + // abstraction. public: // = Initialization routines. ACE_SOCK_Dgram (void); // Default constructor. - ACE_SOCK_Dgram (const ACE_Addr &local, - int protocol_family = PF_INET, + ACE_SOCK_Dgram (const ACE_Addr &local, + int protocol_family = PF_INET, int protocol = 0, int reuse_addr = 0); // Initiate a socket dgram. @@ -43,29 +44,29 @@ public: ~ACE_SOCK_Dgram (void); // Default dtor. - int open (const ACE_Addr &local, - int protocol_family = PF_INET, + int open (const ACE_Addr &local, + int protocol_family = PF_INET, int protocol = 0, int reuse_addr = 0); // Initiate a socket dgram. // = Data transfer routines. - ssize_t send (const void *buf, - size_t n, - const ACE_Addr &addr, + ssize_t send (const void *buf, + size_t n, + const ACE_Addr &addr, int flags = 0) const; // Send an <n> byte <buf> to the datagram socket (uses sendto(3)). - ssize_t recv (void *buf, - size_t n, - ACE_Addr &addr, + ssize_t recv (void *buf, + size_t n, + ACE_Addr &addr, int flags = 0) const; // Receive an <n> byte <buf> from the datagram socket (uses // recvfrom(3)). - ssize_t recv (iovec *io_vec, - ACE_Addr &addr, - int flags = 0) const; + ssize_t recv (iovec *io_vec, + ACE_Addr &addr, + int flags = 0) const; // Allows a client to read from a socket without having to provide a // buffer to read. This method determines how much data is in the // socket, allocates a buffer of this size, reads in the data, and @@ -73,25 +74,25 @@ public: // deleting the member in the <iov_base> field of <io_vec> using the // ``delete []'' syntax. - ssize_t send (const iovec iov[], - size_t n, - const ACE_Addr &addr, + ssize_t send (const iovec iov[], + size_t n, + const ACE_Addr &addr, int flags = 0) const; // Send an <iovec> of size <n> to the datagram socket (uses // sendmsg(3)). - ssize_t recv (iovec iov[], - size_t n, - ACE_Addr &addr, - int flags = 0) const; + ssize_t recv (iovec iov[], + size_t n, + ACE_Addr &addr, + int flags = 0) const; // Recv an <iovec> of size <n> to the datagram socket (uses // recvmsg(3)). - ssize_t recv (void *buf, - size_t n, - ACE_Addr &addr, - int flags, - const ACE_Time_Value *timeout) const; + ssize_t recv (void *buf, + size_t n, + ACE_Addr &addr, + int flags, + const ACE_Time_Value *timeout) const; // Wait up to <timeout> amount of time to receive a datagram into // <buf>. The <ACE_Time_Value> indicates how long to blocking // trying to receive. If <timeout> == 0, the caller will block @@ -106,13 +107,13 @@ public: ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. -protected: - int shared_open (const ACE_Addr &local, +protected: + int shared_open (const ACE_Addr &local, int protocol_family); // Open is shared by this and by <LSOCK_Dgram>. private: - int get_remote_addr (ACE_Addr &) const; + int get_remote_addr (ACE_Addr &) const; // Do not allow this function to percolate up to this interface... }; diff --git a/ace/SOCK_Dgram_Bcast.h b/ace/SOCK_Dgram_Bcast.h index 86e9c0e234f..0faf2391775 100644 --- a/ace/SOCK_Dgram_Bcast.h +++ b/ace/SOCK_Dgram_Bcast.h @@ -4,26 +4,27 @@ // ============================================================================ // = LIBRARY // ace -// +// // = FILENAME // SOCK_Dgram_Bcast.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SOCK_DGRAM_BCAST_H #define ACE_SOCK_DGRAM_BCAST_H #include "ace/INET_Addr.h" -#include "ace/SOCK_Dgram.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class ACE_Export ACE_Bcast_Node +#include "ace/SOCK_Dgram.h" + +class ACE_Export ACE_Bcast_Node { public: ACE_Bcast_Node (ACE_INET_Addr &, ACE_Bcast_Node *); @@ -41,14 +42,14 @@ class ACE_Export ACE_SOCK_Dgram_Bcast : public ACE_SOCK_Dgram { // = TITLE // Defines the member functions for the ACE_SOCK datagram - // abstraction. + // abstraction. public: // = Initialization and termination methods. ACE_SOCK_Dgram_Bcast (void); // Default constructor. - ACE_SOCK_Dgram_Bcast (const ACE_Addr &local, - int protocol_family = PF_INET, + ACE_SOCK_Dgram_Bcast (const ACE_Addr &local, + int protocol_family = PF_INET, int protocol = 0, int reuse_addr = 0, const ASYS_TCHAR *host_name = 0); @@ -58,8 +59,8 @@ public: // Initiate a connectionless datagram broadcast endpoint. - int open (const ACE_Addr &local, - int protocol_family = PF_INET, + int open (const ACE_Addr &local, + int protocol_family = PF_INET, int protocol = 0, int reuse_addr = 0, const ASYS_TCHAR *host_name = 0); @@ -68,30 +69,30 @@ public: int close (void); // Close up and release dynamically allocated resources. - ssize_t send (const void *buf, - size_t n, - u_short portnum, + ssize_t send (const void *buf, + size_t n, + u_short portnum, int flags = 0) const; // Broadcast the datagram to every interface. Returns the average // number of bytes sent. - ssize_t send (const iovec iov[], - size_t n, - u_short portnum, + ssize_t send (const iovec iov[], + size_t n, + u_short portnum, int flags = 0) const; // Broadcast the <iovec> datagrams to every interface. Returns the // average number of bytes sent. - ssize_t send (const void *buf, - size_t n, - const ACE_Addr &addr, + ssize_t send (const void *buf, + size_t n, + const ACE_Addr &addr, int flags = 0) const; // Broadcast an N byte datagram to ADDR (note that addr must be // preassigned to the broadcast address of the subnet...). - ssize_t send (const iovec iov[], - size_t n, - const ACE_Addr &addr, + ssize_t send (const iovec iov[], + size_t n, + const ACE_Addr &addr, int flags = 0) const; // Broadcast an <iovec> of size <n> to <addr> as a datagram (note // that addr must be preassigned to the broadcast address of the @@ -110,7 +111,7 @@ private: ACE_Bcast_Node *if_list_; // Points to the head of the list of broadcast interfaces. - int get_remote_addr (ACE_Addr &) const; + int get_remote_addr (ACE_Addr &) const; // Do not allow this function to percolate up to this interface... }; diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h index 9209902f557..a5640829f7e 100644 --- a/ace/SOCK_Dgram_Mcast.h +++ b/ace/SOCK_Dgram_Mcast.h @@ -5,31 +5,32 @@ // // = LIBRARY // ace -// +// // = FILENAME // SOCK_Dgram_Mcast.h // // = AUTHORS // Irfan Pyrali (ip1@cs.wustl.edu) // Tim Harrison (harrison@cs.wustl.edu) -// +// // ============================================================================ #ifndef ACE_SOCK_DGRAM_MCAST_H #define ACE_SOCK_DGRAM_MCAST_H #include "ace/SOCK_Dgram.h" -#include "ace/INET_Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/INET_Addr.h" + class ACE_Export ACE_SOCK_Dgram_Mcast : public ACE_SOCK_Dgram { // = TITLE // Defines the member functions for the ACE SOCK wrapper - // multicast abstraction. + // multicast abstraction. public: // = Initialization routine. ACE_SOCK_Dgram_Mcast (void); @@ -44,19 +45,19 @@ public: // = Multicast group management routines. int subscribe (const ACE_INET_Addr &mcast_addr, - int reuse_addr = 1, + int reuse_addr = 1, #if defined (ACE_PSOS) // pSOS supports numbers, not names for network interfaces - long net_if = 0, + long net_if = 0, #else - const ASYS_TCHAR *net_if = 0, + const ASYS_TCHAR *net_if = 0, #endif /* defined (ACE_PSOS) */ - int protocol_family = PF_INET, - int protocol = 0); + int protocol_family = PF_INET, + int protocol = 0); // Join a multicast group by telling the network interface device // driver to accept datagrams with ACE_INET_Addr &mcast_addr // multicast addresses. - // + // // If you have called open already, subscribe closes the socket and // opens a new socket bound to the mcast_addr. // @@ -67,15 +68,15 @@ public: int unsubscribe (const ACE_INET_Addr &mcast_addr, #if defined (ACE_PSOS) - // pSOS supports numbers, not names for network interfaces - long net_if = 0, + // pSOS supports numbers, not names for network interfaces + long net_if = 0, #else - const ASYS_TCHAR *net_if = 0, + const ASYS_TCHAR *net_if = 0, #endif /* defined (ACE_PSOS) */ - int protocol_family = PF_INET, - int protocol = 0); + int protocol_family = PF_INET, + int protocol = 0); // Leave a multicast group. - // + // // Interface is hardware specific. use netstat -i to find whether // your interface is, say, le0 or something else. If net_if == 0, // subscribe uses the default mcast interface. @@ -86,14 +87,14 @@ public: // failure. // = Data transfer routines. - ssize_t send (const void *buf, - size_t n, + ssize_t send (const void *buf, + size_t n, int flags = 0) const; // Send <n> bytes in <buf>. ssize_t send (const iovec iov[], - size_t n, - int flags = 0) const; + size_t n, + int flags = 0) const; // Send <n> <iovecs>. // = Options. @@ -110,43 +111,43 @@ public: // Declare the dynamic allocation hooks. private: - ACE_HANDLE open (const ACE_Addr &local, - int protocol_family = PF_INET, - int protocol = 0); + ACE_HANDLE open (const ACE_Addr &local, + int protocol_family = PF_INET, + int protocol = 0); // disable public use of ACE_SOCK_Dgram::open () // = Disable public use of ACE_SOCK_Dgram::sends and force // ACE_SOCK_Dgram_Mcast::sends inline - ssize_t send (const void *buf, - size_t n, - const ACE_Addr &addr, - int flags = 0) const; - ssize_t send (const iovec iov[], - size_t n, - const ACE_Addr &addr, - int flags = 0) const; + ssize_t send (const void *buf, + size_t n, + const ACE_Addr &addr, + int flags = 0) const; + ssize_t send (const iovec iov[], + size_t n, + const ACE_Addr &addr, + int flags = 0) const; int make_multicast_address (const ACE_INET_Addr &mcast_addr, #if defined (ACE_PSOS) // pSOS supports numbers, not // names for network interfaces - long net_if = 0 + long net_if = 0 #else - const ASYS_TCHAR *net_if = ASYS_TEXT ("le0") + const ASYS_TCHAR *net_if = ASYS_TEXT ("le0") #endif /* defined (ACE_PSOS) */ ); // Initialize the <multicast_addres_ field> int make_multicast_address_i (const ACE_INET_Addr &mcast_addr, - ip_mreq& multicast_address, + ip_mreq& multicast_address, #if defined (ACE_PSOS) - // pSOS supports numbers, not - // names for network interfaces - long net_if = 0 + // pSOS supports numbers, not + // names for network interfaces + long net_if = 0 #else - const ASYS_TCHAR *net_if = ASYS_TEXT ("le0") + const ASYS_TCHAR *net_if = ASYS_TEXT ("le0") #endif /* defined (ACE_PSOS) */ - ); + ); // Initialize a multicast address. ACE_INET_Addr mcast_addr_; @@ -154,7 +155,7 @@ private: ip_mreq multicast_address_; // IP address. -}; +}; #if !defined (ACE_LACKS_INLINE_FUNCTIONS) #include "ace/SOCK_Dgram_Mcast.i" diff --git a/ace/SOCK_IO.h b/ace/SOCK_IO.h index 0a7592fe5d1..c6eaa4dbc8e 100644 --- a/ace/SOCK_IO.h +++ b/ace/SOCK_IO.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // SOCK_IO.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SOCK_IO_H @@ -20,7 +20,7 @@ #include "ace/SOCK.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_SOCK_IO : public ACE_SOCK @@ -68,9 +68,9 @@ public: // Recv a vector of an <n> byte messages to the connected socket. ssize_t send (const void *buf, - size_t n, + size_t n, int flags, - const ACE_Time_Value *timeout); + const ACE_Time_Value *timeout); // Wait to to <timeout> amount of time to send up to <n> bytes into // <buf> from <handle> (uses the <send> call). If <send> times out // a -1 is returned with <errno == ETIME>. If it succeeds the @@ -78,16 +78,16 @@ public: ssize_t recv (void *buf, size_t n, - int flags, - const ACE_Time_Value *timeout); + int flags, + const ACE_Time_Value *timeout); // Wait up to <timeout> amount of time to receive up to <n> bytes // into <buf> from <handle> (uses the <recv> call). If <recv> times // out a -1 is returned with <errno == ETIME>. If it succeeds the // number of bytes received is returned. ssize_t send (const void *buf, - size_t n, - const ACE_Time_Value *timeout); + size_t n, + const ACE_Time_Value *timeout); // Wait to to <timeout> amount of time to send up to <n> bytes into // <buf> from <handle> (uses the <send> call). If <send> times out // a -1 is returned with <errno == ETIME>. If it succeeds the @@ -95,7 +95,7 @@ public: ssize_t recv (void *buf, size_t n, - const ACE_Time_Value *timeout); + const ACE_Time_Value *timeout); // Wait up to <timeout> amount of time to receive up to <n> bytes // into <buf> from <handle> (uses the <recv> call). If <recv> times // out a -1 is returned with <errno == ETIME>. If it succeeds the diff --git a/ace/SOCK_Stream.h b/ace/SOCK_Stream.h index 862d46d2bc8..1eb5fd3a3bd 100644 --- a/ace/SOCK_Stream.h +++ b/ace/SOCK_Stream.h @@ -5,30 +5,31 @@ // // = LIBRARY // ace -// +// // = FILENAME // SOCK_Stream.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SOCK_STREAM_H #define ACE_SOCK_STREAM_H #include "ace/SOCK_IO.h" -#include "ace/INET_Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/INET_Addr.h" + class ACE_Export ACE_SOCK_Stream : public ACE_SOCK_IO { // = TITLE // Defines the methods in the <ACE_SOCK_Stream> abstraction. - // + // // = DESCRIPTION // This adds additional wrapper methods atop the <ACE_SOCK_IO> // class. @@ -40,29 +41,29 @@ public: //= The following two methods use write and read system calls. ssize_t send_n (const void *buf, int n) const; // Send n bytes, keep trying until n are sent. - ssize_t recv_n (void *buf, int n) const; + ssize_t recv_n (void *buf, int n) const; // Recv n bytes, keep trying until n are received. // = The following two methods use the send and recv system calls. ssize_t send_n (const void *buf, int n, int flags) const; // Send n bytes, keep trying until n are sent. - ssize_t recv_n (void *buf, int n, int flags) const; + ssize_t recv_n (void *buf, int n, int flags) const; // Recv n bytes, keep trying until n are received. - ssize_t send_n (const void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout); + ssize_t send_n (const void *buf, + size_t len, + int flags, + const ACE_Time_Value *timeout); // Try to send exactly <len> bytes into <buf> from <handle> (uses // the <send> call). If <send> blocks for longer than <timeout> the // number of bytes actually sent is returned with <errno == ETIME>. // If a timeout does not occur, <send_n> return <len> (i.e., the // number of bytes requested to be sent). - ssize_t recv_n (void *buf, - size_t len, - int flags, - const ACE_Time_Value *timeout); + ssize_t recv_n (void *buf, + size_t len, + int flags, + const ACE_Time_Value *timeout); // Try to recv exactly <len> bytes into <buf> from <handle> (uses // the <ACE::recv_n> call). The <ACE_Time_Value> indicates how long // to blocking trying to receive. If <timeout> == 0, the caller diff --git a/ace/SPIPE.h b/ace/SPIPE.h index ebfa0e63c2c..1d7cac465dc 100644 --- a/ace/SPIPE.h +++ b/ace/SPIPE.h @@ -5,30 +5,31 @@ // // = LIBRARY // ace -// +// // = FILENAME // SPIPE.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SPIPE_H #define ACE_SPIPE_H #include "ace/IPC_SAP.h" -#include "ace/SPIPE_Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/SPIPE_Addr.h" + class ACE_Export ACE_SPIPE : public ACE_IPC_SAP { // = TITLE // Defines the member functions for the base class of the - // ACE_SPIPE abstraction. + // ACE_SPIPE abstraction. public: int close (void); // Close down the STREAM pipe without removing the rendezvous point. @@ -53,7 +54,7 @@ public: protected: ACE_SPIPE (void); - // Ensure that this class is an abstract base class + // Ensure that this class is an abstract base class ACE_SPIPE_Addr local_addr_; // Our local address. diff --git a/ace/SPIPE_Acceptor.h b/ace/SPIPE_Acceptor.h index cfcc88028ff..031ec388c76 100644 --- a/ace/SPIPE_Acceptor.h +++ b/ace/SPIPE_Acceptor.h @@ -5,45 +5,46 @@ // // = LIBRARY // ace -// +// // = FILENAME // SPIPE_Acceptor.h // // = AUTHOR // Doug Schmidt and Prashant Jain -// +// // ============================================================================ -#ifndef ACE_SPIPE_ACCEPTOR_H +#ifndef ACE_SPIPE_ACCEPTOR_H #define ACE_SPIPE_ACCEPTOR_H #include "ace/SPIPE_Stream.h" -#if defined (ACE_WIN32) -#include "ace/Synch.h" -#endif /* ACE_WIN32 */ #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#if defined (ACE_WIN32) +#include "ace/Synch.h" +#endif /* ACE_WIN32 */ + class ACE_Export ACE_SPIPE_Acceptor : public ACE_SPIPE { // = TITLE // Defines the format and interface for the listener side of the - // ACE_SPIPE_Stream. + // ACE_SPIPE_Stream. public: // = Initialization and termination methods. ACE_SPIPE_Acceptor (void); // Default constructor. - ACE_SPIPE_Acceptor (const ACE_SPIPE_Addr &local_sap, - int reuse_addr = 1, - int perms = ACE_DEFAULT_FILE_PERMS); + ACE_SPIPE_Acceptor (const ACE_SPIPE_Addr &local_sap, + int reuse_addr = 1, + int perms = ACE_DEFAULT_FILE_PERMS); // Initiate a passive-mode STREAM pipe listener. int open (const ACE_SPIPE_Addr &local_sap, - int reuse_addr = 1, - int perms = ACE_DEFAULT_FILE_PERMS); + int reuse_addr = 1, + int perms = ACE_DEFAULT_FILE_PERMS); // Initiate a passive-mode STREAM pipe listener. int close (void); @@ -53,10 +54,10 @@ public: // Remove the underlying mounted pipe from the file system. // = Passive connection acceptance method. - int accept (ACE_SPIPE_Stream &ipc_sap_spipe, - ACE_SPIPE_Addr *remote_addr = 0, - ACE_Time_Value *timeout = 0, - int restart = 1, + int accept (ACE_SPIPE_Stream &ipc_sap_spipe, + ACE_SPIPE_Addr *remote_addr = 0, + ACE_Time_Value *timeout = 0, + int restart = 1, int reset_new_handle = 0); // Accept a new data transfer connection. A <timeout> of 0 means // block forever, a <timeout> of {0, 0} means poll. <restart> == 1 @@ -77,9 +78,9 @@ private: // Create a new instance of an SPIPE. #if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) - ACE_OVERLAPPED overlapped_; - ACE_Manual_Event event_; - char already_connected_; + ACE_OVERLAPPED overlapped_; + ACE_Manual_Event event_; + char already_connected_; #endif /* ACE_WIN32 */ }; diff --git a/ace/SPIPE_Addr.h b/ace/SPIPE_Addr.h index 04190b91cac..e35e6d85785 100644 --- a/ace/SPIPE_Addr.h +++ b/ace/SPIPE_Addr.h @@ -5,29 +5,30 @@ // // = LIBRARY // ace -// +// // = FILENAME // SPIPE_Addr.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SPIPE_ADDR_H #define ACE_SPIPE_ADDR_H #include "ace/Addr.h" -#include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/ACE.h" + class ACE_Export ACE_SPIPE_Addr : public ACE_Addr { // = TITLE - // Defines the SVR4 STREAM pipe address family address format. + // Defines the SVR4 STREAM pipe address family address format. public: // = Initialization methods. ACE_SPIPE_Addr (void); @@ -53,14 +54,14 @@ public: #if defined (UNICODE) virtual int addr_to_string (wchar_t *addr, size_t) const; - // Transform the current address into string format. + // Transform the current address into string format. virtual int string_to_addr (const wchar_t *addr); // Transform the string into the current addressing format. #endif /* UNICODE */ virtual int addr_to_string (char *addr, size_t) const; - // Transform the current address into string format. + // Transform the current address into string format. virtual int string_to_addr (const char *addr); // Transform the string into the current addressing format. @@ -73,7 +74,7 @@ public: // Check for inequality // = SPIPE-specific address operations - LPCTSTR get_path_name (void) const; + LPCTSTR get_path_name (void) const; // Pathname of rendezvous point in file system. uid_t user_id (void) const; @@ -94,7 +95,7 @@ public: private: // = This struct contains security attributes. - struct + struct { gid_t gid_; // Group id. diff --git a/ace/SPIPE_Connector.h b/ace/SPIPE_Connector.h index 34d5df2b01d..06761c4f30c 100644 --- a/ace/SPIPE_Connector.h +++ b/ace/SPIPE_Connector.h @@ -6,13 +6,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // SPIPE_Connector.h // // = AUTHOR // Doug Schmidt and Prashant Jain -// +// // ============================================================================ #ifndef ACE_SPIPE_CONNECTOR_H @@ -21,26 +21,26 @@ #include "ace/SPIPE_Stream.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_SPIPE_Connector : public ACE_SPIPE { // = TITLE // Defines an active connection factory for the STREAM pipe - // wrappers. + // wrappers. public: // = Initialization method. ACE_SPIPE_Connector (void); // Default constructor. - ACE_SPIPE_Connector (ACE_SPIPE_Stream &new_io, - const ACE_SPIPE_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0); + ACE_SPIPE_Connector (ACE_SPIPE_Stream &new_io, + const ACE_SPIPE_Addr &remote_sap, + ACE_Time_Value *timeout = 0, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int reuse_addr = 0, + int flags = O_RDWR, + int perms = 0); // Actively connect and produce a <new_stream> if things go well. // The <remote_sap> is the address that we are trying to connect // with. The <timeout> is the amount of time to wait to connect. @@ -57,13 +57,13 @@ public: // The <flags> and <perms> arguments are passed down to the open() // method. - int connect (ACE_SPIPE_Stream &new_io, - const ACE_SPIPE_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0); + int connect (ACE_SPIPE_Stream &new_io, + const ACE_SPIPE_Addr &remote_sap, + ACE_Time_Value *timeout = 0, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int reuse_addr = 0, + int flags = O_RDWR, + int perms = 0); // Actively connect and produce a <new_stream> if things go well. // The <remote_sap> is the address that we are trying to connect // with. The <timeout> is the amount of time to wait to connect. diff --git a/ace/SPIPE_Stream.h b/ace/SPIPE_Stream.h index 91cb117c903..f21e17ed423 100644 --- a/ace/SPIPE_Stream.h +++ b/ace/SPIPE_Stream.h @@ -5,25 +5,26 @@ // // = LIBRARY // ace -// +// // = FILENAME // SPIPE_Stream.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SPIPE_STREAM_H #define ACE_SPIPE_STREAM_H #include "ace/SPIPE.h" -#include "ace/SPIPE_Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/SPIPE_Addr.h" + class ACE_Export ACE_SPIPE_Stream : public ACE_SPIPE { // = TITLE @@ -39,20 +40,20 @@ public: int get_remote_addr (ACE_SPIPE_Addr &remote_sap) const; // Obtain the address of whom we are connected with. - int send_handle (ACE_HANDLE handle) const; - // Send an open FD to another process. + int send_handle (ACE_HANDLE handle) const; + // Send an open FD to another process. - int recv_handle (ACE_HANDLE &handle) const; - // Recv an open FD from another process. + int recv_handle (ACE_HANDLE &handle) const; + // Recv an open FD from another process. - int recv_handle (strrecvfd &recvfd) const; - // Recv an open FD from another process. + int recv_handle (strrecvfd &recvfd) const; + // Recv an open FD from another process. - ssize_t send_n (const void *buf, size_t n) const; - // Send n bytes, keep trying until n are sent. + ssize_t send_n (const void *buf, size_t n) const; + // Send n bytes, keep trying until n are sent. - ssize_t recv_n (void *buf, size_t n) const; - // Recv n bytes, keep trying until n are received. + ssize_t recv_n (void *buf, size_t n) const; + // Recv n bytes, keep trying until n are received. ssize_t send (const void *buf, size_t n) const; // Send bytes via STREAM pipes using "band" mode. @@ -60,26 +61,26 @@ public: ssize_t recv (void *buf, size_t n) const; // Recv bytes via STREAM pipes using "band" mode. - ssize_t send (const ACE_Str_Buf *cntl, - const ACE_Str_Buf *data, - int flags = 0) const; + ssize_t send (const ACE_Str_Buf *cntl, + const ACE_Str_Buf *data, + int flags = 0) const; // Send <cntl> and <data> via STREAM pipes. - ssize_t recv (ACE_Str_Buf *cntl, - ACE_Str_Buf *data, - int *flags) const; + ssize_t recv (ACE_Str_Buf *cntl, + ACE_Str_Buf *data, + int *flags) const; // Recv <cntl> and <data> via STREAM pipes. - ssize_t send (const ACE_Str_Buf *cntl, - const ACE_Str_Buf *data, - int band, - int flags) const; + ssize_t send (const ACE_Str_Buf *cntl, + const ACE_Str_Buf *data, + int band, + int flags) const; // Send bytes via STREAM pipes using "band" mode. - ssize_t recv (ACE_Str_Buf *cntl, - ACE_Str_Buf *data, - int *band, - int *flags) const; + ssize_t recv (ACE_Str_Buf *cntl, + ACE_Str_Buf *data, + int *band, + int *flags) const; // Recv bytes via STREAM pipes using "band" mode. ssize_t send (const iovec iov[], size_t n) const; diff --git a/ace/SString.h b/ace/SString.h index 6283d79587f..685d2ad465e 100644 --- a/ace/SString.h +++ b/ace/SString.h @@ -20,7 +20,7 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ // Forward decl. diff --git a/ace/SV_Message.h b/ace/SV_Message.h index e28b25ff501..77b9a2c5c71 100644 --- a/ace/SV_Message.h +++ b/ace/SV_Message.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // SV_Message.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SV_MESSAGE_H @@ -20,7 +20,7 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_SV_Message diff --git a/ace/SV_Message_Queue.h b/ace/SV_Message_Queue.h index 9e3a35ee7f7..fb86c9719e2 100644 --- a/ace/SV_Message_Queue.h +++ b/ace/SV_Message_Queue.h @@ -5,47 +5,48 @@ // // = LIBRARY // ace -// +// // = FILENAME // SV_Message_Queue.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_MESSAGE_QUEUE_H #define ACE_MESSAGE_QUEUE_H #include "ace/ACE.h" -#include "ace/SV_Message.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/SV_Message.h" + class ACE_Export ACE_SV_Message_Queue { // = TITLE // Defines the header file for the C++ wrapper for System V IPC - // message queues. -public: + // message queues. +public: // = Useful symbolic constants. - enum + enum { - ACE_CREATE = IPC_CREAT, - ACE_OPEN = 0, + ACE_CREATE = IPC_CREAT, + ACE_OPEN = 0, ACE_NOWAIT = IPC_NOWAIT }; // = Initialization and termination methods. ACE_SV_Message_Queue (void); - ACE_SV_Message_Queue (key_t external_id, - int create = ACE_SV_Message_Queue::ACE_OPEN, - int perms = ACE_DEFAULT_FILE_PERMS); - int open (key_t external_id, - int create = ACE_SV_Message_Queue::ACE_OPEN, - int perms = ACE_DEFAULT_FILE_PERMS); + ACE_SV_Message_Queue (key_t external_id, + int create = ACE_SV_Message_Queue::ACE_OPEN, + int perms = ACE_DEFAULT_FILE_PERMS); + int open (key_t external_id, + int create = ACE_SV_Message_Queue::ACE_OPEN, + int perms = ACE_DEFAULT_FILE_PERMS); // Open a message queue using the <external_id>. ~ACE_SV_Message_Queue (void); @@ -59,14 +60,14 @@ public: // = Message transfer methods. - int recv (ACE_SV_Message &mb, - int length, - long mtype = 0, - int mflags = 0); - - int send (const ACE_SV_Message &mb, - int length, - int mflags = 0); + int recv (ACE_SV_Message &mb, + int length, + long mtype = 0, + int mflags = 0); + + int send (const ACE_SV_Message &mb, + int length, + int mflags = 0); int control (int option, void *arg = 0); // Access the underlying control operations. diff --git a/ace/SV_Semaphore_Complex.h b/ace/SV_Semaphore_Complex.h index 11b9d4ecbb6..4f904e56468 100644 --- a/ace/SV_Semaphore_Complex.h +++ b/ace/SV_Semaphore_Complex.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // ACE_SV_Semaphore_Complex.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SV_SEMAPHORE_COMPLEX_H @@ -20,7 +20,7 @@ #include "ace/SV_Semaphore_Simple.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_SV_Semaphore_Complex : private ACE_SV_Semaphore_Simple @@ -55,39 +55,39 @@ class ACE_Export ACE_SV_Semaphore_Complex : private ACE_SV_Semaphore_Simple // the array of SV_Semaphores (which may be sized by the user // in the constructor). public: - enum + enum { - ACE_CREATE = IPC_CREAT, + ACE_CREATE = IPC_CREAT, ACE_OPEN = 0 }; // = Initialization and termination methods. ACE_SV_Semaphore_Complex (void); ACE_SV_Semaphore_Complex (key_t key, - int create = ACE_SV_Semaphore_Complex::ACE_CREATE, - int initial_value = 1, - u_short nsems = 1, - int perms = ACE_DEFAULT_FILE_PERMS); - ACE_SV_Semaphore_Complex (const char *name, - int create = ACE_SV_Semaphore_Complex::ACE_CREATE, - int initial_value = 1, - u_short nsems = 1, - int perms = ACE_DEFAULT_FILE_PERMS); + int create = ACE_SV_Semaphore_Complex::ACE_CREATE, + int initial_value = 1, + u_short nsems = 1, + int perms = ACE_DEFAULT_FILE_PERMS); + ACE_SV_Semaphore_Complex (const char *name, + int create = ACE_SV_Semaphore_Complex::ACE_CREATE, + int initial_value = 1, + u_short nsems = 1, + int perms = ACE_DEFAULT_FILE_PERMS); ~ACE_SV_Semaphore_Complex (void); - int open (const char *name, - int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, - int initial_value = 1, - u_short nsems = 1, - int perms = ACE_DEFAULT_FILE_PERMS); + int open (const char *name, + int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, + int initial_value = 1, + u_short nsems = 1, + int perms = ACE_DEFAULT_FILE_PERMS); // Open or create an array of SV_Semaphores. We return 0 if all is // OK, else -1. - int open (key_t key, - int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, - int initial_value = 1, - u_short nsems = 1, - int perms = ACE_DEFAULT_FILE_PERMS); + int open (key_t key, + int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, + int initial_value = 1, + u_short nsems = 1, + int perms = ACE_DEFAULT_FILE_PERMS); // Open or create an array of SV_Semaphores. We return 0 if all is // OK, else -1. diff --git a/ace/SV_Semaphore_Simple.h b/ace/SV_Semaphore_Simple.h index 88997030e56..c904b07820e 100644 --- a/ace/SV_Semaphore_Simple.h +++ b/ace/SV_Semaphore_Simple.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // SV_Semaphore_Simple.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SV_SEMAPHORE_SIMPLE_H @@ -20,7 +20,7 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_SV_Semaphore_Simple @@ -30,41 +30,41 @@ class ACE_Export ACE_SV_Semaphore_Simple // no race conditions for initialization (i.e., the order of // process startup must be well defined). public: - enum + enum { - ACE_CREATE = IPC_CREAT, + ACE_CREATE = IPC_CREAT, ACE_EXCL = IPC_EXCL, ACE_OPEN = 0 }; // = Initialization and termination methods. ACE_SV_Semaphore_Simple (void); - ACE_SV_Semaphore_Simple (key_t key, - int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, - int initial_value = 1, - u_short nsems = 1, - int perms = ACE_DEFAULT_FILE_PERMS); - ACE_SV_Semaphore_Simple (const char *name, - int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, - int initial_value = 1, - u_short nsems = 1, - int perms = ACE_DEFAULT_FILE_PERMS); + ACE_SV_Semaphore_Simple (key_t key, + int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, + int initial_value = 1, + u_short nsems = 1, + int perms = ACE_DEFAULT_FILE_PERMS); + ACE_SV_Semaphore_Simple (const char *name, + int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, + int initial_value = 1, + u_short nsems = 1, + int perms = ACE_DEFAULT_FILE_PERMS); ~ACE_SV_Semaphore_Simple (void); - int open (const char *name, - int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, - int initial_value = 1, - u_short nsems = 1, - int perms = ACE_DEFAULT_FILE_PERMS); - - int open (key_t key, - int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, - int initial_value = 1, - u_short nsems = 1, - int perms = ACE_DEFAULT_FILE_PERMS); + int open (const char *name, + int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, + int initial_value = 1, + u_short nsems = 1, + int perms = ACE_DEFAULT_FILE_PERMS); + + int open (key_t key, + int flags = ACE_SV_Semaphore_Simple::ACE_CREATE, + int initial_value = 1, + u_short nsems = 1, + int perms = ACE_DEFAULT_FILE_PERMS); // Open or create one or more SV_Semaphores. We return 0 if all is // OK, else -1. - + int close (void); // Close a ACE_SV_Semaphore, marking it as invalid for subsequent // operations... @@ -104,7 +104,7 @@ public: // = Semaphore operation methods. int op (int val, u_short semnum = 0, int flags = SEM_UNDO) const; // General ACE_SV_Semaphore operation. Increment or decrement by a - // specific amount (positive or negative; amount can`t be zero). + // specific amount (positive or negative; amount can`t be zero). int op (sembuf op_vec[], u_short nsems) const; // General ACE_SV_Semaphore operation on an array of SV_Semaphores. diff --git a/ace/SV_Shared_Memory.h b/ace/SV_Shared_Memory.h index e1ff26755e0..4ebd960f1c0 100644 --- a/ace/SV_Shared_Memory.h +++ b/ace/SV_Shared_Memory.h @@ -6,13 +6,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // SV_Shared_Memory.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SV_SHARED_MEMORY_H @@ -21,7 +21,7 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_SV_Shared_Memory @@ -29,38 +29,38 @@ class ACE_Export ACE_SV_Shared_Memory // = TITLE // This is a wrapper for System V shared memory. public: - enum + enum { - ACE_CREATE = IPC_CREAT, + ACE_CREATE = IPC_CREAT, ACE_OPEN = 0 }; // = Initialization and termination methods. ACE_SV_Shared_Memory (void); - ACE_SV_Shared_Memory (key_t external_id, - size_t size, - int create, - int perms = ACE_DEFAULT_FILE_PERMS, - void *virtual_addr = 0, - int flags = 0); + ACE_SV_Shared_Memory (key_t external_id, + size_t size, + int create, + int perms = ACE_DEFAULT_FILE_PERMS, + void *virtual_addr = 0, + int flags = 0); ACE_SV_Shared_Memory (ACE_HANDLE internal_id, - int flags = 0); - - int open (key_t external_id, - size_t size, - int create = ACE_SV_Shared_Memory::ACE_OPEN, - int perms = ACE_DEFAULT_FILE_PERMS); - - int open_and_attach (key_t external_id, - size_t size, - int create = ACE_SV_Shared_Memory::ACE_OPEN, - int perms = ACE_DEFAULT_FILE_PERMS, - void *virtual_addr = 0, - int flags = 0); - - int attach (void *virtual_addr = 0, - int flags =0); + int flags = 0); + + int open (key_t external_id, + size_t size, + int create = ACE_SV_Shared_Memory::ACE_OPEN, + int perms = ACE_DEFAULT_FILE_PERMS); + + int open_and_attach (key_t external_id, + size_t size, + int create = ACE_SV_Shared_Memory::ACE_OPEN, + int perms = ACE_DEFAULT_FILE_PERMS, + void *virtual_addr = 0, + int flags = 0); + + int attach (void *virtual_addr = 0, + int flags =0); // Attach this shared memory segment. int detach (void); @@ -88,7 +88,7 @@ public: protected: enum { - ALIGN_WORDB = 8 // Most restrictive alignment. + ALIGN_WORDB = 8 // Most restrictive alignment. }; ACE_HANDLE internal_id_; @@ -96,7 +96,7 @@ protected: int size_; // Size of the mapped segment. - + void *segment_ptr_; // Pointer to the beginning of the segment. diff --git a/ace/Sched_Params.h b/ace/Sched_Params.h index 06f4fc1dd8c..6817fd677d7 100644 --- a/ace/Sched_Params.h +++ b/ace/Sched_Params.h @@ -23,7 +23,7 @@ #include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_Sched_Params @@ -172,7 +172,7 @@ class ACE_Export ACE_Sched_Priority_Iterator { public: ACE_Sched_Priority_Iterator (const ACE_Sched_Params::Policy &policy, - int scope = ACE_SCOPE_THREAD); + int scope = ACE_SCOPE_THREAD); // Initialize the iterator, the arguments define the scheduling // policy and scope for the priorities (see ACE_Sched_Param). diff --git a/ace/Select_Reactor.h b/ace/Select_Reactor.h index 42dad6db900..cff77d9225d 100644 --- a/ace/Select_Reactor.h +++ b/ace/Select_Reactor.h @@ -20,7 +20,7 @@ #include "ace/Select_Reactor_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) diff --git a/ace/Select_Reactor_Base.h b/ace/Select_Reactor_Base.h index bbf8d84c683..739c50e3dd7 100644 --- a/ace/Select_Reactor_Base.h +++ b/ace/Select_Reactor_Base.h @@ -18,6 +18,11 @@ #define ACE_SELECT_REACTOR_BASE_H #include "ace/Signal.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Timer_Queue.h" #include "ace/Event_Handler.h" #include "ace/Handle_Set.h" @@ -25,10 +30,6 @@ #include "ace/Pipe.h" #include "ace/Reactor_Impl.h" -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - // Add useful typedefs to simplify the following code. typedef void (ACE_Handle_Set::*ACE_FDS_PTMF) (ACE_HANDLE); typedef int (ACE_Event_Handler::*ACE_EH_PTMF) (ACE_HANDLE); diff --git a/ace/Select_Reactor_T.h b/ace/Select_Reactor_T.h index 6c8f1d20e2c..0c85859f460 100644 --- a/ace/Select_Reactor_T.h +++ b/ace/Select_Reactor_T.h @@ -20,7 +20,7 @@ #include "ace/Select_Reactor_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ template <class ACE_SELECT_REACTOR_MUTEX> diff --git a/ace/Service_Config.h b/ace/Service_Config.h index 9d0725c75b9..b9238c199ee 100644 --- a/ace/Service_Config.h +++ b/ace/Service_Config.h @@ -18,14 +18,15 @@ #define ACE_SERVICE_CONFIG_H #include "ace/Service_Object.h" -#include "ace/Signal.h" -#include "ace/Containers.h" -#include "ace/SString.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Signal.h" +#include "ace/Containers.h" +#include "ace/SString.h" + // Forward decl. class ACE_Service_Repository; class ACE_Service_Type; @@ -71,9 +72,9 @@ public: }; // Maintain a set of the statically linked service descriptors. -typedef ACE_Unbounded_Set<ACE_Static_Svc_Descriptor *> +typedef ACE_Unbounded_Set<ACE_Static_Svc_Descriptor *> ACE_STATIC_SVCS; -typedef ACE_Unbounded_Set_Iterator<ACE_Static_Svc_Descriptor *> +typedef ACE_Unbounded_Set_Iterator<ACE_Static_Svc_Descriptor *> ACE_STATIC_SVCS_ITERATOR; // Maintain a queue of services to be configured from the @@ -106,7 +107,7 @@ public: int signum = SIGHUP); // Initialize the Service Repository. - ACE_Service_Config (const ASYS_TCHAR program_name[], + ACE_Service_Config (const ASYS_TCHAR program_name[], LPCTSTR logger_key = ACE_DEFAULT_LOGGER_KEY); // Performs an open without parsing command-line arguments. diff --git a/ace/Service_Manager.h b/ace/Service_Manager.h index 9ea7876fef6..cf75238b1c0 100644 --- a/ace/Service_Manager.h +++ b/ace/Service_Manager.h @@ -6,27 +6,28 @@ // // = LIBRARY // ace -// +// // = FILENAME // Service_Manager.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SERVICE_MANAGER_H #define ACE_SERVICE_MANAGER_H #include "ace/SOCK_Stream.h" -#include "ace/SOCK_Acceptor.h" -#include "ace/INET_Addr.h" -#include "ace/Service_Object.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/SOCK_Acceptor.h" +#include "ace/INET_Addr.h" +#include "ace/Service_Object.h" + class ACE_Export ACE_Service_Manager : public ACE_Service_Object { // = TITLE @@ -34,7 +35,7 @@ class ACE_Export ACE_Service_Manager : public ACE_Service_Object // configured in an <ACE_Service_Repository>. // // = DESCRIPTION - // This + // This public: // = Initialization and termination hooks. ACE_Service_Manager (void); @@ -59,7 +60,7 @@ protected: // = Scheduling hooks. virtual int suspend (void); - virtual int resume (void); + virtual int resume (void); void dump (void) const; // Dump the state of an object. diff --git a/ace/Service_Object.h b/ace/Service_Object.h index 144a5e04368..48d8ed8c318 100644 --- a/ace/Service_Object.h +++ b/ace/Service_Object.h @@ -5,30 +5,31 @@ // // = LIBRARY // ace -// +// // = FILENAME // Service_Object.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SERVICE_OBJECT_H #define ACE_SERVICE_OBJECT_H #include "ace/Shared_Object.h" -#include "ace/Event_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Event_Handler.h" + class ACE_Export ACE_Service_Object : public ACE_Event_Handler, public ACE_Shared_Object { // = TITLE // Provide the abstract base class common to all service - // implementations. + // implementations. // // = DESCRIPTION // Classes that inherit from <ACE_Service_Objects> are capable @@ -54,34 +55,34 @@ class ACE_Export ACE_Service_Type { // = TITLE // Keeps track of information related to the various - // <ACE_Service_Type_Impl> subclasses. + // <ACE_Service_Type_Impl> subclasses. // // = DESCRIPTION // This class acts as the interface of the "Bridge" pattern. public: enum { - DELETE_OBJ = 1, + DELETE_OBJ = 1, // Delete the payload object. - DELETE_THIS = 2 + DELETE_THIS = 2 // Delete the enclosing object. }; // = Initialization and termination methods. - ACE_Service_Type (const ASYS_TCHAR *n, - ACE_Service_Type_Impl *o, - const ACE_SHLIB_HANDLE handle, + ACE_Service_Type (const ASYS_TCHAR *n, + ACE_Service_Type_Impl *o, + const ACE_SHLIB_HANDLE handle, int active); ~ACE_Service_Type (void); - + const ASYS_TCHAR *name (void) const; void name (const ASYS_TCHAR *); const char *chname (void) const; const ACE_Service_Type_Impl *type (void) const; - void type (const ACE_Service_Type_Impl *, - int active = 1); + void type (const ACE_Service_Type_Impl *, + int active = 1); ACE_SHLIB_HANDLE handle (void) const; void handle (const ACE_SHLIB_HANDLE); @@ -101,7 +102,7 @@ public: // Declare the dynamic allocation hooks. private: - const ASYS_TCHAR *name_; + const ASYS_TCHAR *name_; // Humanly readible name of svc. #if defined (ACE_HAS_MOSTLY_UNICODE_APIS) @@ -113,19 +114,19 @@ private: const ACE_Service_Type_Impl *type_; // Pointer to C++ object that implements the svc. - ACE_SHLIB_HANDLE handle_; + ACE_SHLIB_HANDLE handle_; // Handle to shared object file (non-zero if dynamically linked). - int active_; + int active_; // 1 if svc is currently active, otherwise 0. - int fini_already_called_; + int fini_already_called_; // 1 if fini() on <type_> has already been called, otherwise 0. }; class ACE_Export ACE_Service_Object_Ptr { - // = TITLE + // = TITLE // This is a smart pointer that holds onto the associated // <ACE_Service_Object> * until the current scope is left, at // which point the object's <fini> hook is called and the @@ -135,7 +136,7 @@ class ACE_Export ACE_Service_Object_Ptr // This class is similar to the Standard C++ Library class // <auto_ptr>. It is used in conjunction with statically linked // <ACE_Service_Objects>, as shown in the - // ./netsvcs/server/main.cpp example. + // ./netsvcs/server/main.cpp example. public: // = Initialization and termination methods. ACE_Service_Object_Ptr (ACE_Service_Object *so); diff --git a/ace/Service_Repository.h b/ace/Service_Repository.h index ca75e8b8777..572d8007bee 100644 --- a/ace/Service_Repository.h +++ b/ace/Service_Repository.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Service_Repository.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SERVICE_REPOSITORY_H @@ -20,7 +20,7 @@ #include "ace/Service_Types.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_Service_Repository @@ -41,7 +41,7 @@ class ACE_Export ACE_Service_Repository public: friend class ACE_Service_Repository_Iterator; - enum + enum { DEFAULT_SIZE = 50 }; @@ -78,14 +78,14 @@ public: static void close_singleton (void); // Delete the dynamically allocated Singleton. - // = Search structure operations (all acquire locks as necessary). + // = Search structure operations (all acquire locks as necessary). int insert (const ACE_Service_Type *); // Insert a new service record. - int find (const ASYS_TCHAR name[], - const ACE_Service_Type **srp = 0, - int ignore_suspended = 1); + int find (const ASYS_TCHAR name[], + const ACE_Service_Type **srp = 0, + int ignore_suspended = 1); // Locate an entry with <name> in the table. If <ignore_suspended> // is set then only consider services marked as resumed. If the // caller wants the located entry, pass back a pointer to the @@ -117,8 +117,8 @@ public: private: int find_i (const ASYS_TCHAR service_name[], - const ACE_Service_Type ** = 0, - int ignore_suspended = 1); + const ACE_Service_Type ** = 0, + int ignore_suspended = 1); // Locates <service_name>. Must be called without locks being // held... @@ -138,8 +138,8 @@ private: // Must delete the <svc_rep_> if non-0. #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - ACE_Thread_Mutex lock_; - // Synchronization variable for the MT_SAFE Repository + ACE_Thread_Mutex lock_; + // Synchronization variable for the MT_SAFE Repository #endif /* ACE_MT_SAFE */ }; @@ -153,8 +153,8 @@ class ACE_Export ACE_Service_Repository_Iterator // since this class is not designed as a "robust" iterator. public: // = Initialization and termination methods. - ACE_Service_Repository_Iterator (ACE_Service_Repository &sr, - int ignored_suspended = 1); + ACE_Service_Repository_Iterator (ACE_Service_Repository &sr, + int ignored_suspended = 1); // Constructor. ~ACE_Service_Repository_Iterator (void); diff --git a/ace/Service_Types.h b/ace/Service_Types.h index d4e2dde4fec..459419091bf 100644 --- a/ace/Service_Types.h +++ b/ace/Service_Types.h @@ -5,25 +5,26 @@ // // = LIBRARY // ace -// +// // = FILENAME // Service_Types.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SERVICE_TYPE_H #define ACE_SERVICE_TYPE_H #include "ace/Service_Object.h" -#include "ace/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Synch.h" + class ACE_Export ACE_Service_Type_Impl { // = TITLE @@ -39,9 +40,9 @@ class ACE_Export ACE_Service_Type_Impl // <ACE_Service_Object>, <ACE_Module>, or <ACE_Stream>. public: // = Initialization and termination methods. - ACE_Service_Type_Impl (void *object, - const ASYS_TCHAR *s_name, - u_int flags = 0, + ACE_Service_Type_Impl (void *object, + const ASYS_TCHAR *s_name, + u_int flags = 0, ACE_Service_Object_Exterminator gobbler = 0); virtual ~ACE_Service_Type_Impl (void); @@ -76,7 +77,7 @@ protected: // points to an <ACE_Service_Object>, <ACE_Module>, or <ACE_Stream>. ACE_Service_Object_Exterminator gobbler_; - // Destroy function to deallocate obj_. + // Destroy function to deallocate obj_. u_int flags_; // Flags that control serivce behavior (particularly deletion). @@ -86,12 +87,12 @@ class ACE_Export ACE_Service_Object_Type : public ACE_Service_Type_Impl { // = TITLE // Define the methods for handling the configuration of - // <ACE_Service_Objects>. + // <ACE_Service_Objects>. public: // = Initialization method. ACE_Service_Object_Type (void *so, - const ASYS_TCHAR *name, - u_int flags = 0, + const ASYS_TCHAR *name, + u_int flags = 0, ACE_Service_Object_Exterminator gobbler = 0); ~ACE_Service_Object_Type (void); @@ -108,12 +109,12 @@ class ACE_Export ACE_Module_Type : public ACE_Service_Type_Impl { // = TITLE // Define the methods for handling the configuration of - // <ACE_Modules>. + // <ACE_Modules>. public: // = Initialization method. ACE_Module_Type (void *m, // Really an <ACE_Module> *. - const ASYS_TCHAR *identifier, - u_int flags = 0); + const ASYS_TCHAR *identifier, + u_int flags = 0); ~ACE_Module_Type (void); @@ -135,7 +136,7 @@ public: // Declare the dynamic allocation hooks. private: - ACE_Module_Type *link_; + ACE_Module_Type *link_; // Pointer to the next <ACE_Module_Type> in an <ACE_Stream_Type>. }; @@ -143,12 +144,12 @@ class ACE_Export ACE_Stream_Type : public ACE_Service_Type_Impl { // = TITLE // Define the methods for handling the configuration of - // <ACE_Streams>. + // <ACE_Streams>. public: // = Initialization method. ACE_Stream_Type (void *s, // Really an <ACE_Stream> *. - const ASYS_TCHAR *identifier, - u_int flags = 0); + const ASYS_TCHAR *identifier, + u_int flags = 0); ~ACE_Stream_Type (void); diff --git a/ace/Shared_Memory.h b/ace/Shared_Memory.h index abf5c3aff50..c62e5fbd07e 100644 --- a/ace/Shared_Memory.h +++ b/ace/Shared_Memory.h @@ -6,13 +6,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Shared_Memory.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SHARED_MEMORY_H @@ -21,7 +21,7 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_Shared_Memory diff --git a/ace/Shared_Memory_MM.h b/ace/Shared_Memory_MM.h index 59d0d457650..43d43d7cf04 100644 --- a/ace/Shared_Memory_MM.h +++ b/ace/Shared_Memory_MM.h @@ -18,12 +18,13 @@ #define ACE_SHARED_MALLOC_MM_H #include "ace/Shared_Memory.h" -#include "ace/Mem_Map.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Mem_Map.h" + class ACE_Export ACE_Shared_Memory_MM : public ACE_Shared_Memory { // = TITLE diff --git a/ace/Shared_Memory_SV.h b/ace/Shared_Memory_SV.h index a27ab8c6274..6c8a11ca409 100644 --- a/ace/Shared_Memory_SV.h +++ b/ace/Shared_Memory_SV.h @@ -6,51 +6,52 @@ // // = LIBRARY // ace -// +// // = FILENAME // Shared_Memory_SV.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SHARED_MALLOC_SV_H #define ACE_SHARED_MALLOC_SV_H #include "ace/Shared_Memory.h" -#include "ace/SV_Shared_Memory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/SV_Shared_Memory.h" + class ACE_Export ACE_Shared_Memory_SV : public ACE_Shared_Memory { // = TITLE // Shared memory wrapper based on System V shared memory. public: - enum + enum { - ACE_CREATE = IPC_CREAT, + ACE_CREATE = IPC_CREAT, ACE_OPEN = 0 }; // = Initialization and termination methods. ACE_Shared_Memory_SV (void); ACE_Shared_Memory_SV (key_t id, - int length, - int create = ACE_Shared_Memory_SV::ACE_OPEN, - int perms = ACE_DEFAULT_FILE_PERMS, - void *addr = 0, - int flags = 0); + int length, + int create = ACE_Shared_Memory_SV::ACE_OPEN, + int perms = ACE_DEFAULT_FILE_PERMS, + void *addr = 0, + int flags = 0); int open (key_t id, - int length, - int create = ACE_Shared_Memory_SV::ACE_OPEN, - int perms = ACE_DEFAULT_FILE_PERMS, - void *addr = 0, - int flags = 0); + int length, + int create = ACE_Shared_Memory_SV::ACE_OPEN, + int perms = ACE_DEFAULT_FILE_PERMS, + void *addr = 0, + int flags = 0); virtual int close (void); // Close down the shared memory segment. diff --git a/ace/Shared_Object.h b/ace/Shared_Object.h index c41c398484f..a73a83e8e63 100644 --- a/ace/Shared_Object.h +++ b/ace/Shared_Object.h @@ -6,13 +6,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Shared_Object.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SHARED_OBJECT_H @@ -21,7 +21,7 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_Shared_Object diff --git a/ace/Signal.h b/ace/Signal.h index 8cd768cd72c..dc92c572b80 100644 --- a/ace/Signal.h +++ b/ace/Signal.h @@ -18,12 +18,13 @@ #define ACE_SIGNAL_HANDLER_H #include "ace/Synch.h" -#include "ace/Event_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Event_Handler.h" + // This worksaround a horrible bug with HP/UX C++... typedef struct sigaction ACE_SIGACTION; diff --git a/ace/Singleton.h b/ace/Singleton.h index 419af5bac9c..14bb6461ccb 100644 --- a/ace/Singleton.h +++ b/ace/Singleton.h @@ -23,7 +23,7 @@ #include "ace/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ template <class TYPE, class ACE_LOCK> @@ -51,9 +51,9 @@ class ACE_Singleton : public ACE_Cleanup // // (a) Make the constructor of <T> private (or protected) // (b) Make Singleton a friend of <T> - // + // // Here is an example: - // + // // class foo // { // friend class ACE_Singleton<foo, ACE_Null_Mutex>; diff --git a/ace/Stats.h b/ace/Stats.h index bb898833d4e..df4ae1eedbb 100644 --- a/ace/Stats.h +++ b/ace/Stats.h @@ -18,12 +18,13 @@ #define ACE_STATS_H #include "ace/ACE.h" -#include "ace/Containers.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Containers.h" + class ACE_Export ACE_Stats_Value { // = TITLE diff --git a/ace/Strategies.h b/ace/Strategies.h index e06bd9a6963..8e8407b3a6e 100644 --- a/ace/Strategies.h +++ b/ace/Strategies.h @@ -20,7 +20,7 @@ #include "ace/Event_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ // Forward decls. @@ -37,12 +37,12 @@ class ACE_Export ACE_Notification_Strategy // the Bridge/Strategy patterns. public: ACE_Notification_Strategy (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask); + ACE_Reactor_Mask mask); virtual ~ACE_Notification_Strategy (void); virtual int notify (void) = 0; virtual int notify (ACE_Event_Handler *, - ACE_Reactor_Mask mask) = 0; + ACE_Reactor_Mask mask) = 0; // Get/Set the event handler ACE_Event_Handler *event_handler (void); @@ -67,8 +67,8 @@ class ACE_Export ACE_Reactor_Notification_Strategy : public ACE_Notification_Str // ACE_Reactor::notify() method. public: ACE_Reactor_Notification_Strategy (ACE_Reactor *reactor, - ACE_Event_Handler *eh, - ACE_Reactor_Mask mask); + ACE_Event_Handler *eh, + ACE_Reactor_Mask mask); ~ACE_Reactor_Notification_Strategy (void); // Default dtor. @@ -76,7 +76,7 @@ public: virtual int notify (void); virtual int notify (ACE_Event_Handler *, - ACE_Reactor_Mask mask); + ACE_Reactor_Mask mask); // Get/Set the reactor ACE_Reactor *reactor (void); @@ -114,7 +114,7 @@ protected: class ACE_Export ACE_Recyclable { public: - enum State + enum State { IDLE, BUSY, diff --git a/ace/Strategies_T.h b/ace/Strategies_T.h index fea23d00ce0..cdca19b3608 100644 --- a/ace/Strategies_T.h +++ b/ace/Strategies_T.h @@ -18,16 +18,17 @@ #define ACE_STRATEGIES_T_H #include "ace/Strategies.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Service_Config.h" #include "ace/Reactor.h" #include "ace/Synch_Options.h" #include "ace/Thread_Manager.h" #include "ace/Hash_Map_Manager.h" -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - template<class SVC_HANDLER> class ACE_Recycling_Strategy { @@ -109,9 +110,9 @@ class ACE_Singleton_Strategy : public ACE_Creation_Strategy<SVC_HANDLER> public: // = Initialization and termination methods. ACE_Singleton_Strategy (SVC_HANDLER * = 0, - ACE_Thread_Manager * = 0); + ACE_Thread_Manager * = 0); int open (SVC_HANDLER *, - ACE_Thread_Manager * = 0); + ACE_Thread_Manager * = 0); virtual ~ACE_Singleton_Strategy (void); // = Factory method. @@ -143,18 +144,18 @@ public: // "Do-nothing" constructor. ACE_DLL_Strategy (const char dll_name[], - const char factory_function[], - const char svc_name[], - ACE_Service_Repository *, - ACE_Thread_Manager * = 0); + const char factory_function[], + const char svc_name[], + ACE_Service_Repository *, + ACE_Thread_Manager * = 0); // Initialize the DLL strategy based upon the service's DLL // information contained in the <svc_dll_info> string. int open (const char dll_name[], - const char factory_function[], - const char svc_name[], - ACE_Service_Repository *, - ACE_Thread_Manager * = 0); + const char factory_function[], + const char svc_name[], + ACE_Service_Repository *, + ACE_Thread_Manager * = 0); // Initialize the DLL strategy based upon the service's DLL // information contained in the <svc_dll_info> string. @@ -206,7 +207,7 @@ public: // = Factory method. virtual int activate_svc_handler (SVC_HANDLER *svc_handler, - void *arg = 0); + void *arg = 0); // Activate the <svc_handler> with an appropriate concurrency // strategy. The default behavior of this method is to activate the // SVC_HANDLER by calling its open() method (which allows the @@ -243,13 +244,13 @@ public: // "Do-nothing constructor" ACE_Reactive_Strategy (ACE_Reactor *reactor, - ACE_Reactor_Mask = ACE_Event_Handler::READ_MASK, - int flags = 0); + ACE_Reactor_Mask = ACE_Event_Handler::READ_MASK, + int flags = 0); // Initialize the strategy. virtual int open (ACE_Reactor *reactor, - ACE_Reactor_Mask = ACE_Event_Handler::READ_MASK, - int flags = 0); + ACE_Reactor_Mask = ACE_Event_Handler::READ_MASK, + int flags = 0); // Initialize the strategy. virtual ~ACE_Reactive_Strategy (void); @@ -257,7 +258,7 @@ public: // = Factory method. virtual int activate_svc_handler (SVC_HANDLER *svc_handler, - void *arg = 0); + void *arg = 0); // Activate the <svc_handler> by registering it with the <Reactor> // and then calling it's <open> hook. @@ -297,14 +298,14 @@ public: // "Do-nothing constructor" ACE_Thread_Strategy (ACE_Thread_Manager *tm, - long thr_flags, - size_t n_threads = 1, + long thr_flags, + size_t n_threads = 1, int flags = 0); // Initialize the strategy. virtual int open (ACE_Thread_Manager *tm, - long thr_flags, - size_t n_threads = 1, + long thr_flags, + size_t n_threads = 1, int flags = 0); // Initialize the strategy. @@ -312,7 +313,7 @@ public: // = Factory method. virtual int activate_svc_handler (SVC_HANDLER *svc_handler, - void *arg = 0); + void *arg = 0); // Activate the <svc_handler> with an appropriate concurrency // strategy. This method activates the SVC_HANDLER by first calling // its open() method and then calling its activate() method to turn @@ -354,14 +355,14 @@ public: // = Intialization and termination methods. ACE_Process_Strategy (size_t n_processes = 1, - ACE_Event_Handler *acceptor = 0, - ACE_Reactor * = 0, + ACE_Event_Handler *acceptor = 0, + ACE_Reactor * = 0, int flags = 0); // Initialize the strategy. virtual int open (size_t n_processes = 1, - ACE_Event_Handler *acceptor = 0, - ACE_Reactor * = 0, + ACE_Event_Handler *acceptor = 0, + ACE_Reactor * = 0, int flag = 0); // Initialize the strategy. @@ -369,7 +370,7 @@ public: // = Factory method. virtual int activate_svc_handler (SVC_HANDLER *svc_handler, - void *arg = 0); + void *arg = 0); // Activate the <svc_handler> with an appropriate concurrency // strategy. This method activates the SVC_HANDLER by first forking // and then calling the open() method of the SVC_HANDLER in the @@ -414,12 +415,12 @@ public: // Default constructor. ACE_Accept_Strategy (const ACE_PEER_ACCEPTOR_ADDR &local_addr, - int restart = 0, + int restart = 0, ACE_Reactor *reactor = ACE_Reactor::instance ()); // Initialize the <peer_acceptor_> with <local_addr>. virtual int open (const ACE_PEER_ACCEPTOR_ADDR &local_addr, - int restart = 0); + int restart = 0); // Initialize the <peer_acceptor_> with <local_addr>. virtual ACE_HANDLE get_handle (void) const; @@ -471,12 +472,12 @@ public: // = Factory method. virtual int connect_svc_handler (SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms); + const ACE_PEER_CONNECTOR_ADDR &remote_addr, + ACE_Time_Value *timeout, + const ACE_PEER_CONNECTOR_ADDR &local_addr, + int reuse_addr, + int flags, + int perms); // The default behavior delegates to the <connect> method of the // <PEER_CONNECTOR::connect>. @@ -619,7 +620,7 @@ class ACE_NOOP_Concurrency_Strategy : public ACE_Concurrency_Strategy<SVC_HANDLE public: // = Factory method. virtual int activate_svc_handler (SVC_HANDLER *svc_handler, - void *arg = 0); + void *arg = 0); // This is a no-op. }; @@ -757,12 +758,12 @@ public: // Template method for preparing the svc_handler for recycling. virtual int connect_svc_handler (SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, - ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, - int flags, - int perms); + const ACE_PEER_CONNECTOR_ADDR &remote_addr, + ACE_Time_Value *timeout, + const ACE_PEER_CONNECTOR_ADDR &local_addr, + int reuse_addr, + int flags, + int perms); // Checks to see if there is already a <SVC_HANDLER> in the cache // connected to the <remote_addr>. If so, we return this pointer. // Otherwise we establish the connection, put it into the cache, and diff --git a/ace/Stream.h b/ace/Stream.h index 096172b6d3d..203086c4816 100644 --- a/ace/Stream.h +++ b/ace/Stream.h @@ -5,28 +5,29 @@ // // = LIBRARY // ace -// +// // = FILENAME // Stream.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_STREAM_H #define ACE_STREAM_H #include "ace/ACE.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/IO_Cntl_Msg.h" #include "ace/Message_Block.h" #include "ace/Time_Value.h" #include "ace/Module.h" -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - // Forward decls. template<ACE_SYNCH_DECL> class ACE_Stream_Iterator; //template<ACE_SYNCH_DECL> class ACE_Module; @@ -52,17 +53,17 @@ public: }; // = Initializatation and termination methods. - ACE_Stream (void *arg = 0, - ACE_Module<ACE_SYNCH_USE> *head = 0, - ACE_Module<ACE_SYNCH_USE> *tail = 0); + ACE_Stream (void *arg = 0, + ACE_Module<ACE_SYNCH_USE> *head = 0, + ACE_Module<ACE_SYNCH_USE> *tail = 0); // Create a Stream consisting of <head> and <tail> as the Stream // head and Stream tail, respectively. If these are 0 then the // <ACE_Stream_Head> and <ACE_Stream_Tail> are used, respectively. // <arg> is the value past in to the open() methods of the tasks. int open (void *arg, - ACE_Module<ACE_SYNCH_USE> *head = 0, - ACE_Module<ACE_SYNCH_USE> *tail = 0); + ACE_Module<ACE_SYNCH_USE> *head = 0, + ACE_Module<ACE_SYNCH_USE> *tail = 0); // Create a Stream consisting of <head> and <tail> as the Stream // head and Stream tail, respectively. If these are 0 then the // <ACE_Stream_Head> and <ACE_Stream_Tail> are used, respectively. @@ -70,11 +71,11 @@ public: int close (int flags = M_DELETE); // Close down the stream and release all the resources. - + ~ACE_Stream (void); // Close down the stream and release all the resources. - // = ACE_Stream plumbing operations + // = ACE_Stream plumbing operations int push (ACE_Module<ACE_SYNCH_USE> *mod); // Add a new module <mod> right below the Stream head. @@ -90,13 +91,13 @@ public: // Remove the named module <mod> from the stream. This bypasses the // strict LIFO ordering of push() and pop(). - ACE_Module<ACE_SYNCH_USE> *head (void); + ACE_Module<ACE_SYNCH_USE> *head (void); // Return current stream head. - ACE_Module<ACE_SYNCH_USE> *tail (void); + ACE_Module<ACE_SYNCH_USE> *tail (void); // Return current stream tail. - ACE_Module<ACE_SYNCH_USE> *find (const ASYS_TCHAR *mod); + ACE_Module<ACE_SYNCH_USE> *find (const ASYS_TCHAR *mod); // Find a particular ACE_Module. int link (ACE_Stream<ACE_SYNCH_USE> &); @@ -105,7 +106,7 @@ public: int unlink (void); // Remove a pipe formed between two Streams. - // = Blocking data transfer operations + // = Blocking data transfer operations int put (ACE_Message_Block *mb, ACE_Time_Value *timeout = 0); // Send the message <mb> down the stream, starting at the Module @@ -119,11 +120,11 @@ public: // Wait for upto <timeout> amount of time for the operation to // complete (or block forever if <timeout> == 0). - int control (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd, - void *args); + int control (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd, + void *args); // Send control message down the stream. - int wait (void); + int wait (void); // Synchronize with the final close of the stream. void dump (void) const; @@ -135,15 +136,15 @@ public: private: int unlink_i (void); // Actually perform the unlinking of two Streams (must be called - // with locks held). + // with locks held). int link_i (ACE_Stream<ACE_SYNCH_USE> &); // Actually perform the linking of two Streams (must be called with // locks held). int push_module (ACE_Module<ACE_SYNCH_USE> *, - ACE_Module<ACE_SYNCH_USE> * = 0, - ACE_Module<ACE_SYNCH_USE> * = 0); + ACE_Module<ACE_SYNCH_USE> * = 0, + ACE_Module<ACE_SYNCH_USE> * = 0); // Must a new module onto the Stream. ACE_Module<ACE_SYNCH_USE> *stream_head_; @@ -158,7 +159,7 @@ private: // = Synchronization objects used for thread-safe streams. ACE_SYNCH_MUTEX_T lock_; // Protect the stream against race conditions. - + ACE_SYNCH_CONDITION_T final_close_; // Use to tell all threads waiting on the close that we are done. }; diff --git a/ace/Stream_Modules.h b/ace/Stream_Modules.h index 904413ef405..733f8efd614 100644 --- a/ace/Stream_Modules.h +++ b/ace/Stream_Modules.h @@ -5,20 +5,20 @@ // // = LIBRARY // ace -// +// // = FILENAME // Stream_Modules.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ // This needs to go outside of the #if !defined() block. Don't ask... #include "ace/Task.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #ifndef ACE_STREAM_MODULES @@ -31,7 +31,7 @@ class ACE_Stream_Head : public ACE_Task<ACE_SYNCH_USE> // Standard module that acts as the head of a ustream. public: ACE_Stream_Head (void); - // Construction + // Construction ~ACE_Stream_Head (void); // Destruction @@ -42,7 +42,7 @@ public: virtual int put (ACE_Message_Block *msg, ACE_Time_Value * = 0); virtual int svc (void); - // = Dynamic linking hooks + // = Dynamic linking hooks virtual int init (int argc, ASYS_TCHAR *argv[]); virtual int info (ASYS_TCHAR **info_string, size_t length) const; virtual int fini (void); @@ -66,7 +66,7 @@ class ACE_Stream_Tail : public ACE_Task<ACE_SYNCH_USE> // Standard module that acts as the head of a ustream. public: ACE_Stream_Tail (void); - // Construction + // Construction ~ACE_Stream_Tail (void); // Destruction @@ -77,7 +77,7 @@ public: virtual int put (ACE_Message_Block *msg, ACE_Time_Value * = 0); virtual int svc (void); - // = Dynamic linking hooks + // = Dynamic linking hooks virtual int init (int argc, ASYS_TCHAR *argv[]); virtual int info (ASYS_TCHAR **info_string, size_t length) const; virtual int fini (void); @@ -102,7 +102,7 @@ class ACE_Thru_Task : public ACE_Task<ACE_SYNCH_USE> // data to its adjacent neighbor. public: ACE_Thru_Task (void); - // Construction + // Construction ~ACE_Thru_Task (void); // Destruction diff --git a/ace/Svc_Conf.h b/ace/Svc_Conf.h index f7fe6a3ee5d..78cabe6d039 100644 --- a/ace/Svc_Conf.h +++ b/ace/Svc_Conf.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Svc_Conf.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SVC_CONF_H @@ -21,13 +21,14 @@ // Service Configurator utility. #include "ace/Obstack.h" -#include "ace/Service_Config.h" -#include "ace/Parse_Node.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - + +#include "ace/Service_Config.h" +#include "ace/Parse_Node.h" + #if defined (DEBUGGING) #if defined (ACE_YY_DECL) #undef ACE_YY_DECL @@ -38,16 +39,16 @@ #endif /* DEBUGGING */ void ace_yyrestart (FILE *); -// Restart input file parsing +// Restart input file parsing int ace_yyparse (void); -// Performs the parsing +// Performs the parsing ACE_YY_DECL; -// Performs the lexical analysis +// Performs the lexical analysis extern FILE *ace_yyin; -// Name of input stream +// Name of input stream #define ACE_YY_INPUT(buf,result,max_size) \ if (ace_yydirective != 0) \ @@ -67,40 +68,40 @@ extern FILE *ace_yyin; ACE_YY_FATAL_ERROR( "input in flex scanner failed" ); void ace_yyerror (const char *); -// Error handling routine required by YACC or BISON +// Error handling routine required by YACC or BISON extern int ace_yylineno; -// Keeps track of the current line number for error-handling routine +// Keeps track of the current line number for error-handling routine extern int ace_yyerrno; -// Keeps track of the number of errors encountered so far +// Keeps track of the number of errors encountered so far extern const ASYS_TCHAR *ace_yydirective; // Used to parse service configurator directives from a string rather // than from a svc.conf file. extern char *ace_yytext; -// Holds the lexeme for the current token +// Holds the lexeme for the current token extern int ace_yyleng; -// Holds the length of the lexeme for the current token +// Holds the length of the lexeme for the current token extern ACE_Obstack *ace_obstack; -// Efficient memory allocation technique +// Efficient memory allocation technique ACE_Service_Type_Impl *ace_create_service_type (const ASYS_TCHAR *, int, void *, unsigned int, ACE_Service_Object_Exterminator = 0); -// Factory that creates a new ACE_Service_Type_Impl. +// Factory that creates a new ACE_Service_Type_Impl. -typedef union +typedef union { int type_; ACE_Location_Node *location_node_; ACE_Parse_Node *parse_node_; ACE_Static_Node *static_node_; ACE_Service_Type *svc_record_; - char *ident_; + char *ident_; } ACE_YYSTYPE; extern ACE_YYSTYPE ace_yylval; #endif /* ACE_SVC_CONF_H */ diff --git a/ace/Svc_Handler.h b/ace/Svc_Handler.h index 85eda573095..b84b825be42 100644 --- a/ace/Svc_Handler.h +++ b/ace/Svc_Handler.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME -// Svc_Handler.h +// Svc_Handler.h // // = AUTHOR // Doug Schmidt and Irfan Pyrarli. -// +// // ============================================================================ #ifndef ACE_SVC_HANDLER_H @@ -21,13 +21,14 @@ class ACE_Connection_Recycling_Strategy; #include "ace/Synch_Options.h" -#include "ace/Task.h" -#include "ace/Service_Config.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Task.h" +#include "ace/Service_Config.h" + template <ACE_PEER_STREAM_1, ACE_SYNCH_DECL> class ACE_Svc_Handler : public ACE_Task<ACE_SYNCH_USE> { @@ -47,11 +48,11 @@ class ACE_Svc_Handler : public ACE_Task<ACE_SYNCH_USE> // ACE_Svc_Handler and the peer it is connected with. public: // = Initialization and termination methods. - ACE_Svc_Handler (ACE_Thread_Manager * = 0, + ACE_Svc_Handler (ACE_Thread_Manager * = 0, ACE_Message_Queue<ACE_SYNCH_USE> * = 0, ACE_Reactor * = ACE_Reactor::instance ()); - virtual ~ACE_Svc_Handler (void); + virtual ~ACE_Svc_Handler (void); virtual int open (void * = 0); // Activate the client handler (called by the ACE_Acceptor or @@ -99,7 +100,7 @@ public: virtual ACE_HANDLE get_handle (void) const; // Get the underlying handle associated with the <peer_>. - virtual void set_handle (ACE_HANDLE); + virtual void set_handle (ACE_HANDLE); // Set the underlying handle associated with the <peer_>. ACE_PEER_STREAM &peer (void) const; @@ -137,26 +138,26 @@ public: // to be public. // = Accessors to set/get the connection recycler. - - virtual void recycler (ACE_Connection_Recycling_Strategy *recycler, + + virtual void recycler (ACE_Connection_Recycling_Strategy *recycler, const void *recycling_act); // Set the recycler and the <recycling_act> that is used during // purging and caching. virtual ACE_Connection_Recycling_Strategy *recycler (void) const; // Get the recycler. - + virtual const void *recycling_act (void) const; // Get the recycling act. - + virtual int recycle (void * = 0); // Upcall made by the recycler when it is about to recycle the // connection. This gives the object a chance to prepare itself for // recycling. Return 0 if the object is ready for recycling, -1 on // failures. -private: - ACE_PEER_STREAM peer_; +private: + ACE_PEER_STREAM peer_; // Maintain connection with client. int dynamic_; diff --git a/ace/Synch.h b/ace/Synch.h index d4739123c3c..b5bfc0a87af 100644 --- a/ace/Synch.h +++ b/ace/Synch.h @@ -23,7 +23,7 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if !(defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM)) @@ -520,7 +520,7 @@ public: ACE_mutex_t *process_lock_; // This lock resides in shared memory. - LPCTSTR lockname_; + LPCTSTR lockname_; // Remember the name of the mutex if we created it so we can unlink // it when we go away (only the actor that initialized the memory // can destroy it). diff --git a/ace/Synch_Options.h b/ace/Synch_Options.h index b9fab9a7a6e..2b40bf5d9e3 100644 --- a/ace/Synch_Options.h +++ b/ace/Synch_Options.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME -// ACE_Synch_Options.h +// ACE_Synch_Options.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_SYNCH_OPTIONS_H @@ -20,7 +20,7 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_Synch_Options @@ -29,34 +29,34 @@ class ACE_Export ACE_Synch_Options // Contains the values of options used to determine the // synchronous and asynchronous behavior. // - // = DESCRIPTION - // Values support the following behavior (TV == "timeout" + // = DESCRIPTION + // Values support the following behavior (TV == "timeout" // and UR == "use ACE_Reactor"): // // = BEGIN<CODE> - // Parameters | Description - // | - // TV | UR | + // Parameters | Description + // | + // TV | UR | // -----|----------|------------------------------- - // | | + // | | // NULL | yes | infinite timeout (using ACE_Reactor) // | | - // time | yes | try asynch transaction for + // time | yes | try asynch transaction for // | | the specified time (using ACE_Reactor) // | | - // 0,0 | yes | poll; try, if EWOULDBLOCK, + // 0,0 | yes | poll; try, if EWOULDBLOCK, // | | then return immediately // | | (using ACE_Reactor) // | | // NULL | no | block forever (don't use ACE_Reactor) - // | | - // time | no | do a blocking transaction + // | | + // time | no | do a blocking transaction // | | for the specified time - // | | (don't use ACE_Reactor) - // | | + // | | (don't use ACE_Reactor) + // | | // 0,0 | no | poll; but do not initiate a // | | nonblocking transaction - // | | (don't use ACE_Reactor) + // | | (don't use ACE_Reactor) // = END<CODE> public: // = Options flags for controlling synchronization. Note that these @@ -72,16 +72,16 @@ public: // = Initialization methods. ACE_Synch_Options (u_long options = 0, - const ACE_Time_Value &timeout = ACE_Time_Value::zero, - const void *arg = 0); + const ACE_Time_Value &timeout = ACE_Time_Value::zero, + const void *arg = 0); // Initialize the Synch_Options based on parameters. ~ACE_Synch_Options (void); // Default dtor. void set (u_long options = 0, - const ACE_Time_Value &timeout = ACE_Time_Value::zero, - const void *arg = 0); + const ACE_Time_Value &timeout = ACE_Time_Value::zero, + const void *arg = 0); // Initialize the Synch_Options based on parameters. int operator[] (u_long option) const; diff --git a/ace/Synch_T.h b/ace/Synch_T.h index 3e470689865..456070cca9b 100644 --- a/ace/Synch_T.h +++ b/ace/Synch_T.h @@ -17,11 +17,12 @@ #ifndef ACE_SYNCH_T_H #define ACE_SYNCH_T_H +#include "ace/Event_Handler.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Event_Handler.h" #include "ace/Synch.h" // Forward decl @@ -794,7 +795,7 @@ protected: ACE_cond_t *process_cond_; // This condition resides in shared memory. - LPCTSTR condname_; + LPCTSTR condname_; // Remember the name of the condition if we created it so we can // unlink it when we go away (only the actor that initialized the // memory can destroy it). diff --git a/ace/System_Time.h b/ace/System_Time.h index b05bc7aac98..a213c8c24d3 100644 --- a/ace/System_Time.h +++ b/ace/System_Time.h @@ -6,12 +6,12 @@ // // = LIBRARY // ace -// +// // = FILENAME // System_Time.h // // = AUTHOR -// Prashant Jain, Tim H. Harrison and Douglas C. Schmidt +// Prashant Jain, Tim H. Harrison and Douglas C. Schmidt // // ============================================================================ @@ -19,13 +19,14 @@ #define ACE_SYSTEM_TIME_H #include "ace/OS.h" -#include "ace/Memory_Pool.h" -#include "ace/Malloc_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Memory_Pool.h" +#include "ace/Malloc_T.h" + class ACE_Export ACE_Date_Time { // = TITLE diff --git a/ace/TLI.h b/ace/TLI.h index 85991e53de0..b9163d34ac5 100644 --- a/ace/TLI.h +++ b/ace/TLI.h @@ -6,25 +6,26 @@ // // = LIBRARY // ace -// +// // = FILENAME // TLI.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_TLI_H #define ACE_TLI_H #include "ace/IPC_SAP.h" -#include "ace/Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Addr.h" + #if defined (ACE_HAS_TLI) // There's not a universal device name for TLI devices. If the platform @@ -38,12 +39,12 @@ class ACE_Export ACE_TLI : public ACE_IPC_SAP { // = TITLE // Defines the member functions for the base class of the - // ACE_TLI abstraction. + // ACE_TLI abstraction. public: // = Initialization and termination methods. - ACE_HANDLE open (const char device[], - int oflag = O_RDWR, - struct t_info *info = 0); + ACE_HANDLE open (const char device[], + int oflag = O_RDWR, + struct t_info *info = 0); // Initialize a TLI endpoint. int close (void); @@ -61,7 +62,7 @@ public: int snddis (struct t_call * = 0) const; int sndrel (void) const; int rcvrel (void) const; - + int get_local_addr (ACE_Addr &) const; // Return our local endpoint address. diff --git a/ace/TLI_Acceptor.h b/ace/TLI_Acceptor.h index 041f8ad6645..4525daf1dcb 100644 --- a/ace/TLI_Acceptor.h +++ b/ace/TLI_Acceptor.h @@ -6,26 +6,27 @@ // // = LIBRARY // ace -// +// // = FILENAME // TLI_Acceptor.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_TLI_ACCEPTOR_H #define ACE_TLI_ACCEPTOR_H #include "ace/TLI.h" -#include "ace/Time_Value.h" -#include "ace/TLI_Stream.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Time_Value.h" +#include "ace/TLI_Stream.h" + #if defined (ACE_HAS_TLI) // Forward reference... @@ -34,8 +35,8 @@ class ACE_TLI_Request_Queue; class ACE_Export ACE_TLI_Acceptor : public ACE_TLI { // = TITLE - // Defines the member functions for ACE_TLI_Acceptor abstraction. - // + // Defines the member functions for ACE_TLI_Acceptor abstraction. + // // = DESCRIPTION // This class implements the algorithm described in Steve Rago's // book on System V UNIX network programming. It basically @@ -49,19 +50,19 @@ public: // Default constructor. ACE_TLI_Acceptor (const ACE_Addr &remote_sap, - int reuse_addr = 0, - int oflag = O_RDWR, - struct t_info *info = 0, - int backlog = 5, - const char device[] = ACE_TLI_TCP_DEVICE); + int reuse_addr = 0, + int oflag = O_RDWR, + struct t_info *info = 0, + int backlog = 5, + const char device[] = ACE_TLI_TCP_DEVICE); // Initiate a passive mode socket. - ACE_HANDLE open (const ACE_Addr &remote_sap, - int reuse_addr = 0, - int oflag = O_RDWR, - struct t_info *info = 0, - int backlog = 5, - const char device[] = ACE_TLI_TCP_DEVICE); + ACE_HANDLE open (const ACE_Addr &remote_sap, + int reuse_addr = 0, + int oflag = O_RDWR, + struct t_info *info = 0, + int backlog = 5, + const char device[] = ACE_TLI_TCP_DEVICE); // Initiate a passive mode socket. int close (void); @@ -69,14 +70,14 @@ public: // = Passive connection acceptance method. - int accept (ACE_TLI_Stream &new_tli_sap, - ACE_Addr *remote_addr = 0, - ACE_Time_Value *timeout = 0, - int restart = 1, + int accept (ACE_TLI_Stream &new_tli_sap, + ACE_Addr *remote_addr = 0, + ACE_Time_Value *timeout = 0, + int restart = 1, int reset_new_handle = 0, - int rwflag = 1, - netbuf *udata = 0, - netbuf *opt = 0); + int rwflag = 1, + netbuf *udata = 0, + netbuf *opt = 0); // Accept a new data transfer connection. A <timeout> of 0 means // block forever, a <timeout> of {0, 0} means poll. <restart> == 1 // means "restart if interrupted." @@ -97,18 +98,18 @@ private: int backlog_; // Number of connections to queue. - + int rwflag_; // Are we using "tirdwr" mod? - + int handle_async_event (int restart, int rwflag); // Handle TLI accept insanity... ACE_TLI_Request_Queue *queue_; // Used for queueing up pending requests. - - struct t_discon *disp_; - // Used for handling disconnects + + struct t_discon *disp_; + // Used for handling disconnects }; #include "ace/TLI_Acceptor.i" diff --git a/ace/TLI_Connector.h b/ace/TLI_Connector.h index 360baabb65e..1a34bef0e71 100644 --- a/ace/TLI_Connector.h +++ b/ace/TLI_Connector.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // TLI_Connector.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_TLI_CONNECTOR_H @@ -20,7 +20,7 @@ #include "ace/TLI_Stream.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (ACE_HAS_TLI) @@ -35,18 +35,18 @@ public: ACE_TLI_Connector (void); // Default constructor. - ACE_TLI_Connector (ACE_TLI_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0, - const char device[] = ACE_TLI_TCP_DEVICE, - struct t_info *info = 0, - int rw_flag = 1, - struct netbuf *udata = 0, - struct netbuf *opt = 0); + ACE_TLI_Connector (ACE_TLI_Stream &new_stream, + const ACE_Addr &remote_sap, + ACE_Time_Value *timeout = 0, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int reuse_addr = 0, + int flags = O_RDWR, + int perms = 0, + const char device[] = ACE_TLI_TCP_DEVICE, + struct t_info *info = 0, + int rw_flag = 1, + struct netbuf *udata = 0, + struct netbuf *opt = 0); // Actively connect and produce a <new_stream> if things go well. // The <remote_sap> is the address that we are trying to connect // with. The <timeout> is the amount of time to wait to connect. @@ -61,18 +61,18 @@ public: // the OS do the binding. If <reuse_addr> == 1 then the // <local_addr> is reused, even if it hasn't been cleanedup yet. - int connect (ACE_TLI_Stream &new_stream, - const ACE_Addr &remote_sap, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0, - const char device[] = ACE_TLI_TCP_DEVICE, - struct t_info *info = 0, - int rw_flag = 1, - struct netbuf *udata = 0, - struct netbuf *opt = 0); + int connect (ACE_TLI_Stream &new_stream, + const ACE_Addr &remote_sap, + ACE_Time_Value *timeout = 0, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int reuse_addr = 0, + int flags = O_RDWR, + int perms = 0, + const char device[] = ACE_TLI_TCP_DEVICE, + struct t_info *info = 0, + int rw_flag = 1, + struct netbuf *udata = 0, + struct netbuf *opt = 0); // Actively connect and produce a <new_stream> if things go well. // The <remote_sap> is the address that we are trying to connect // with. The <timeout> is the amount of time to wait to connect. @@ -87,9 +87,9 @@ public: // the OS do the binding. If <reuse_addr> == 1 then the // <local_addr> is reused, even if it hasn't been cleanedup yet. - int complete (ACE_TLI_Stream &new_stream, - ACE_Addr *remote_sap, - ACE_Time_Value *tv); + int complete (ACE_TLI_Stream &new_stream, + ACE_Addr *remote_sap, + ACE_Time_Value *tv); // Try to complete a non-blocking connection. // If connection completion is successful then <new_stream> contains // the connected ACE_SOCK_Stream. If <remote_sap> is non-NULL then it diff --git a/ace/TLI_Stream.h b/ace/TLI_Stream.h index 3c38f8db9d5..95cb544a6f8 100644 --- a/ace/TLI_Stream.h +++ b/ace/TLI_Stream.h @@ -6,31 +6,32 @@ // // = LIBRARY // ace -// +// // = FILENAME // TLI_Stream.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_TLI_STREAM_H #define ACE_TLI_STREAM_H #include "ace/TLI.h" -#include "ace/INET_Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/INET_Addr.h" + #if defined (ACE_HAS_TLI) class ACE_Export ACE_TLI_Stream : public ACE_TLI { // = TITLE - // Defines the member functions for ACE_TLI_Stream abstraction. + // Defines the member functions for ACE_TLI_Stream abstraction. public: friend class ACE_TLI_Acceptor; friend class ACE_TLI_Connector; @@ -53,7 +54,7 @@ public: int get_remote_addr (ACE_Addr &) const; // Return address of remotely connected peer. - // = timod bindings + // = timod bindings ssize_t send (const void *buf, size_t n, int flags) const; // Send an n byte buffer to the connected socket (uses t_snd(3)). ssize_t recv (void *buf, size_t n, int *flags) const; @@ -64,9 +65,9 @@ public: ssize_t recv_n (void *buf, size_t n, int *flags) const; // Recv exactly n bytes from the connected socket (uses t_rcv(3)). - // = tirdwr bindings + // = tirdwr bindings ssize_t send (const void *buf, size_t n) const; - // Send an n byte buffer to the connected socket (uses write(2)). + // Send an n byte buffer to the connected socket (uses write(2)). ssize_t recv (void *buf, size_t n) const; // Recv an n byte buffer from the connected socket (uses read(2)). @@ -87,8 +88,8 @@ public: // Declare the dynamic allocation hooks. private: - int rwflag_; - // Indicates whether the tirdwr module should be pushed + int rwflag_; + // Indicates whether the tirdwr module should be pushed // = Get/set rwflag int get_rwflag (void); diff --git a/ace/TP_Reactor.h b/ace/TP_Reactor.h index b53ee3b74af..12307f21d8e 100644 --- a/ace/TP_Reactor.h +++ b/ace/TP_Reactor.h @@ -20,7 +20,7 @@ #include "ace/Select_Reactor.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_EH_Dispatch_Info diff --git a/ace/TTY_IO.h b/ace/TTY_IO.h index ad0d8903108..82d1d25abb5 100644 --- a/ace/TTY_IO.h +++ b/ace/TTY_IO.h @@ -5,34 +5,35 @@ // // = LIBRARY // ace -// +// // = FILENAME // TTY_IO.h // // = DESCRIPTION // // = AUTHOR -// Douglas C. Schmidt -// +// Douglas C. Schmidt +// // ============================================================================ #ifndef ACE_TTY_IO_H #define ACE_TTY_IO_H #include "ace/OS.h" -#include "ace/DEV_Addr.h" -#include "ace/DEV_Connector.h" -#include "ace/DEV_IO.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/DEV_Addr.h" +#include "ace/DEV_Connector.h" +#include "ace/DEV_IO.h" + class ACE_Export ACE_TTY_IO : public ACE_DEV_IO { // = TITLE // Class definitions for platform specific TTY features. - // + // // = DESCRIPTION // This class represents an example interface for a specific // device (a serial line) It extends the capability of the @@ -43,7 +44,7 @@ class ACE_Export ACE_TTY_IO : public ACE_DEV_IO public: enum Control_Mode { - SETPARAMS, // Set control parameters. + SETPARAMS, // Set control parameters. GETPARAMS // Get control parameters. }; diff --git a/ace/Task.h b/ace/Task.h index 35125b68f25..e2b052f4f29 100644 --- a/ace/Task.h +++ b/ace/Task.h @@ -18,12 +18,13 @@ #define ACE_TASK_H #include "ace/Service_Object.h" -#include "ace/Thread_Manager.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Thread_Manager.h" + class ACE_Export ACE_Task_Flags { public: diff --git a/ace/Task_T.h b/ace/Task_T.h index 1ecbd85fb99..856e47778a5 100644 --- a/ace/Task_T.h +++ b/ace/Task_T.h @@ -18,13 +18,14 @@ #define ACE_TASK_T_H #include "ace/Message_Queue.h" -#include "ace/Synch_T.h" -#include "ace/Task.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Synch_T.h" +#include "ace/Task.h" + // Forward decls... template <ACE_SYNCH_DECL> class ACE_Module; @@ -44,7 +45,7 @@ public: // = Initialization/termination methods. ACE_Task (ACE_Thread_Manager *thr_mgr = 0, - ACE_Message_Queue<ACE_SYNCH_USE> *mq = 0); + ACE_Message_Queue<ACE_SYNCH_USE> *mq = 0); // Initialize a Task, supplying a thread manager and a message // queue. If the user doesn't supply a ACE_Message_Queue pointer // then we'll allocate one dynamically. Otherwise, we'll use the diff --git a/ace/Thread.h b/ace/Thread.h index bdeb8148a05..06e91173c67 100644 --- a/ace/Thread.h +++ b/ace/Thread.h @@ -20,7 +20,7 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ class ACE_Export ACE_Thread diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h index b5d58bccb1f..a5871d822dc 100644 --- a/ace/Thread_Manager.h +++ b/ace/Thread_Manager.h @@ -18,14 +18,15 @@ #define ACE_THREAD_MANAGER_H #include "ace/Thread.h" -#include "ace/Synch.h" -#include "ace/Containers.h" -#include "ace/Free_List.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Synch.h" +#include "ace/Containers.h" +#include "ace/Free_List.h" + // The following macros control how a Thread Manager manages a pool of // Thread_Descriptor. Currently, the default behavior is not to // preallocate any thread descriptor and never (well, almost never) diff --git a/ace/Time_Request_Reply.h b/ace/Time_Request_Reply.h index d92faa0f9ee..90e3f3b3e10 100644 --- a/ace/Time_Request_Reply.h +++ b/ace/Time_Request_Reply.h @@ -6,36 +6,37 @@ // // = LIBRARY // ACE -// +// // = FILENAME // ACE_Time_Request_Reply.h // -// = DESCRIPTION -// Define the format used to exchange messages between the +// = DESCRIPTION +// Define the format used to exchange messages between the // ACE_Time_Server and clerks. // // = AUTHOR // Prashant Jain -// +// // ============================================================================ #ifndef ACE_TIME_REQUEST_REPLY_H #define ACE_TIME_REQUEST_REPLY_H #include "ace/Time_Value.h" -#include "ace/SString.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/SString.h" + class ACE_Export ACE_Time_Request { // = TITLE // Message format for delivering requests to the ACE_Time Server. // // = DESCRIPTION - // This class is implemented to minimize data copying. + // This class is implemented to minimize data copying. // In particular, all marshaling is done in situ... public: enum Constants @@ -51,9 +52,9 @@ public: // Default constructor. ACE_Time_Request (ACE_INT32 msg_type, // Type of request. - const ACE_UINT32 time, - ACE_Time_Value *timeout = 0); // Max time waiting for request. - // Create a <ACE_Time_Request> message. + const ACE_UINT32 time, + ACE_Time_Value *timeout = 0); // Max time waiting for request. + // Create a <ACE_Time_Request> message. void init (void); // Initialize length_ in order to ensure correct byte ordering @@ -61,7 +62,7 @@ public: // Get the fixed size of message ssize_t size (void) const; - + // = Set/get the type of the message. ACE_INT32 msg_type (void) const; void msg_type (ACE_INT32); @@ -88,7 +89,7 @@ public: // Print out the values of the message for debugging purposes. private: - // = The 5 fields in the <Transfer> struct are transmitted to the server. + // = The 5 fields in the <Transfer> struct are transmitted to the server. // The remaining 2 fields are not tranferred -- they are used only on // the server-side to simplify lookups. @@ -98,7 +99,7 @@ private: // Type of the request (i.e., <TIME_UPDATE>) ACE_UINT32 block_forever_; - // Indicates if we should block forever. If 0, then <secTimeout_> + // Indicates if we should block forever. If 0, then <secTimeout_> // and <usecTimeout_> indicates how long we should wait. ACE_UINT32 sec_timeout_; diff --git a/ace/Time_Value.h b/ace/Time_Value.h index d3fa1094fef..5f085c020c0 100644 --- a/ace/Time_Value.h +++ b/ace/Time_Value.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Time_Value.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_TIME_VALUE_H @@ -23,7 +23,7 @@ #include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #endif /* ACE_TIME_VALUE */ diff --git a/ace/Timeprobe.h b/ace/Timeprobe.h index be8b6153254..88417c4a264 100644 --- a/ace/Timeprobe.h +++ b/ace/Timeprobe.h @@ -7,7 +7,7 @@ #include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (ACE_ENABLE_TIMEPROBES) @@ -19,7 +19,7 @@ #if defined (ACE_COMPILE_TIMEPROBES) class ACE_Export ACE_Event_Descriptions -{ +{ // = TITLE // Event Descriptions. public: @@ -82,7 +82,7 @@ typedef ACE_SYNCH_MUTEX ACE_TIMEPROBE_MUTEX; typedef ACE_SYNCH_NULL_MUTEX ACE_TIMEPROBE_MUTEX; # endif /* ACE_MT_TIMEPROBES */ -typedef ACE_Timeprobe<ACE_TIMEPROBE_MUTEX> +typedef ACE_Timeprobe<ACE_TIMEPROBE_MUTEX> ACE_TIMEPROBE_WITH_LOCKING; // If ACE_TSS_TIMEPROBES is defined, store the ACE_Timeprobe singleton @@ -91,26 +91,26 @@ typedef ACE_Timeprobe<ACE_TIMEPROBE_MUTEX> // other. # if defined (ACE_TSS_TIMEPROBES) #define ACE_TIMEPROBE_SINGLETON_DEFINE \ - ACE_TSS_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_NULL_MUTEX>; + ACE_TSS_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_NULL_MUTEX>; typedef ACE_TSS_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_NULL_MUTEX> ACE_TIMEPROBE_SINGLETON; # else /* ACE_TSS_TIMEPROBES */ #define ACE_TIMEPROBE_SINGLETON_DEFINE \ ACE_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_MUTEX>; -typedef ACE_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_MUTEX> +typedef ACE_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_MUTEX> ACE_TIMEPROBE_SINGLETON; # endif /* ACE_TSS_TIMEPROBES */ #if defined (_MSC_VER) // Disable warning of using Microsoft Extension. -#pragma warning(disable:4231) +#pragma warning(disable:4231) #endif /* _MSC_VER */ ACE_SINGLETON_DECLARATION (ACE_TIMEPROBE_SINGLETON_DEFINE); #if defined (_MSC_VER) // Default back the warning of using Microsoft Extension. -#pragma warning(default:4231) +#pragma warning(default:4231) #endif /* _MSC_VER */ #endif /* ACE_COMPILE_TIMEPROBES */ @@ -133,7 +133,7 @@ ACE_SINGLETON_DECLARATION (ACE_TIMEPROBE_SINGLETON_DEFINE); # define ACE_TIMEPROBE(id) # define ACE_TIMEPROBE_PRINT # define ACE_TIMEPROBE_PRINT_ABSOLUTE -# define ACE_TIMEPROBE_EVENT_DESCRIPTIONS(descriptions, minimum_id) +# define ACE_TIMEPROBE_EVENT_DESCRIPTIONS(descriptions, minimum_id) # define ACE_FUNCTION_TIMEPROBE(X) #endif /* ACE_ENABLE_TIMEPROBES && ACE_COMPILE_TIMEPROBES */ diff --git a/ace/Timeprobe_T.h b/ace/Timeprobe_T.h index 6fe1bd79502..a95617ab891 100644 --- a/ace/Timeprobe_T.h +++ b/ace/Timeprobe_T.h @@ -7,7 +7,7 @@ #include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (ACE_COMPILE_TIMEPROBES) @@ -31,7 +31,7 @@ class ACE_Timeprobe // event description can either be an unsigned long or a string // (char *). If string are used, care must be taken cause only // pointer copies are done and the string data is *not* copied. - // + // // The recorded time probes can then be printed by calling // print_times(). If you have used unsigned longs as event // descriptions in any of your time probes, you must have @@ -71,10 +71,10 @@ public: // Record event descriptions. void print_times (void); - // Print the time probes. + // Print the time probes. void print_absolute_times (void); - // Print the time probes. + // Print the time probes. void reset (void); // Reset the slots. All old time probes will be lost. @@ -83,11 +83,11 @@ public: // Not implemented (stupid MSVC won't let it be protected). protected: - typedef ACE_Timeprobe<ACE_LOCK> + typedef ACE_Timeprobe<ACE_LOCK> SELF; // Self - typedef ACE_Unbounded_Set<ACE_Event_Descriptions> + typedef ACE_Unbounded_Set<ACE_Event_Descriptions> EVENT_DESCRIPTIONS; // We can hold multiple event description tables. @@ -120,14 +120,14 @@ protected: // Current size of timestamp table }; -template <class Timeprobe> -class ACE_Function_Timeprobe +template <class Timeprobe> +class ACE_Function_Timeprobe { // = TITLE // Auto pointer like time probes. It will record <event> on // construction and <event + 1> on destruction. public: - ACE_Function_Timeprobe (Timeprobe &timeprobe, + ACE_Function_Timeprobe (Timeprobe &timeprobe, u_long event); // Constructor. diff --git a/ace/Timer_Hash.h b/ace/Timer_Hash.h index 2fbe0f80428..6d9b73740ca 100644 --- a/ace/Timer_Hash.h +++ b/ace/Timer_Hash.h @@ -5,67 +5,68 @@ // // = LIBRARY // ace -// +// // = FILENAME // Timer_Hash.h // // = AUTHOR // Darrell Brunsch <brunsch@cs.wustl.edu> -// +// // ============================================================================ #ifndef ACE_TIMER_HASH_H #define ACE_TIMER_HASH_H #include "ace/Timer_Hash_T.h" -#include "ace/Timer_Heap_T.h" -#include "ace/Timer_List_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -// The following typedef are here for ease of use +#include "ace/Timer_Heap_T.h" +#include "ace/Timer_List_T.h" -typedef ACE_Timer_Hash_Upcall <ACE_Event_Handler *, +// The following typedef are here for ease of use + +typedef ACE_Timer_Hash_Upcall <ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX> ACE_Hash_Upcall; -typedef ACE_Timer_List_T <ACE_Event_Handler *, +typedef ACE_Timer_List_T <ACE_Event_Handler *, ACE_Hash_Upcall, ACE_Null_Mutex> ACE_Hash_Timer_List; -typedef ACE_Timer_Heap_T <ACE_Event_Handler *, +typedef ACE_Timer_Heap_T <ACE_Event_Handler *, ACE_Hash_Upcall, ACE_Null_Mutex> ACE_Hash_Timer_Heap; -typedef ACE_Timer_Hash_T<ACE_Event_Handler *, - ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, +typedef ACE_Timer_Hash_T<ACE_Event_Handler *, + ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX, ACE_Hash_Timer_List> - - ACE_Timer_Hash; -typedef ACE_Timer_Hash_Iterator_T<ACE_Event_Handler *, - ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, + ACE_Timer_Hash; + +typedef ACE_Timer_Hash_Iterator_T<ACE_Event_Handler *, + ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX, ACE_Hash_Timer_List> - ACE_Timer_Hash_Iterator; + ACE_Timer_Hash_Iterator; -typedef ACE_Timer_Hash_T<ACE_Event_Handler *, - ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, +typedef ACE_Timer_Hash_T<ACE_Event_Handler *, + ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX, ACE_Hash_Timer_Heap> - ACE_Timer_Hash_Heap; + ACE_Timer_Hash_Heap; -typedef ACE_Timer_Hash_Iterator_T<ACE_Event_Handler *, - ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, +typedef ACE_Timer_Hash_Iterator_T<ACE_Event_Handler *, + ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX, ACE_Hash_Timer_Heap> - ACE_Timer_Hash_Heap_Iterator; + ACE_Timer_Hash_Heap_Iterator; #endif /* ACE_TIMER_HASH_H */ diff --git a/ace/Timer_Hash_T.h b/ace/Timer_Hash_T.h index 24b37a908b8..da22bbdd28a 100644 --- a/ace/Timer_Hash_T.h +++ b/ace/Timer_Hash_T.h @@ -5,25 +5,26 @@ // // = LIBRARY // ace -// +// // = FILENAME // Timer_Hash_T.h // // = AUTHOR -// Darrell Brunsch <brunsch@cs.wustl.edu> -// +// Darrell Brunsch <brunsch@cs.wustl.edu> +// // ============================================================================ #ifndef ACE_TIMER_HASH_T_H #define ACE_TIMER_HASH_T_H #include "ace/Timer_Queue_T.h" -#include "ace/Free_List.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Free_List.h" + // Forward declaration. template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> class ACE_Timer_Hash_T; @@ -31,18 +32,18 @@ class ACE_Timer_Hash_T; template <class TYPE, class FUNCTOR, class ACE_LOCK> class ACE_Timer_Hash_Upcall { - // = TITLE + // = TITLE // Functor for Timer_Hash // // = DESCRIPTION - // This class calls up to the Timer Hash's functor from the + // This class calls up to the Timer Hash's functor from the // timer queues in the hash table public: - typedef ACE_Timer_Queue_T<ACE_Event_Handler *, - ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>, + typedef ACE_Timer_Queue_T<ACE_Event_Handler *, + ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>, ACE_Null_Mutex> TIMER_QUEUE; - + ACE_Timer_Hash_Upcall (void); // Default constructor (creates an invalid object, but needs to be here // so timer queues using this functor can be constructed) @@ -51,13 +52,13 @@ public: // Constructor that specifies a Timer_Hash to call up to int timeout (TIMER_QUEUE &timer_queue, - ACE_Event_Handler *handler, - const void *arg, - const ACE_Time_Value &cur_time); + ACE_Event_Handler *handler, + const void *arg, + const ACE_Time_Value &cur_time); // This method is called when the timer expires - + int cancellation (TIMER_QUEUE &timer_queue, - ACE_Event_Handler *handler); + ACE_Event_Handler *handler); // This method is called when the timer is canceled int deletion (TIMER_QUEUE &timer_queue, @@ -84,7 +85,7 @@ class ACE_Timer_Hash_Iterator_T : public ACE_Timer_Queue_Iterator_T <TYPE, FUNCT // = DESCRIPTION // This is a generic iterator that can be used to visit every // node of a timer queue. Be aware that it doesn't transverse - // in the order of timeout values. + // in the order of timeout values. public: ACE_Timer_Hash_Iterator_T (ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET> &); // Constructor. @@ -115,16 +116,16 @@ protected: template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> class ACE_Timer_Hash_T : public ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK> { - // = TITLE + // = TITLE // Provides a hash table of <BUCKET>s as an implementation for // a timer queue. // // = DESCRIPTION - // This implementation uses a hash table of BUCKETs. The hash - // is based on the time_value of the event. Unlike other Timer - // Queues, ACE_Timer_Hash does not expire events in order. -public: - typedef ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET> + // This implementation uses a hash table of BUCKETs. The hash + // is based on the time_value of the event. Unlike other Timer + // Queues, ACE_Timer_Hash does not expire events in order. +public: + typedef ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET> HASH_ITERATOR; // Type of iterator @@ -132,15 +133,15 @@ public: // Iterator is a friend typedef ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK> INHERITED; - // Type inherited from + // Type inherited from // = Initialization and termination methods. ACE_Timer_Hash_T (size_t table_size, FUNCTOR *upcall_functor = 0, ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0); // Default constructor. <table_size> determines the size of the - // hash table. <upcall_functor> is the instance of the FUNCTOR - // to be used by the buckets. If <upcall_functor> is 0, a default + // hash table. <upcall_functor> is the instance of the FUNCTOR + // to be used by the buckets. If <upcall_functor> is 0, a default // FUNCTOR will be created. ACE_Timer_Hash_T (FUNCTOR *upcall_functor = 0, ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0); @@ -159,27 +160,27 @@ public: virtual const ACE_Time_Value &earliest_time (void) const; // Returns the time of the earlier node in the <ACE_Timer_Hash>. - virtual long schedule (const TYPE &type, - const void *act, - const ACE_Time_Value &delay, - const ACE_Time_Value &interval = ACE_Time_Value::zero); + virtual long schedule (const TYPE &type, + const void *act, + const ACE_Time_Value &delay, + const ACE_Time_Value &interval = ACE_Time_Value::zero); // Schedule <type> that will expire after <delay> amount of time. // If it expires then <act> is passed in as the value to the // <functor>. If <interval> is != to <ACE_Time_Value::zero> then it // is used to reschedule the <type> automatically. This method - // returns a <timer_id> that is a pointer to a token which stores + // returns a <timer_id> that is a pointer to a token which stores // information about the event. This <timer_id> can be used to cancel // the timer before it expires. Returns -1 on failure. virtual int cancel (const TYPE &type, - int dont_call_handle_close = 1); + int dont_call_handle_close = 1); // Cancel all timer associated with <type>. If <dont_call> is 0 // then the <functor> will be invoked. Returns number of timers // cancelled. virtual int cancel (long timer_id, - const void **act = 0, - int dont_call_handle_close = 1); + const void **act = 0, + int dont_call_handle_close = 1); // Cancel the single timer that matches the <timer_id> value (which // was returned from the <schedule> method). If act is non-NULL // then it will be set to point to the ``magic cookie'' argument @@ -219,7 +220,7 @@ private: size_t size_; // Keeps track of the size of the queue - + BUCKET **table_; // Table of BUCKETS @@ -228,7 +229,7 @@ private: ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK> table_functor_; // Functor used for the table's timer queues - + size_t earliest_position_; // Index to the position with the earliest entry diff --git a/ace/Timer_Heap.h b/ace/Timer_Heap.h index d23033a726a..2e37725a6cb 100644 --- a/ace/Timer_Heap.h +++ b/ace/Timer_Heap.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Timer_Heap.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_TIMER_HEAP_H @@ -20,20 +20,20 @@ #include "ace/Timer_Heap_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ // The following typedef are here for ease of use and backward // compatibility. -typedef ACE_Timer_Heap_T<ACE_Event_Handler *, - ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, - ACE_SYNCH_RECURSIVE_MUTEX> - ACE_Timer_Heap; +typedef ACE_Timer_Heap_T<ACE_Event_Handler *, + ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, + ACE_SYNCH_RECURSIVE_MUTEX> + ACE_Timer_Heap; -typedef ACE_Timer_Heap_Iterator_T<ACE_Event_Handler *, - ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, - ACE_SYNCH_RECURSIVE_MUTEX> - ACE_Timer_Heap_Iterator; +typedef ACE_Timer_Heap_Iterator_T<ACE_Event_Handler *, + ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, + ACE_SYNCH_RECURSIVE_MUTEX> + ACE_Timer_Heap_Iterator; #endif /* ACE_TIMER_HEAP_H */ diff --git a/ace/Timer_Heap_T.h b/ace/Timer_Heap_T.h index b959230f01f..784e57acfbc 100644 --- a/ace/Timer_Heap_T.h +++ b/ace/Timer_Heap_T.h @@ -5,32 +5,33 @@ // // = LIBRARY // ace -// +// // = FILENAME // Timer_Heap_T.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_TIMER_HEAP_T_H #define ACE_TIMER_HEAP_T_H #include "ace/Timer_Queue_T.h" -#include "ace/Free_List.h" -#include "ace/Containers.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Free_List.h" +#include "ace/Containers.h" + // Forward declaration template <class TYPE, class FUNCTOR, class ACE_LOCK> class ACE_Timer_Heap_T; template <class TYPE, class FUNCTOR, class ACE_LOCK> -class ACE_Timer_Heap_Iterator_T : public ACE_Timer_Queue_Iterator_T<TYPE, FUNCTOR, ACE_LOCK> +class ACE_Timer_Heap_Iterator_T : public ACE_Timer_Queue_Iterator_T<TYPE, FUNCTOR, ACE_LOCK> { // = TITLE // Iterates over an <ACE_Timer_Heap_T>. @@ -38,7 +39,7 @@ class ACE_Timer_Heap_Iterator_T : public ACE_Timer_Queue_Iterator_T<TYPE, FUNCTO // = DESCRIPTION // This is a generic iterator that can be used to visit every // node of a timer queue. Be aware that it doesn't transverse - // in the order of timeout values. + // in the order of timeout values. public: ACE_Timer_Heap_Iterator_T (ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK> &); // Constructor. @@ -69,7 +70,7 @@ protected: template <class TYPE, class FUNCTOR, class ACE_LOCK> class ACE_Timer_Heap_T : public ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK> { - // = TITLE + // = TITLE // Provides a very fast and predictable timer implementation. // // = DESCRIPTION @@ -89,8 +90,8 @@ public: // = Initialization and termination methods. ACE_Timer_Heap_T (size_t size, - int preallocated = 0, - FUNCTOR *upcall_functor = 0, + int preallocated = 0, + FUNCTOR *upcall_functor = 0, ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0); // The Constructor creates a heap with <size> elements. If // <preallocated> is non-0 then we'll pre-allocate all the memory @@ -115,10 +116,10 @@ public: virtual const ACE_Time_Value &earliest_time (void) const; // Returns the time of the earlier node in the Timer_Queue. - virtual long schedule (const TYPE &type, - const void *act, - const ACE_Time_Value &delay, - const ACE_Time_Value &interval = ACE_Time_Value::zero); + virtual long schedule (const TYPE &type, + const void *act, + const ACE_Time_Value &delay, + const ACE_Time_Value &interval = ACE_Time_Value::zero); // Schedule <type> that will expire after <delay> amount of time. // If it expires then <act> is passed in as the value to the // <functor>. If <interval> is != to <ACE_Time_Value::zero> then it @@ -133,14 +134,14 @@ public: // valid <timer_id>). virtual int cancel (const TYPE &type, - int dont_call_handle_close = 1); + int dont_call_handle_close = 1); // Cancel all timer associated with <type>. If <dont_call> is 0 // then the <functor> will be invoked. Returns number of timers // cancelled. - virtual int cancel (long timer_id, - const void **act = 0, - int dont_call_handle_close = 1); + virtual int cancel (long timer_id, + const void **act = 0, + int dont_call_handle_close = 1); // Cancel the single timer that matches the <timer_id> value (which // was returned from the <schedule> method). If act is non-NULL // then it will be set to point to the ``magic cookie'' argument @@ -184,17 +185,17 @@ private: void grow_heap (void); // Doubles the size of the heap and the corresponding timer_ids array. - // If preallocation is used, will also double the size of the + // If preallocation is used, will also double the size of the // preallocated array of ACE_Timer_Nodes. - void reheap_up (ACE_Timer_Node_T<TYPE> *new_node, - size_t index, - size_t parent); + void reheap_up (ACE_Timer_Node_T<TYPE> *new_node, + size_t index, + size_t parent); // Restore the heap property, starting at <index>. - void reheap_down (ACE_Timer_Node_T<TYPE> *moved_node, - size_t index, - size_t child); + void reheap_down (ACE_Timer_Node_T<TYPE> *moved_node, + size_t index, + size_t child); // Restore the heap property, starting at <index>. void copy (int index, ACE_Timer_Node_T<TYPE> *moved_node); @@ -218,7 +219,7 @@ private: size_t cur_size_; // Current size of the heap. - + HEAP_ITERATOR *iterator_; // Iterator used to expire timers. @@ -245,7 +246,7 @@ private: ACE_Timer_Node_T<TYPE> *preallocated_nodes_; // If this is non-0, then we preallocate <max_size_> number of // <ACE_Timer_Node> objects in order to reduce dynamic allocation - // costs. In auto-growing implementation, this points to the + // costs. In auto-growing implementation, this points to the // last array of nodes allocated. ACE_Timer_Node_T<TYPE> *preallocated_nodes_freelist_; diff --git a/ace/Timer_List.h b/ace/Timer_List.h index a25f7bbab05..570b1a8834c 100644 --- a/ace/Timer_List.h +++ b/ace/Timer_List.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Timer_List.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_TIMER_LIST_H @@ -20,20 +20,20 @@ #include "ace/Timer_List_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ // The following typedef are here for ease of use and backward // compatibility. -typedef ACE_Timer_List_T<ACE_Event_Handler *, - ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, - ACE_SYNCH_RECURSIVE_MUTEX> - ACE_Timer_List; +typedef ACE_Timer_List_T<ACE_Event_Handler *, + ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, + ACE_SYNCH_RECURSIVE_MUTEX> + ACE_Timer_List; -typedef ACE_Timer_List_Iterator_T<ACE_Event_Handler *, - ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, - ACE_SYNCH_RECURSIVE_MUTEX> - ACE_Timer_List_Iterator; +typedef ACE_Timer_List_Iterator_T<ACE_Event_Handler *, + ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, + ACE_SYNCH_RECURSIVE_MUTEX> + ACE_Timer_List_Iterator; #endif /* ACE_TIMER_LIST_H */ diff --git a/ace/Timer_List_T.h b/ace/Timer_List_T.h index c77ea71d7be..191803fd228 100644 --- a/ace/Timer_List_T.h +++ b/ace/Timer_List_T.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Timer_List_T.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_TIMER_LIST_T_H @@ -20,7 +20,7 @@ #include "ace/Timer_Queue_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ // Forward declaration. @@ -35,7 +35,7 @@ class ACE_Timer_List_Iterator_T : public ACE_Timer_Queue_Iterator_T <TYPE, FUNCT // // = DESCRIPTION // This is a generic iterator that can be used to visit every - // node of a timer queue. + // node of a timer queue. public: ACE_Timer_List_Iterator_T (ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK> &); // Constructor. @@ -65,7 +65,7 @@ protected: template <class TYPE, class FUNCTOR, class ACE_LOCK> class ACE_Timer_List_T : public ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK> { - // = TITLE + // = TITLE // Provides a simple implementation of timers. // // = DESCRIPTION @@ -81,7 +81,7 @@ class ACE_Timer_List_T : public ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK> // heap-based callout queue. For most applications, the // <ACE_Timer_Heap> will perform substantially faster than the // <ACE_Timer_List>. -public: +public: typedef ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK> LIST_ITERATOR; // Type of iterator @@ -89,10 +89,10 @@ public: // Iterator is a friend typedef ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK> INHERITED; - // Type inherited from + // Type inherited from // = Initialization and termination methods. - ACE_Timer_List_T (FUNCTOR *upcall_functor = 0, + ACE_Timer_List_T (FUNCTOR *upcall_functor = 0, ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0); // Default constructor. <upcall_functor> is the instance of the // FUNCTOR to be used by the list. If <upcall_functor> is 0, a @@ -108,10 +108,10 @@ public: virtual const ACE_Time_Value &earliest_time (void) const; // Returns the time of the earlier node in the <ACE_Timer_List>. - virtual long schedule (const TYPE &type, - const void *act, - const ACE_Time_Value &delay, - const ACE_Time_Value &interval = ACE_Time_Value::zero); + virtual long schedule (const TYPE &type, + const void *act, + const ACE_Time_Value &delay, + const ACE_Time_Value &interval = ACE_Time_Value::zero); // Schedule <type> that will expire after <delay> amount of time. // If it expires then <act> is passed in as the value to the // <functor>. If <interval> is != to <ACE_Time_Value::zero> then it @@ -126,14 +126,14 @@ public: // valid <timer_id>). virtual int cancel (const TYPE &type, - int dont_call_handle_close = 1); + int dont_call_handle_close = 1); // Cancel all timer associated with <type>. If <dont_call> is 0 // then the <functor> will be invoked. Returns number of timers // cancelled. virtual int cancel (long timer_id, - const void **act = 0, - int dont_call_handle_close = 1); + const void **act = 0, + int dont_call_handle_close = 1); // Cancel the single timer that matches the <timer_id> value (which // was returned from the <schedule> method). If act is non-NULL // then it will be set to point to the ``magic cookie'' argument @@ -152,7 +152,7 @@ public: // Dump the state of an object. virtual void reschedule (ACE_Timer_Node_T<TYPE> *); - // Reschedule an "interval" <ACE_Timer_Node>. This should be private + // Reschedule an "interval" <ACE_Timer_Node>. This should be private // but for now it needs to be public for <ACE_Timer_Hash_T> virtual ACE_Timer_Node_T<TYPE> *get_first (void); @@ -167,7 +167,7 @@ protected: // operator delete). */ private: - ACE_Timer_Node_T<TYPE> *head_; + ACE_Timer_Node_T<TYPE> *head_; // Pointer to linked list of <ACE_Timer_Handles>. LIST_ITERATOR *iterator_; diff --git a/ace/Timer_Queue.h b/ace/Timer_Queue.h index 0b35da4b98f..e7ee550300d 100644 --- a/ace/Timer_Queue.h +++ b/ace/Timer_Queue.h @@ -5,39 +5,40 @@ // // = LIBRARY // ace -// +// // = FILENAME // Timer_Queue.h // // = AUTHOR // Doug Schmidt and Irfan Pyarali -// +// // ============================================================================ #ifndef ACE_TIMER_QUEUE_H #define ACE_TIMER_QUEUE_H #include "ace/Synch.h" -#include "ace/Timer_Queue_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Timer_Queue_T.h" + // The following typedef are here for ease of use and backward // compatibility. typedef ACE_Timer_Node_T<ACE_Event_Handler *> - ACE_Timer_Node; + ACE_Timer_Node; -typedef ACE_Timer_Queue_T<ACE_Event_Handler *, - ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, - ACE_SYNCH_RECURSIVE_MUTEX> - ACE_Timer_Queue; +typedef ACE_Timer_Queue_T<ACE_Event_Handler *, + ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, + ACE_SYNCH_RECURSIVE_MUTEX> + ACE_Timer_Queue; -typedef ACE_Timer_Queue_Iterator_T<ACE_Event_Handler *, - ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, - ACE_SYNCH_RECURSIVE_MUTEX> - ACE_Timer_Queue_Iterator; +typedef ACE_Timer_Queue_Iterator_T<ACE_Event_Handler *, + ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, + ACE_SYNCH_RECURSIVE_MUTEX> + ACE_Timer_Queue_Iterator; #endif /* ACE_TIMER_QUEUE_H */ diff --git a/ace/Timer_Queue_Adapters.h b/ace/Timer_Queue_Adapters.h index 74df493dd75..c19081646f3 100644 --- a/ace/Timer_Queue_Adapters.h +++ b/ace/Timer_Queue_Adapters.h @@ -18,12 +18,13 @@ # define ACE_TIMER_QUEUE_ADAPTERS_H # include "ace/Task.h" -# include "ace/Signal.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +# include "ace/Signal.h" + template <class TQ> class ACE_Export ACE_Async_Timer_Queue_Adapter : public ACE_Event_Handler { @@ -152,11 +153,11 @@ public: # if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS) - int enqueue_command (ACE_Command_Base *command_, + int enqueue_command (ACE_Command_Base *command_, COMMAND_ENQUEUE_POSITION pos = TAIL); // Enqueues a command object for execution just before waiting on the next // timer event. This allows deferred execution of commands that cannot - // be performed in the timer event handler context, such as registering + // be performed in the timer event handler context, such as registering // or cancelling timers on platforms where the timer queue mutex is not // recursive. @@ -167,7 +168,7 @@ private: # if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS) int dispatch_commands (void); - // Dispatches all command objects enqueued in the most + // Dispatches all command objects enqueued in the most // recent event handler context. ACE_Unbounded_Queue<ACE_Command_Base *> command_queue_; diff --git a/ace/Timer_Queue_T.h b/ace/Timer_Queue_T.h index fc12b857aba..2f60778cc3f 100644 --- a/ace/Timer_Queue_T.h +++ b/ace/Timer_Queue_T.h @@ -6,13 +6,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Timer_Queue_T.h // // = AUTHOR // Doug Schmidt, Irfan Pyarali, and Darrell Brunsch -// +// // ============================================================================ #ifndef ACE_TIMER_QUEUE_T_H @@ -21,7 +21,7 @@ #include "ace/Free_List.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ template <class TYPE> @@ -36,28 +36,28 @@ public: ~ACE_Timer_Node_T (void); // Dtor. - void set (const TYPE &type, - const void *a, - const ACE_Time_Value &t, - const ACE_Time_Value &i, - ACE_Timer_Node_T<TYPE> *n, + void set (const TYPE &type, + const void *a, + const ACE_Time_Value &t, + const ACE_Time_Value &i, + ACE_Timer_Node_T<TYPE> *n, long timer_id); - // singly linked list + // singly linked list - void set (const TYPE &type, - const void *a, - const ACE_Time_Value &t, - const ACE_Time_Value &i, + void set (const TYPE &type, + const void *a, + const ACE_Time_Value &t, + const ACE_Time_Value &i, ACE_Timer_Node_T<TYPE> *p, - ACE_Timer_Node_T<TYPE> *n, + ACE_Timer_Node_T<TYPE> *n, long timer_id); // doubly linked list version - // = Accessors - + // = Accessors + TYPE &get_type (void); // Get the type. - + void set_type (TYPE &type); // Set the type. @@ -90,7 +90,7 @@ public: void set_next (ACE_Timer_Node_T<TYPE> *next); // set the next pointer. - + long get_timer_id (void); // get the timer_id. @@ -103,13 +103,13 @@ public: private: TYPE type_; // Type of object stored in the Queue - + const void *act_; // Asynchronous completion token associated with the timer. - + ACE_Time_Value timer_value_; // Time until the timer expires. - + ACE_Time_Value interval_; // If this is a periodic timer this holds the time until the next // timeout. @@ -119,7 +119,7 @@ private: ACE_Timer_Node_T<TYPE> *next_; // Pointer to next timer. - + long timer_id_; // Id of this timer (used to cancel timers before they expire). }; @@ -159,19 +159,19 @@ public: template <class TYPE, class FUNCTOR, class ACE_LOCK> class ACE_Timer_Queue_T { - // = TITLE + // = TITLE // Provides an interface to timers. // // = DESCRIPTION // This is an abstract base class that provides hook for // implementing specialized policies such as <ACE_Timer_List> // and <ACE_Timer_Heap>. -public: +public: typedef ACE_Timer_Queue_Iterator_T<TYPE, FUNCTOR, ACE_LOCK> ITERATOR; // Type of Iterator. // = Initialization and termination methods. - ACE_Timer_Queue_T (FUNCTOR *upcall_functor = 0, + ACE_Timer_Queue_T (FUNCTOR *upcall_functor = 0, ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0); // Default constructor. <upcall_functor> is the instance of the // FUNCTOR to be used by the queue. If <upcall_functor> is 0, Timer @@ -188,10 +188,10 @@ public: virtual const ACE_Time_Value &earliest_time (void) const = 0; // Returns the time of the earlier node in the Timer_Queue. - virtual long schedule (const TYPE &type, - const void *act, - const ACE_Time_Value &delay, - const ACE_Time_Value &interval = ACE_Time_Value::zero) = 0; + virtual long schedule (const TYPE &type, + const void *act, + const ACE_Time_Value &delay, + const ACE_Time_Value &interval = ACE_Time_Value::zero) = 0; // Schedule <type> that will expire after <delay> amount of time. // If it expires then <act> is passed in as the value to the // <functor>. If <interval> is != to <ACE_Time_Value::zero> then it @@ -206,15 +206,15 @@ public: // valid <timer_id>). virtual int cancel (const TYPE &type, - int dont_call_handle_close = 1) = 0; + int dont_call_handle_close = 1) = 0; // Cancel all timer associated with <type>. If // <dont_call_handle_close> is 0 then the <functor> will be invoked, // which typically invokes the <handle_close> hook. Returns number // of timers cancelled. - virtual int cancel (long timer_id, - const void **act = 0, - int dont_call_handle_close = 1) = 0; + virtual int cancel (long timer_id, + const void **act = 0, + int dont_call_handle_close = 1) = 0; // Cancel the single timer that matches the <timer_id> value (which // was returned from the <schedule> method). If act is non-NULL // then it will be set to point to the ``magic cookie'' argument @@ -248,7 +248,7 @@ public: // no pending timers or if all pending timers are longer than max. virtual ACE_Time_Value *calculate_timeout (ACE_Time_Value *max, - ACE_Time_Value *the_timeout); + ACE_Time_Value *the_timeout); // Determine the next event to timeout. Returns <max> if there are // no pending timers or if all pending timers are longer than max. // <the_timeout> should be a pointer to storage for the timeout value, @@ -258,7 +258,7 @@ public: void timer_skew (const ACE_Time_Value &skew); const ACE_Time_Value &timer_skew (void) const; - ACE_LOCK &mutex (void); + ACE_LOCK &mutex (void); // Synchronization variable used by the queue FUNCTOR &upcall_functor (void); @@ -282,8 +282,8 @@ public: protected: virtual void upcall (TYPE &type, - const void *act, - const ACE_Time_Value &cur_time); + const void *act, + const ACE_Time_Value &cur_time); // This method will call the <functor> with the <type>, <act> and // <time> @@ -316,7 +316,7 @@ protected: // Flag to delete only if the class created the <free_list_> private: - + ACE_Time_Value timeout_; // Returned by <calculate_timeout>. @@ -331,18 +331,18 @@ private: template <class ACE_LOCK> class ACE_Event_Handler_Handle_Timeout_Upcall { - // = TITLE + // = TITLE // Functor for Timer_Queues. // // = DESCRIPTION // This class implements the functor required by the Timer // Queue to call <handle_timeout> on ACE_Event_Handlers. public: - typedef ACE_Timer_Queue_T<ACE_Event_Handler *, - ACE_Event_Handler_Handle_Timeout_Upcall<ACE_LOCK>, + typedef ACE_Timer_Queue_T<ACE_Event_Handler *, + ACE_Event_Handler_Handle_Timeout_Upcall<ACE_LOCK>, ACE_LOCK> TIMER_QUEUE; - + // = Initialization and termination methods. ACE_Event_Handler_Handle_Timeout_Upcall (void); // Constructor. @@ -351,13 +351,13 @@ public: // Destructor. int timeout (TIMER_QUEUE &timer_queue, - ACE_Event_Handler *handler, - const void *arg, - const ACE_Time_Value &cur_time); + ACE_Event_Handler *handler, + const void *arg, + const ACE_Time_Value &cur_time); // This method is called when the timer expires - + int cancellation (TIMER_QUEUE &timer_queue, - ACE_Event_Handler *handler); + ACE_Event_Handler *handler); // This method is called when the timer is canceled int deletion (TIMER_QUEUE &timer_queue, diff --git a/ace/Timer_Wheel.h b/ace/Timer_Wheel.h index b21bd64fa33..dc5bae5829e 100644 --- a/ace/Timer_Wheel.h +++ b/ace/Timer_Wheel.h @@ -6,13 +6,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Timer_Wheel.h // // = AUTHOR // Darrell Brunsch (brunsch@cs.wustl.edu) -// +// // ============================================================================ #ifndef ACE_TIMER_WHEEL_H @@ -21,20 +21,20 @@ #include "ace/Timer_Wheel_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ // The following typedef are here for ease of use and backward // compatibility. -typedef ACE_Timer_Wheel_T<ACE_Event_Handler *, - ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, - ACE_SYNCH_RECURSIVE_MUTEX> - ACE_Timer_Wheel; +typedef ACE_Timer_Wheel_T<ACE_Event_Handler *, + ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, + ACE_SYNCH_RECURSIVE_MUTEX> + ACE_Timer_Wheel; -typedef ACE_Timer_Wheel_Iterator_T<ACE_Event_Handler *, - ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, - ACE_SYNCH_RECURSIVE_MUTEX> - ACE_Timer_Wheel_Iterator; +typedef ACE_Timer_Wheel_Iterator_T<ACE_Event_Handler *, + ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, + ACE_SYNCH_RECURSIVE_MUTEX> + ACE_Timer_Wheel_Iterator; #endif /* ACE_TIMER_WHEEL_H */ diff --git a/ace/Timer_Wheel_T.h b/ace/Timer_Wheel_T.h index b8995cf3bb2..2c8976fca7d 100644 --- a/ace/Timer_Wheel_T.h +++ b/ace/Timer_Wheel_T.h @@ -6,13 +6,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Timer_Wheel.h // // = AUTHOR // Darrell Brunsch <brunsch@cs.wustl.edu> -// +// // ============================================================================ #ifndef ACE_TIMER_WHEEL_T_H @@ -21,7 +21,7 @@ #include "ace/Timer_Queue_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ // Forward declaration @@ -37,7 +37,7 @@ class ACE_Timer_Wheel_Iterator_T : public ACE_Timer_Queue_Iterator_T <TYPE, FUNC // = DESCRIPTION // This is a generic iterator that can be used to visit every // node of a timer queue. Be aware that it doesn't transverse - // in the order of timeout values. + // in the order of timeout values. public: ACE_Timer_Wheel_Iterator_T (ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK> &); // Constructor @@ -61,30 +61,30 @@ protected: ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK> &timer_wheel_; // Pointer to the <ACE_Timer_List> that we are iterating over. - size_t pos_; + size_t pos_; // Current position in the timing wheel - - ACE_Timer_Node_T<TYPE> *list_item_; + + ACE_Timer_Node_T<TYPE> *list_item_; // Pointer to the position in the the <pos_>th list }; template <class TYPE, class FUNCTOR, class ACE_LOCK> class ACE_Timer_Wheel_T : public ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK> { - // = TITLE + // = TITLE // Provides a Timing Wheel version of Timer Queue // // = DESCRIPTION // This implementation uses a hash table of ordered doubly- - // linked lists of absolute times. The other enhancements + // linked lists of absolute times. The other enhancements // to Timer List include using the pointer to the node as the - // timer id (to speed up removing), adding a free list and + // timer id (to speed up removing), adding a free list and // the ability to preallocate nodes. Timer Wheel is based on // the timing wheel implementation used in Adam M. Costello and // George Varghese's paper "Redesigning the BSD Callout and - // Timer Facilities" + // Timer Facilities" // (http://dworkin.wustl.edu/~varghese/PAPERS/newbsd.ps.Z) -public: +public: typedef ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK> WHEEL_ITERATOR; // Type of iterator @@ -96,19 +96,19 @@ public: // = Initialization and termination methods - ACE_Timer_Wheel_T (size_t wheelsize, - size_t resolution, + ACE_Timer_Wheel_T (size_t wheelsize, + size_t resolution, size_t prealloc = 0, FUNCTOR *upcall_functor = 0, ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0); - // Constructor that takes in <wheelsize> - size of the timing wheel, + // Constructor that takes in <wheelsize> - size of the timing wheel, // <resolution> - resolution of time values the hashing function uses, // and <upcall_functor> - a functor that will be used instead of creating // a default functor. Also, when the freelist is created, <prealloc> nodes - // will be allocated. This can also take in a upcall functor and freelist + // will be allocated. This can also take in a upcall functor and freelist // (if 0, then defaults will be created) - ACE_Timer_Wheel_T (FUNCTOR *upcall_functor = 0, + ACE_Timer_Wheel_T (FUNCTOR *upcall_functor = 0, ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0); // Default constructor. <upcall_functor> is the instance of the // FUNCTOR to be used by the queue. If <upcall_functor> is 0, Timer @@ -127,27 +127,27 @@ public: virtual const ACE_Time_Value &earliest_time (void) const; // Returns the time of the earlier node in the <ACE_Timer_Wheel>. - virtual long schedule (const TYPE &type, - const void *act, - const ACE_Time_Value &delay, - const ACE_Time_Value &interval = ACE_Time_Value::zero); + virtual long schedule (const TYPE &type, + const void *act, + const ACE_Time_Value &delay, + const ACE_Time_Value &interval = ACE_Time_Value::zero); // Schedule <type> that will expire after <delay> amount of time. // If it expires then <act> is passed in as the value to the // <functor>. If <interval> is != to <ACE_Time_Value::zero> then it // is used to reschedule the <type> automatically. This method // returns a <timer_id> that uniquely identifies the the timer. - // This <timer_id> can be used to cancel the timer before it expires. + // This <timer_id> can be used to cancel the timer before it expires. // Returns -1 on failure. virtual int cancel (const TYPE &type, - int dont_call_handle_close = 1); + int dont_call_handle_close = 1); // Cancel all timer associated with <type>. If <dont_call> is 0 // then the <functor> will be invoked. Returns number of timers // cancelled. - virtual int cancel (long timer_id, - const void **act = 0, - int dont_call_handle_close = 1); + virtual int cancel (long timer_id, + const void **act = 0, + int dont_call_handle_close = 1); // Cancel the single timer that matches the <timer_id> value (which // was returned from the <schedule> method). If act is non-NULL // then it will be set to point to the ``magic cookie'' argument diff --git a/ace/Token.h b/ace/Token.h index 49d53db1dc4..acade74ee1b 100644 --- a/ace/Token.h +++ b/ace/Token.h @@ -5,14 +5,14 @@ // // = LIBRARY // ace -// +// // = FILENAME // Token.h // // = AUTHOR // Original author -- Karl-Heinz Dorn (kdorn@erlh.siemens.de) // Ported to ACE by Douglas C. Schmidt (schmidt@cs.wustl.edu) -// +// // ============================================================================ #ifndef ACE_TOKEN_H @@ -21,7 +21,7 @@ #include "ace/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (ACE_HAS_THREADS) @@ -37,13 +37,13 @@ class ACE_Export ACE_Token // Class that acquires, renews, and releases a synchronization // token that is serviced in strict FIFO ordering. // - // = DESCRIPTION + // = DESCRIPTION // This class is a more general-purpose synchronization mechanism // than SunOS 5.x mutexes. For example, it implements "recursive // mutex" semantics, where a thread that owns the token can // reacquire it without deadlocking. In addition, threads that are // blocked awaiting the token are serviced in strict FIFO order as - // other threads release the token (Solaris and Pthread mutexes don't + // other threads release the token (Solaris and Pthread mutexes don't // strictly enforce an acquisition order). // There are two FIFO lists within the class. Write acquires always // have higher priority over read acquires. Which means, if you use @@ -65,15 +65,15 @@ public: // = Synchronization operations. int acquire (void (*sleep_hook)(void *), - void *arg = 0, - ACE_Time_Value *timeout = 0); + void *arg = 0, + ACE_Time_Value *timeout = 0); // Acquire the token, sleeping until it is obtained or until // <timeout> expires. If some other thread currently holds the // token then <sleep_hook> is called before our thread goes to // sleep. This <sleep_hook> can be used by the requesting thread to // unblock a token-holder that is sleeping, e.g., by means of // writing to a pipe (the ACE ACE_Reactor uses this functionality). - // Return values: + // Return values: // 0 if acquires without calling <sleep_hook> // 1 if <sleep_hook> is called. // 2 if the token is signaled. @@ -85,9 +85,9 @@ public: // This behaves just like the previous <acquire> method, except // that it invokes the virtual function called <sleep_hook> // that can be overridden by a subclass of ACE_Token. - + virtual void sleep_hook (void); - // This should be overridden by a subclass to define + // This should be overridden by a subclass to define // the appropriate behavior before <acquire> goes to sleep. // By default, this is a no-op... @@ -106,7 +106,7 @@ public: // nesting_level_ > 1. I'm not sure if this is really the right // thing to do (since it makes it possible for shared data to be // changed unexpectedly) so use with caution... - // This method maintians the original token priority. + // This method maintians the original token priority. int tryacquire (void); // Become interface-compliant with other lock mechanisms (implements @@ -124,16 +124,16 @@ public: // be called acquire_yield. int acquire_read (void (*sleep_hook)(void *), - void *arg = 0, - ACE_Time_Value *timeout = 0); + void *arg = 0, + ACE_Time_Value *timeout = 0); // More sophisticate version of acquire_read. int acquire_write (void); // Just calls <acquire>. int acquire_write (void (*sleep_hook)(void *), - void *arg = 0, - ACE_Time_Value *timeout = 0); + void *arg = 0, + ACE_Time_Value *timeout = 0); // More sophisticate version of acquire_write. int tryacquire_read (void); @@ -171,7 +171,7 @@ public: // = The following structure implements a ACE_FIFO of waiter threads // that are asleep waiting to obtain the token. - struct ACE_Token_Queue_Entry + struct ACE_Token_Queue_Entry { ACE_Token_Queue_Entry (ACE_Thread_Mutex &m, ACE_thread_t t_id); @@ -209,7 +209,7 @@ private: struct ACE_Token_Queue { ACE_Token_Queue (void); - + void remove_entry (ACE_Token_Queue_Entry *); // Remove a waiter from the queue (used when a timeout occurs). @@ -220,9 +220,9 @@ private: // Tail of the list of waiting threads. }; - int shared_acquire (void (*sleep_hook_func)(void *), - void *arg, - ACE_Time_Value *timeout, + int shared_acquire (void (*sleep_hook_func)(void *), + void *arg, + ACE_Time_Value *timeout, ACE_Token_Op_Type op_type); // Implements the <acquire> and <tryacquire> methods above. diff --git a/ace/Token_Collection.h b/ace/Token_Collection.h index 404d3bcc148..ecc02f2231b 100644 --- a/ace/Token_Collection.h +++ b/ace/Token_Collection.h @@ -28,13 +28,14 @@ #define ACE_TOKEN_COLLECTION_H #include "ace/Map_Manager.h" -#include "ace/Local_Tokens.h" -#include "ace/SString.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Local_Tokens.h" +#include "ace/SString.h" + class ACE_Export ACE_Token_Collection : public ACE_Token_Proxy { // = TITLE @@ -58,7 +59,7 @@ class ACE_Export ACE_Token_Collection : public ACE_Token_Proxy // returns zero for now. public: ACE_Token_Collection (int debug = 0, - const char *name = 0); + const char *name = 0); // <debug> print out verbose debugging messages. <name> will give a // name to the collection. Collections don't really need names, but // are sometimes useful for debugging. @@ -107,9 +108,9 @@ public: // renew, or release). virtual int acquire (int notify = 0, - void (*sleep_hook)(void *) = 0, - ACE_Synch_Options &options = - ACE_Synch_Options::defaults); + void (*sleep_hook)(void *) = 0, + ACE_Synch_Options &options = + ACE_Synch_Options::defaults); // Acquire "atomically" all resources in the collection. This is // only successfull if all tokens in the collection could be // acquired. options contains the blocking semantics, timeout @@ -124,10 +125,10 @@ public: // hands. virtual int acquire (const char *token_name, - int notify = 0, - void (*sleep_hook)(void *) = 0, - ACE_Synch_Options &options = - ACE_Synch_Options::defaults); + int notify = 0, + void (*sleep_hook)(void *) = 0, + ACE_Synch_Options &options = + ACE_Synch_Options::defaults); // Acquire the token corresponding to <token_name>. The other // parameters are passed to <token>::acquire. @@ -135,12 +136,12 @@ public: // Try to acquire all tokens in collection. virtual int tryacquire (const char *token_name, - void (*sleep_hook)(void *) = 0); + void (*sleep_hook)(void *) = 0); // Try to acquire <token_name>. virtual int renew (int requeue_position = 0, - ACE_Synch_Options &options = - ACE_Synch_Options::defaults); + ACE_Synch_Options &options = + ACE_Synch_Options::defaults); // Renews "atomically" all resources in the collection. This is // only successfull if all tokens in the collection could be // renewed. options contains the blocking semantics, timeout @@ -149,14 +150,14 @@ public: virtual int renew (const char *token_name, - int requeue_position = 0, - ACE_Synch_Options &options = - ACE_Synch_Options::defaults); + int requeue_position = 0, + ACE_Synch_Options &options = + ACE_Synch_Options::defaults); // Renew the token corresponding to <token_name>. The other // parameters are passed to <token>::renew. virtual int release (ACE_Synch_Options &options = - ACE_Synch_Options::defaults); + ACE_Synch_Options::defaults); // Releases "atomically" all resources in the collection. This is // only successfull if all tokens in the collection could be // released. options contains the blocking semantics, timeout @@ -165,8 +166,8 @@ public: virtual int release (const char *token_name, - ACE_Synch_Options &options = - ACE_Synch_Options::defaults); + ACE_Synch_Options &options = + ACE_Synch_Options::defaults); // Release the token corresponding to <token_name>. The other // parameters are passed to <token>::release. diff --git a/ace/Token_Invariants.h b/ace/Token_Invariants.h index fa0d83048a7..8dc667a9d47 100644 --- a/ace/Token_Invariants.h +++ b/ace/Token_Invariants.h @@ -23,13 +23,14 @@ #define ACE_TOKEN_INVARIANTS_H #include "ace/Synch.h" -#include "ace/Map_Manager.h" -#include "ace/Local_Tokens.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Map_Manager.h" +#include "ace/Local_Tokens.h" + class ACE_Export ACE_Mutex_Invariants { // = TITLE diff --git a/ace/Token_Manager.h b/ace/Token_Manager.h index 9fadea24b74..31a49a39453 100644 --- a/ace/Token_Manager.h +++ b/ace/Token_Manager.h @@ -18,13 +18,14 @@ #define ACE_TOKEN_MANAGER_H #include "ace/Synch.h" -#include "ace/Map_Manager.h" -#include "ace/Local_Tokens.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Map_Manager.h" +#include "ace/Local_Tokens.h" + class ACE_Local_Mutex; class ACE_Mutex_Token; diff --git a/ace/Token_Request_Reply.h b/ace/Token_Request_Reply.h index 6c46c1f970c..072842c23cf 100644 --- a/ace/Token_Request_Reply.h +++ b/ace/Token_Request_Reply.h @@ -5,37 +5,38 @@ // // = LIBRARY // ACE -// +// // = FILENAME // Token_Request_Reply.h // -// = DESCRIPTION -// Define the format used to exchange messages between the +// = DESCRIPTION +// Define the format used to exchange messages between the // ACE_Token Server and its clients. // // = AUTHOR // Douglas C. Schmidt (schmidt@cs.wustl.edu) // Tim Harrison (harrison@cs.wustl.edu) -// +// // ============================================================================ #ifndef ACE_TOKEN_REQUEST_REPLY_H #define ACE_TOKEN_REQUEST_REPLY_H #include "ace/Local_Tokens.h" -#include "ace/Time_Value.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Time_Value.h" + class ACE_Export ACE_Token_Request { // = TITLE // Message format for delivering requests to the ACE_Token Server. // // = DESCRIPTION - // This class is implemented to minimize data copying. + // This class is implemented to minimize data copying. // In particular, all marshaling is done in situ... public: enum OPERATION @@ -52,11 +53,11 @@ public: // Default constructor. ACE_Token_Request (int token_type, - int proxy_type, - ACE_UINT32 operation, - const char token_name[], - const char client_id[], - const ACE_Synch_Options &options); + int proxy_type, + ACE_UINT32 operation, + const char token_name[], + const char client_id[], + const ACE_Synch_Options &options); // token_type - MUTEX, RWLOCK // proxy_type - MUTEX, RLOCK, WLOCK (acquires mean different things) // operation - method @@ -111,7 +112,7 @@ public: // Print out the values of the message for debugging purposes. private: - // = The 5 fields in the <Transfer> struct are transmitted to the server. + // = The 5 fields in the <Transfer> struct are transmitted to the server. // The remaining 2 fields are not tranferred -- they are used only on // the server-side to simplify lookups. @@ -155,7 +156,7 @@ private: // The data portion contains the <tokenName_> followed by a ':' // followed by the <clientId_>. } transfer_; - + char *token_name_; // Pointer to the beginning of the token name in this->data_. @@ -172,7 +173,7 @@ class ACE_Export ACE_Token_Reply // Message format for delivering replies from the ACE_Token Server. // // = DESCRIPTION - // This class is implemented to minimize data copying. + // This class is implemented to minimize data copying. // In particular, all marshaling is done in situ... public: ACE_Token_Reply (void); diff --git a/ace/Trace.h b/ace/Trace.h index bce87e6abb8..e0f52b6d2df 100644 --- a/ace/Trace.h +++ b/ace/Trace.h @@ -6,13 +6,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Trace.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_TRACE_H @@ -48,10 +48,10 @@ public: // Enable the tracing facility. static void stop_tracing (void); - // Disable the tracing facility. + // Disable the tracing facility. static void set_nesting_indent (int indent); - // Change the nesting indentation level. + // Change the nesting indentation level. void dump (void) const; // Dump the state of an object. @@ -66,12 +66,12 @@ private: static int nesting_indent_; // Keeps track of how far to indent per trace call. - + static int enable_tracing_; // Is tracing enabled? // Default values. - enum + enum { DEFAULT_INDENT = 3, DEFAULT_TRACING = 1 diff --git a/ace/Typed_SV_Message.h b/ace/Typed_SV_Message.h index 37c9c9fcc74..5929b7e7a11 100644 --- a/ace/Typed_SV_Message.h +++ b/ace/Typed_SV_Message.h @@ -6,13 +6,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // Typed_SV_Message.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_TYPED_SV_MESSAGE_H @@ -21,7 +21,7 @@ #include "ace/ACE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ template <class T> @@ -32,18 +32,18 @@ class ACE_Typed_SV_Message // message queues. public: // = Initialization and termination methods. - ACE_Typed_SV_Message (long type = 0, - int length = sizeof (T), - int max_size = sizeof (T)); - ACE_Typed_SV_Message (const T &data, - long type = 0, - int length = sizeof (T), - int max_size = sizeof (T)); + ACE_Typed_SV_Message (long type = 0, + int length = sizeof (T), + int max_size = sizeof (T)); + ACE_Typed_SV_Message (const T &data, + long type = 0, + int length = sizeof (T), + int max_size = sizeof (T)); ~ACE_Typed_SV_Message (void); // = Get/set the type of the message. long type (void) const; - void type (long type); + void type (long type); // = Get/set the length of the message. int length (void) const; diff --git a/ace/Typed_SV_Message_Queue.h b/ace/Typed_SV_Message_Queue.h index d2c93f06639..cd791c1f119 100644 --- a/ace/Typed_SV_Message_Queue.h +++ b/ace/Typed_SV_Message_Queue.h @@ -6,46 +6,47 @@ // // = LIBRARY // ace -// +// // = FILENAME // Typed_SV_Message_Queue.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_TYPED_MESSAGE_QUEUE_H #define ACE_TYPED_MESSAGE_QUEUE_H #include "ace/SV_Message_Queue.h" -#include "ace/Typed_SV_Message.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Typed_SV_Message.h" + template <class T> -class ACE_Typed_SV_Message_Queue +class ACE_Typed_SV_Message_Queue { // = TITLE // Defines the header file for the C++ wrapper for message queues. -public: - enum +public: + enum { - ACE_CREATE = IPC_CREAT, - ACE_OPEN = 0, + ACE_CREATE = IPC_CREAT, + ACE_OPEN = 0, ACE_NOWAIT = IPC_NOWAIT }; // = Initialization and termination operations. ACE_Typed_SV_Message_Queue (void); - ACE_Typed_SV_Message_Queue (key_t external_id, - int create = ACE_OPEN, - int perms = ACE_DEFAULT_FILE_PERMS); - int open (key_t external_id, - int create = ACE_OPEN, - int perms = ACE_DEFAULT_FILE_PERMS); + ACE_Typed_SV_Message_Queue (key_t external_id, + int create = ACE_OPEN, + int perms = ACE_DEFAULT_FILE_PERMS); + int open (key_t external_id, + int create = ACE_OPEN, + int perms = ACE_DEFAULT_FILE_PERMS); int close (void); int remove (void); ~ACE_Typed_SV_Message_Queue (void); diff --git a/ace/UNIX_Addr.h b/ace/UNIX_Addr.h index 54c1eabc19a..b198b13da25 100644 --- a/ace/UNIX_Addr.h +++ b/ace/UNIX_Addr.h @@ -5,13 +5,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // UNIX_Addr.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_UNIX_ADDR_H @@ -20,7 +20,7 @@ #include "ace/Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) @@ -28,7 +28,7 @@ class ACE_Export ACE_UNIX_Addr : public ACE_Addr { // = TITLE - // Defines the ``UNIX domain address family'' address format. + // Defines the ``UNIX domain address family'' address format. public: // = Initialization methods. ACE_UNIX_Addr (void); @@ -70,7 +70,7 @@ public: int operator != (const ACE_UNIX_Addr &SAP) const; // Compare two addresses for inequality. - const char *get_path_name (void) const; + const char *get_path_name (void) const; // Return the path name of the underlying rendezvous point. void dump (void) const; diff --git a/ace/UPIPE_Acceptor.h b/ace/UPIPE_Acceptor.h index 342211444bc..c1fbdb318d1 100644 --- a/ace/UPIPE_Acceptor.h +++ b/ace/UPIPE_Acceptor.h @@ -6,27 +6,28 @@ // // = LIBRARY // ace -// +// // = FILENAME // UPIPE_Acceptor.h // // = AUTHOR // Gerhard Lenzer and Douglas C. Schmidt -// +// // ============================================================================ -#ifndef ACE_UPIPE_ACCEPTOR_H +#ifndef ACE_UPIPE_ACCEPTOR_H #define ACE_UPIPE_ACCEPTOR_H #include "ace/UPIPE_Stream.h" -#include "ace/Synch.h" -#include "ace/SPIPE_Acceptor.h" -#include "ace/Thread_Manager.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Synch.h" +#include "ace/SPIPE_Acceptor.h" +#include "ace/Thread_Manager.h" + #if defined (ACE_HAS_THREADS) class ACE_Export ACE_UPIPE_Acceptor : public ACE_SPIPE_Acceptor @@ -39,12 +40,12 @@ public: ACE_UPIPE_Acceptor (void); // Default constructor. - ACE_UPIPE_Acceptor (const ACE_UPIPE_Addr &local_sap, - int reuse_addr = 0); + ACE_UPIPE_Acceptor (const ACE_UPIPE_Addr &local_sap, + int reuse_addr = 0); // Initialize passive endpoint. - - int open (const ACE_UPIPE_Addr &local_sap, - int reuse_addr = 0); + + int open (const ACE_UPIPE_Addr &local_sap, + int reuse_addr = 0); // Initialize passive endpoint. ~ACE_UPIPE_Acceptor (void); @@ -55,18 +56,18 @@ public: int remove (void); // Close down and release resources and remove the underlying SPIPE - // rendezvous point. + // rendezvous point. // = Passive connection acceptance method. - int accept (ACE_UPIPE_Stream &server_stream, - ACE_UPIPE_Addr *remote_addr = 0, - ACE_Time_Value *timeout = 0, - int restart = 1, + int accept (ACE_UPIPE_Stream &server_stream, + ACE_UPIPE_Addr *remote_addr = 0, + ACE_Time_Value *timeout = 0, + int restart = 1, int reset_new_handle = 0); // Accept a new data transfer connection. A <timeout> of 0 means // block forever, a <timeout> of {0, 0} means poll. <restart> == 1 // means "restart if interrupted." - + void dump (void) const; // Dump the state of an object. @@ -77,7 +78,7 @@ private: ACE_Thread_Manager tm; // Manage threads. - ACE_Message_Block mb_; + ACE_Message_Block mb_; // To confirm connection establishment. }; diff --git a/ace/UPIPE_Addr.h b/ace/UPIPE_Addr.h index ae1162d101d..82c118480a7 100644 --- a/ace/UPIPE_Addr.h +++ b/ace/UPIPE_Addr.h @@ -6,13 +6,13 @@ // // = LIBRARY // ace -// +// // = FILENAME // UPIPE_Addr.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ #ifndef ACE_UPIPE_ADDR_H @@ -21,7 +21,7 @@ #include "ace/SPIPE_Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ typedef ACE_SPIPE_Addr ACE_UPIPE_Addr; @@ -32,7 +32,7 @@ typedef ACE_SPIPE_Addr ACE_UPIPE_Addr; class ACE_Export ACE_UPIPE_Addr { // = TITLE - // Defines the ACE "user pipe" address family address format. + // Defines the ACE "user pipe" address family address format. // // = DESCRIPTION // This class has an identical interface to the <ACE_SPIPE_Addr> diff --git a/ace/UPIPE_Connector.h b/ace/UPIPE_Connector.h index 905da37b07e..5d605801c20 100644 --- a/ace/UPIPE_Connector.h +++ b/ace/UPIPE_Connector.h @@ -5,26 +5,27 @@ // // = LIBRARY // ace -// +// // = FILENAME // UPIPE_Connector.h // // = AUTHOR // Gerhard Lenzer and Douglas C. Schmidt -// +// // ============================================================================ #ifndef ACE_UPIPE_CONNECTOR_H #define ACE_UPIPE_CONNECTOR_H #include "ace/UPIPE_Stream.h" -#include "ace/Synch.h" -#include "ace/SPIPE_Stream.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Synch.h" +#include "ace/SPIPE_Stream.h" + #if defined (ACE_HAS_THREADS) class ACE_Export ACE_UPIPE_Connector : public ACE_SPIPE @@ -37,13 +38,13 @@ public: ACE_UPIPE_Connector (void); // Default constructor. - ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream, - const ACE_UPIPE_Addr &addr, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0); + ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream, + const ACE_UPIPE_Addr &addr, + ACE_Time_Value *timeout = 0, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int reuse_addr = 0, + int flags = O_RDWR, + int perms = 0); // Actively connect and produce a <new_stream> if things go well. // The <remote_sap> is the address that we are trying to connect // with. The <timeout> is the amount of time to wait to connect. @@ -60,13 +61,13 @@ public: // The <flags> and <perms> arguments are passed down to the open() // method. - int connect (ACE_UPIPE_Stream &new_stream, - const ACE_UPIPE_Addr &addr, - ACE_Time_Value *timeout = 0, - const ACE_Addr &local_sap = ACE_Addr::sap_any, - int reuse_addr = 0, - int flags = O_RDWR, - int perms = 0); + int connect (ACE_UPIPE_Stream &new_stream, + const ACE_UPIPE_Addr &addr, + ACE_Time_Value *timeout = 0, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int reuse_addr = 0, + int flags = O_RDWR, + int perms = 0); // Actively connect and produce a <new_stream> if things go well. // The <remote_sap> is the address that we are trying to connect // with. The <timeout> is the amount of time to wait to connect. diff --git a/ace/UPIPE_Stream.h b/ace/UPIPE_Stream.h index 62b3022910a..61618371e46 100644 --- a/ace/UPIPE_Stream.h +++ b/ace/UPIPE_Stream.h @@ -5,28 +5,29 @@ // // = LIBRARY // ace -// +// // = FILENAME // UPIPE_Stream.h // // = AUTHOR // Gerhard Lenzer and Douglas C. Schmidt -// +// // ============================================================================ #ifndef ACE_UPIPE_STREAM_H #define ACE_UPIPE_STREAM_H #include "ace/Stream.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Synch.h" #include "ace/SPIPE.h" #include "ace/Message_Queue.h" #include "ace/UPIPE_Addr.h" -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - #if defined (ACE_HAS_THREADS) // Use a typedef to make life easier later on. @@ -53,38 +54,38 @@ public: // Return the underlying I/O handle. // = Send/recv ACE Message_Blocks. - int send (ACE_Message_Block *mb_p, - ACE_Time_Value *timeout = 0); + int send (ACE_Message_Block *mb_p, + ACE_Time_Value *timeout = 0); // Send a message through the message queue. Returns -1 on error, // else 0. - int recv (ACE_Message_Block *&mb_p, - ACE_Time_Value *timeout = 0); + int recv (ACE_Message_Block *&mb_p, + ACE_Time_Value *timeout = 0); // Recv a message from the message queue. Returns -1 on error, else // 0. // = Send/recv char buffers. - int send (const char *buffer, - size_t n, - ACE_Time_Value *timeout = 0); + int send (const char *buffer, + size_t n, + ACE_Time_Value *timeout = 0); // Send a buffer of <n> bytes through the message queue. Returns -1 // on error, else number of bytes sent. - int recv (char *buffer, - size_t n, - ACE_Time_Value *timeout = 0); + int recv (char *buffer, + size_t n, + ACE_Time_Value *timeout = 0); // Recv a buffer of upto <n> bytes from the message queue. Returns // -1 on error, else number of bytes read. - int send_n (const char *buffer, - size_t n, - ACE_Time_Value *timeout = 0); + int send_n (const char *buffer, + size_t n, + ACE_Time_Value *timeout = 0); // Send a buffer of exactly <n> bytes to the message queue. Returns // -1 on error, else number of bytes written (which should == n). - int recv_n (char *buffer, - size_t n, - ACE_Time_Value *timeout = 0); + int recv_n (char *buffer, + size_t n, + ACE_Time_Value *timeout = 0); // Recv a buffer of exactly <n> bytes from the message queue. // Returns -1 on error, else the number of bytes read. @@ -105,7 +106,7 @@ private: // To hold the last ACE_Message_Block read out of the stream. Thus // allowing subsequent reads from one ACE_Message_Block - size_t remaining_; + size_t remaining_; // Holds the number of bytes that are still available in mb_last_. ACE_UPIPE_Addr remote_addr_; @@ -125,7 +126,7 @@ private: #endif /* ACE_MT_SAFE */ }; -#if defined (__ACE_INLINE__) +#if defined (__ACE_INLINE__) #include "ace/UPIPE_Stream.i" #endif /* __ACE_INLINE__ */ diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h index cdf95dff8a0..7bb17b85eb2 100644 --- a/ace/WFMO_Reactor.h +++ b/ace/WFMO_Reactor.h @@ -18,16 +18,17 @@ #define ACE_WFMO_REACTOR_H #include "ace/Signal.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Timer_Queue.h" #include "ace/Event_Handler.h" #include "ace/Synch.h" #include "ace/Reactor_Impl.h" #include "ace/Message_Queue.h" -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - // Forward decl. class ACE_WFMO_Reactor; class ACE_Handle_Set; @@ -102,10 +103,10 @@ public: // Reset the state of the structure void set (int io_entry, - ACE_Event_Handler *event_handler, - ACE_HANDLE io_handle, - long network_events, - int delete_event, + ACE_Event_Handler *event_handler, + ACE_HANDLE io_handle, + long network_events, + int delete_event, int delete_entry, ACE_Reactor_Mask close_masks); // Set the structure to these new values @@ -135,17 +136,17 @@ public: // Reset the state of the structure void set (int io_entry, - ACE_Event_Handler *event_handler, - ACE_HANDLE io_handle, - long network_events, - int delete_event, - int delete_entry = 0, - ACE_Reactor_Mask close_masks = ACE_Event_Handler::NULL_MASK, + ACE_Event_Handler *event_handler, + ACE_HANDLE io_handle, + long network_events, + int delete_event, + int delete_entry = 0, + ACE_Reactor_Mask close_masks = ACE_Event_Handler::NULL_MASK, int suspend_entry = 0); // Set the structure to these new values void set (Common_Info &common_info, - int suspend_entry = 0); + int suspend_entry = 0); // Set the structure to these new values void dump (ACE_HANDLE event_handle) const; @@ -173,19 +174,19 @@ public: // Reset the state of the structure void set (ACE_HANDLE event_handle, - int io_entry, - ACE_Event_Handler *event_handler, - ACE_HANDLE io_handle, - long network_events, - int delete_event, + int io_entry, + ACE_Event_Handler *event_handler, + ACE_HANDLE io_handle, + long network_events, + int delete_event, int delete_entry = 0, ACE_Reactor_Mask close_masks = ACE_Event_Handler::NULL_MASK, int suspend_entry = 0); // Set the structure to these new values void set (ACE_HANDLE event_handle, - Common_Info &common_info, - int suspend_entry = 0); + Common_Info &common_info, + int suspend_entry = 0); // Set the structure to these new values void dump (void) const; @@ -213,19 +214,19 @@ public: // Reset the state of the structure void set (ACE_HANDLE event_handle, - int io_entry, - ACE_Event_Handler *event_handler, - ACE_HANDLE io_handle, - long network_events, - int delete_event, - int delete_entry = 0, - ACE_Reactor_Mask close_masks = 0, - int resume_entry = 0); + int io_entry, + ACE_Event_Handler *event_handler, + ACE_HANDLE io_handle, + long network_events, + int delete_event, + int delete_entry = 0, + ACE_Reactor_Mask close_masks = 0, + int resume_entry = 0); // Set the structure to these new values void set (ACE_HANDLE event_handle, - Common_Info &common_info, - int resume_entry = 0); + Common_Info &common_info, + int resume_entry = 0); // Set the structure to these new values void dump (void) const; @@ -251,11 +252,11 @@ public: // the simple event entry. int bind_i (int io_entry, - ACE_Event_Handler *event_handler, - long network_events, - ACE_HANDLE io_handle, - ACE_HANDLE event_handle, - int delete_event); + ACE_Event_Handler *event_handler, + long network_events, + ACE_HANDLE io_handle, + ACE_HANDLE event_handle, + int delete_event); // Insert I/O <Event_Handler> entry into the system. This method // assumes that the lock are head *before* this method is invoked. @@ -295,26 +296,26 @@ public: // Check to see if <index> has been scheduled for deletion int add_network_events_i (ACE_Reactor_Mask mask, - ACE_HANDLE io_handle, - long &new_mask, - ACE_HANDLE &event_handle, - int &delete_event); + ACE_HANDLE io_handle, + long &new_mask, + ACE_HANDLE &event_handle, + int &delete_event); // This method is used to calculate the network mask after a // register request to <WFMO_Reactor>. Note that because the // <Event_Handler> may already be in the handler repository, we may // have to find the old event and the old network events void remove_network_events_i (long &existing_masks, - ACE_Reactor_Mask to_be_removed_masks); + ACE_Reactor_Mask to_be_removed_masks); // This method is used to change the network mask left (if any) // after a remove request to <WFMO_Reactor> int suspend_handler_i (ACE_HANDLE handle, - int &changes_required); + int &changes_required); // Temporarily suspend entry int resume_handler_i (ACE_HANDLE handle, - int &changes_required); + int &changes_required); // Resume suspended entry int make_changes_in_current_infos (void); @@ -328,11 +329,11 @@ public: // current_suspended_info_ from to_be_added_info_ int remove_handler_i (size_t index, - ACE_Reactor_Mask mask); + ACE_Reactor_Mask mask); // Removes the <ACE_Event_Handler> at <index> from the table. int remove_suspended_handler_i (size_t index, - ACE_Reactor_Mask mask); + ACE_Reactor_Mask mask); // Removes the <ACE_Event_Handler> at <index> from the table. int remove_to_be_added_handler_i (size_t index, @@ -522,22 +523,22 @@ public: // = Initialization and termination methods. ACE_WFMO_Reactor (ACE_Sig_Handler * = 0, - ACE_Timer_Queue * = 0); + ACE_Timer_Queue * = 0); // Initialize <ACE_WFMO_Reactor> with the default size. ACE_WFMO_Reactor (size_t size, - int unused = 0, - ACE_Sig_Handler * = 0, - ACE_Timer_Queue * = 0); + int unused = 0, + ACE_Sig_Handler * = 0, + ACE_Timer_Queue * = 0); // Initialize <ACE_WFMO_Reactor> with size <size>. <size> should // not exceed <ACE_WFMO_Reactor::DEFAULT_SIZE>. Two slots will be // added to the <size> parameter which will store handles used for // internal management purposes. virtual int open (size_t size = ACE_WFMO_Reactor::DEFAULT_SIZE, - int restart = 0, - ACE_Sig_Handler * = 0, - ACE_Timer_Queue * = 0, + int restart = 0, + ACE_Sig_Handler * = 0, + ACE_Timer_Queue * = 0, int disable_notify_pipe = 0, ACE_Reactor_Notify * = 0); // Initialize <ACE_WFMO_Reactor> with size <size>. <size> should @@ -600,7 +601,7 @@ public: // = Register and remove Handlers. virtual int register_handler (ACE_Event_Handler *event_handler, - ACE_HANDLE event_handle = ACE_INVALID_HANDLE); + ACE_HANDLE event_handle = ACE_INVALID_HANDLE); // Register an <ACE_Event_Handler> <event_handler>. Since no Event // Mask is passed through this interface, it is assumed that the // <handle> being passed in is an event handle and when the event @@ -610,9 +611,9 @@ public: // <event_handler> to extract the underlying event handle. virtual int register_handler (ACE_HANDLE event_handle, - ACE_HANDLE io_handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); + ACE_HANDLE io_handle, + ACE_Event_Handler *event_handler, + ACE_Reactor_Mask mask); // Register an <ACE_Event_Handler> <event_handle>. <mask> specifies // the network events that the <event_handler> is interested in. If // <io_handle> == <ACE_INVALID_HANDLE> the <ACE_WFMO_Reactor> will @@ -624,42 +625,42 @@ public: // the <Event_Handler> virtual int register_handler (ACE_HANDLE io_handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); + ACE_Event_Handler *event_handler, + ACE_Reactor_Mask mask); // This is a simple version of the above <register_handler> method // where the I/O handle is passed in and the event handle will // always be created by <WFMO_Reactor> virtual int register_handler (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); + ACE_Reactor_Mask mask); // This is a simple version of the above <register_handler> method // where the I/O handle will always come from <get_handle> on the // <Event_Handler> and the event handle will always be created by // <WFMO_Reactor> virtual int register_handler (const ACE_Handle_Set &handles, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); + ACE_Event_Handler *event_handler, + ACE_Reactor_Mask mask); // Register <event_handler> with all the <handles> in the // <Handle_Set>. virtual int register_handler (int signum, - ACE_Event_Handler *new_sh, - ACE_Sig_Action *new_disp = 0, - ACE_Event_Handler **old_sh = 0, - ACE_Sig_Action *old_disp = 0); + ACE_Event_Handler *new_sh, + ACE_Sig_Action *new_disp = 0, + ACE_Event_Handler **old_sh = 0, + ACE_Sig_Action *old_disp = 0); // Register <new_sh> to handle the signal <signum> using the // <new_disp>. Returns the <old_sh> that was previously registered // (if any), along with the <old_disp> of the signal handler. virtual int register_handler (const ACE_Sig_Set &sigset, - ACE_Event_Handler *new_sh, - ACE_Sig_Action *new_disp = 0); + ACE_Event_Handler *new_sh, + ACE_Sig_Action *new_disp = 0); // Registers <new_sh> to handle a set of signals <sigset> using the // <new_disp>. virtual int remove_handler (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); + ACE_Reactor_Mask mask); // Removes <event_handler> from the <ACE_WFMO_Reactor>. Note that // the <ACE_WFMO_Reactor> will call the <get_handle> method of // <event_handler> to extract the underlying handle. If <mask> == @@ -668,7 +669,7 @@ public: // either be the <event_handle> or the <io_handle> virtual int remove_handler (ACE_HANDLE handle, - ACE_Reactor_Mask mask); + ACE_Reactor_Mask mask); // Removes <handle> from the <ACE_WFMO_Reactor>. If <mask> == // <ACE_Event_Handler::DONT_CALL> then the <handle_close> method of // the <event_handler> is not invoked. Note that the <handle> can @@ -682,15 +683,15 @@ public: // <WFMO_Reactor> virtual int remove_handler (const ACE_Handle_Set &handle_set, - ACE_Reactor_Mask); + ACE_Reactor_Mask); // Removes all the <mask> bindings for handles in the <handle_set> // bind of <Event_Handler>. If there are no more bindings for any // of these handles then they are removed from WFMO_Reactor. virtual int remove_handler (int signum, - ACE_Sig_Action *new_disp, - ACE_Sig_Action *old_disp = 0, - int sigkey = -1); + ACE_Sig_Action *new_disp, + ACE_Sig_Action *old_disp = 0, + int sigkey = -1); // Remove the ACE_Event_Handler currently associated with <signum>. // <sigkey> is ignored in this implementation since there is only // one instance of a signal handler. Install the new disposition @@ -737,9 +738,9 @@ public: // Timer management. virtual long schedule_timer (ACE_Event_Handler *event_handler, - const void *arg, - const ACE_Time_Value &delta, - const ACE_Time_Value &interval = ACE_Time_Value::zero); + const void *arg, + const ACE_Time_Value &delta, + const ACE_Time_Value &interval = ACE_Time_Value::zero); // Schedule an <event_handler> that will expire after <delay> amount // of time. If it expires then <arg> is passed in as the value to // the <event_handler>'s <handle_timeout> callback method. If @@ -755,13 +756,13 @@ public: // valid <timer_id>. virtual int cancel_timer (ACE_Event_Handler *event_handler, - int dont_call_handle_close = 1); + int dont_call_handle_close = 1); // Cancel all Event_Handlers that match the address of // <event_handler>. Returns number of handler's cancelled. virtual int cancel_timer (long timer_id, - const void **arg = 0, - int dont_call_handle_close = 1); + const void **arg = 0, + int dont_call_handle_close = 1); // Cancel the single Event_Handler that matches the <timer_id> value // (which was returned from the schedule method). If arg is // non-NULL then it will be set to point to the ``magic cookie'' @@ -773,31 +774,31 @@ public: // = High-level Event_Handler scheduling operations virtual int schedule_wakeup (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask masks_to_be_added); + ACE_Reactor_Mask masks_to_be_added); // Add <masks_to_be_added> to the <event_handler>'s entry in // WFMO_Reactor. <event_handler> must already have been registered // with WFMO_Reactor. virtual int schedule_wakeup (ACE_HANDLE handle, - ACE_Reactor_Mask masks_to_be_added); + ACE_Reactor_Mask masks_to_be_added); // Add <masks_to_be_added> to the <handle>'s entry in WFMO_Reactor. // The Event_Handler associated with <handle> must already have been // registered with WFMO_Reactor. virtual int cancel_wakeup (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); + ACE_Reactor_Mask mask); // This method is identical to the <remove_handler> method. virtual int cancel_wakeup (ACE_HANDLE handle, - ACE_Reactor_Mask mask); + ACE_Reactor_Mask mask); // This method is identical to the <remove_handler> method. // = Notification methods. virtual int notify (ACE_Event_Handler * = 0, - ACE_Reactor_Mask = ACE_Event_Handler::EXCEPT_MASK, - ACE_Time_Value * = 0); + ACE_Reactor_Mask = ACE_Event_Handler::EXCEPT_MASK, + ACE_Time_Value * = 0); // Wakeup one <ACE_WFMO_Reactor> thread if it is currently blocked // in <WaitForMultipleObjects>. The <ACE_Time_Value> indicates how // long to blocking trying to notify the <WFMO_Reactor>. If @@ -824,12 +825,12 @@ public: // <ACE_Message_Queue::dequeue> loop. virtual int handler (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - ACE_Event_Handler **event_handler = 0); + ACE_Reactor_Mask mask, + ACE_Event_Handler **event_handler = 0); // Not implemented virtual int handler (int signum, - ACE_Event_Handler ** = 0); + ACE_Event_Handler ** = 0); // Check to see if <signum> is associated with a valid Event_Handler // bound to a signal. Return the <event_handler> associated with // this <handler> if <event_handler> != 0. @@ -866,25 +867,25 @@ public: // = Low-level wait_set mask manipulation methods. virtual int mask_ops (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask, - int ops); + ACE_Reactor_Mask mask, + int ops); // Not implemented virtual int mask_ops (ACE_HANDLE handle, - ACE_Reactor_Mask mask, - int ops); + ACE_Reactor_Mask mask, + int ops); // Not implemented // = Low-level ready_set mask manipulation methods. virtual int ready_ops (ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask, - int ops); + ACE_Reactor_Mask mask, + int ops); // Not implemented virtual int ready_ops (ACE_HANDLE handle, - ACE_Reactor_Mask, - int ops); + ACE_Reactor_Mask, + int ops); // Not implemented ACE_ALLOC_HOOK_DECLARE; @@ -895,24 +896,24 @@ public: protected: virtual int schedule_wakeup_i (ACE_HANDLE handle, - ACE_Reactor_Mask masks_to_be_added); + ACE_Reactor_Mask masks_to_be_added); // Scheduling workhorse virtual int register_handler_i (ACE_HANDLE event_handle, - ACE_HANDLE io_handle, - ACE_Event_Handler *event_handler, - ACE_Reactor_Mask mask); + ACE_HANDLE io_handle, + ACE_Event_Handler *event_handler, + ACE_Reactor_Mask mask); // Registration workhorse virtual int event_handling (ACE_Time_Value *max_wait_time = 0, - int alertable = 0); + int alertable = 0); // Event handling workhorse virtual ACE_thread_t owner_i (void); // Return the ID of the "owner" thread. Does not do any locking. virtual int ok_to_wait (ACE_Time_Value *max_wait_time, - int alertable); + int alertable); // Check to see if it is ok to enter ::WaitForMultipleObjects(). virtual int wait_for_multiple_events (int timeout, @@ -944,12 +945,12 @@ protected: // handler was removed. virtual int simple_dispatch_handler (int index, - ACE_HANDLE event_handle); + ACE_HANDLE event_handle); // Dispatches a single handler. Returns 0 on success, -1 if the // handler was removed. virtual int complex_dispatch_handler (int index, - ACE_HANDLE event_handle); + ACE_HANDLE event_handle); // Dispatches a single handler. Returns 0 on success, -1 if the // handler was removed. @@ -1087,12 +1088,12 @@ typedef struct _WSANETWORKEVENTS } WSANETWORKEVENTS, FAR * LPWSANETWORKEVENTS; int WSAEventSelect (SOCKET s, - WSAEVENT hEventObject, - long lNetworkEvents); + WSAEVENT hEventObject, + long lNetworkEvents); int WSAEnumNetworkEvents (SOCKET s, - WSAEVENT hEventObject, - LPWSANETWORKEVENTS lpNetworkEvents); + WSAEVENT hEventObject, + LPWSANETWORKEVENTS lpNetworkEvents); #endif /* !defined ACE_HAS_WINSOCK2 */ diff --git a/ace/XtReactor.h b/ace/XtReactor.h index 7cf4f9fe0dd..b2f86dc5d1f 100644 --- a/ace/XtReactor.h +++ b/ace/XtReactor.h @@ -22,7 +22,7 @@ #include "ace/Select_Reactor.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (ACE_HAS_XT) @@ -55,9 +55,9 @@ class ACE_Export ACE_XtReactor : public ACE_Select_Reactor public: // = Initialization and termination methods. ACE_XtReactor (XtAppContext context = 0, - size_t size = DEFAULT_SIZE, - int restart = 0, - ACE_Sig_Handler * = 0); + size_t size = DEFAULT_SIZE, + int restart = 0, + ACE_Sig_Handler * = 0); virtual ~ACE_XtReactor (void); XtAppContext context (void) const; @@ -65,31 +65,31 @@ public: // = Timer operations. virtual long schedule_timer (ACE_Event_Handler *handler, - const void *arg, - const ACE_Time_Value &delta_time, - const ACE_Time_Value &interval); + const void *arg, + const ACE_Time_Value &delta_time, + const ACE_Time_Value &interval); virtual int cancel_timer (ACE_Event_Handler *handler, - int dont_call_handle_close = 1); + int dont_call_handle_close = 1); virtual int cancel_timer (long timer_id, - const void **arg = 0, - int dont_call_handle_close = 1); + const void **arg = 0, + int dont_call_handle_close = 1); protected: // = Register timers/handles with Xt. virtual int register_handler_i (ACE_HANDLE handle, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask); + ACE_Event_Handler *handler, + ACE_Reactor_Mask mask); // Register a single <handler>. virtual int register_handler_i (const ACE_Handle_Set &handles, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask); + ACE_Event_Handler *handler, + ACE_Reactor_Mask mask); // Register a set of <handlers>. virtual int remove_handler_i (ACE_HANDLE handle, - ACE_Reactor_Mask mask); + ACE_Reactor_Mask mask); // Remove the <handler> associated with this <handle>. virtual int remove_handler_i (const ACE_Handle_Set &handles, @@ -97,12 +97,12 @@ protected: // Remove a set of <handles>. virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &, - ACE_Time_Value *); + ACE_Time_Value *); // Wait for events to occur. virtual int XtWaitForMultipleEvents (int, - ACE_Select_Reactor_Handle_Set &, - ACE_Time_Value *); + ACE_Select_Reactor_Handle_Set &, + ACE_Time_Value *); //Wait for Xt events to occur. XtAppContext context_; diff --git a/ace/inc_user_config.h b/ace/inc_user_config.h index dcc36f3e6d2..e2aee93274f 100644 --- a/ace/inc_user_config.h +++ b/ace/inc_user_config.h @@ -10,7 +10,7 @@ #include "ace/config.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ // By default, DO include RCS Id strings in object code. diff --git a/ace/iosfwd.h b/ace/iosfwd.h index 4d52b28e4ba..a1e8054affa 100644 --- a/ace/iosfwd.h +++ b/ace/iosfwd.h @@ -30,7 +30,7 @@ #include "ace/inc_user_config.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) diff --git a/ace/streams.h b/ace/streams.h index da1fab22001..56130bec6f7 100644 --- a/ace/streams.h +++ b/ace/streams.h @@ -27,7 +27,7 @@ #include "ace/inc_user_config.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once +# pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) diff --git a/ace/ws2tcpip.h b/ace/ws2tcpip.h index 45ecd2e6bf5..796047f77c7 100644 --- a/ace/ws2tcpip.h +++ b/ace/ws2tcpip.h @@ -1,16 +1,16 @@ -/* -** WS2TCPIP.H - WinSock2 Extension for TCP/IP protocols +/* +** WS2TCPIP.H - WinSock2 Extension for TCP/IP protocols ** -** This file contains TCP/IP specific information for use -** by WinSock2 compatible applications. +** This file contains TCP/IP specific information for use +** by WinSock2 compatible applications. ** -** To provide the backward compatibility, all the TCP/IP -** specific definitions that were included in the WINSOCK.H -** file are now included in WINSOCK2.H file. WS2TCPIP.H -** file includes only the definitions introduced in the -** "WinSock 2 Protocol-Specific Annex" document. +** To provide the backward compatibility, all the TCP/IP +** specific definitions that were included in the WINSOCK.H +** file are now included in WINSOCK2.H file. WS2TCPIP.H +** file includes only the definitions introduced in the +** "WinSock 2 Protocol-Specific Annex" document. ** -** Rev 0.3 Nov 13, 1995 +** Rev 0.3 Nov 13, 1995 */ #ifndef _WS2TCPIP_H_ @@ -20,67 +20,67 @@ typedef struct _INTERFACE_INFO { - u_long iiFlags; /* Interface flags */ - struct sockaddr iiAddress; /* Interface address */ - struct sockaddr iiBroadcastAddress; /* Broadcast address */ - struct sockaddr iiNetmask; /* Network mask */ + u_long iiFlags; /* Interface flags */ + struct sockaddr iiAddress; /* Interface address */ + struct sockaddr iiBroadcastAddress; /* Broadcast address */ + struct sockaddr iiNetmask; /* Network mask */ } INTERFACE_INFO; -/* Possible flags for the iiFlags - bitmask */ +/* Possible flags for the iiFlags - bitmask */ -#define IFF_UP 0x00000001 /* Interface is up */ -#define IFF_BROADCAST 0x00000002 /* Broadcast is supported */ -#define IFF_LOOPBACK 0x00000004 /* this is loopback interface */ -#define IFF_POINTTOPOINT 0x00000008 /*this is point-to-point +#define IFF_UP 0x00000001 /* Interface is up */ +#define IFF_BROADCAST 0x00000002 /* Broadcast is supported */ +#define IFF_LOOPBACK 0x00000004 /* this is loopback interface */ +#define IFF_POINTTOPOINT 0x00000008 /*this is point-to-point interface*/ -#define IFF_MULTICAST 0x00000010 /* multicast is supported */ +#define IFF_MULTICAST 0x00000010 /* multicast is supported */ /* Argument structure for IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP */ struct ip_mreq { - struct in_addr imr_multiaddr; /* IP multicast address of group */ - struct in_addr imr_interface; /* local IP address of interface */ + struct in_addr imr_multiaddr; /* IP multicast address of group */ + struct in_addr imr_interface; /* local IP address of interface */ }; /* TCP/IP specific Ioctl codes */ -#define SIO_GET_INTERFACE_LIST <TBD> +#define SIO_GET_INTERFACE_LIST <TBD> /* Option to use with [gs]etsockopt at the IPPROTO_IP level */ -#define IP_OPTIONS 1 /* set/get IP options */ -#define IP_HDRINCL 2 /* header is included with data */ -#define IP_TOS 3 /* IP type of service and preced*/ -#define IP_TTL 4 /* IP time to live */ -#define IP_MULTICAST_IF 9 /* set/get IP multicast i/f */ -#define IP_MULTICAST_TTL 10 /* set/get IP multicast ttl */ -#define IP_MULTICAST_LOOP 11 /*set/get IP multicast loopback */ -#define IP_ADD_MEMBERSHIP 12 /* add an IP group membership */ -#define IP_DROP_MEMBERSHIP 13/* drop an IP group membership */ +#define IP_OPTIONS 1 /* set/get IP options */ +#define IP_HDRINCL 2 /* header is included with data */ +#define IP_TOS 3 /* IP type of service and preced*/ +#define IP_TTL 4 /* IP time to live */ +#define IP_MULTICAST_IF 9 /* set/get IP multicast i/f */ +#define IP_MULTICAST_TTL 10 /* set/get IP multicast ttl */ +#define IP_MULTICAST_LOOP 11 /*set/get IP multicast loopback */ +#define IP_ADD_MEMBERSHIP 12 /* add an IP group membership */ +#define IP_DROP_MEMBERSHIP 13/* drop an IP group membership */ /* Option to use with [gs]etsockopt at the IPPROTO_UDP level */ -#define UDP_NOCHECKSUM 1 +#define UDP_NOCHECKSUM 1 /* Option to use with [gs]etsockopt at the IPPROTO_TCP level */ -#define TCP_EXPEDITED_1122 0x0002 +#define TCP_EXPEDITED_1122 0x0002 /* IPv6 definitions */ struct in_addr6 { - u_char s6_addr[16]; /* IPv6 address */ + u_char s6_addr[16]; /* IPv6 address */ }; struct sockaddr_in6 { - short sin6_family; /* AF_INET6 */ - u_short sin6_port; /* Transport level port numb + short sin6_family; /* AF_INET6 */ + u_short sin6_port; /* Transport level port numb er */ - u_long sin6_flowinfo; /* IPv6 flow information */ - struct in_addr6 sin6_addr; /* IPv6 address */ + u_long sin6_flowinfo; /* IPv6 flow information */ + struct in_addr6 sin6_addr; /* IPv6 address */ }; -#endif /* _WS2TCPIP_H_ */ +#endif /* _WS2TCPIP_H_ */ |