diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-09-16 09:35:44 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-09-16 09:35:44 +0000 |
| commit | ccd8d0fde164448b6258d9de3574e52374edc829 (patch) | |
| tree | c955d352994cbd1cd500768dfe64f31e35ecfd9a /ACE | |
| parent | 7c4c934daf46588a0afbc2cf974fdc8946d49815 (diff) | |
| download | ATCD-ccd8d0fde164448b6258d9de3574e52374edc829.tar.gz | |
Diffstat (limited to 'ACE')
109 files changed, 438 insertions, 452 deletions
diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index 7120f9928b4..4171ca893d4 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -2681,7 +2681,7 @@ ACE::handle_timed_complete (ACE_HANDLE h, int ACE::handle_timed_accept (ACE_HANDLE listener, ACE_Time_Value *timeout, - int restart) + bool restart) { ACE_TRACE ("ACE::handle_timed_accept"); // Make sure we don't bomb out on erroneous values. diff --git a/ACE/ace/ACE.h b/ACE/ace/ACE.h index e87d84c956c..1708cb6a9e1 100644 --- a/ACE/ace/ACE.h +++ b/ACE/ace/ACE.h @@ -354,7 +354,7 @@ namespace ACE */ extern ACE_Export int handle_timed_accept (ACE_HANDLE listener, ACE_Time_Value *timeout, - int restart); + bool restart); /** * Wait up to @a timeout amount of time to complete an actively diff --git a/ACE/ace/ATM_Acceptor.cpp b/ACE/ace/ATM_Acceptor.cpp index 5a78f1c32c8..41112db9de5 100644 --- a/ACE/ace/ATM_Acceptor.cpp +++ b/ACE/ace/ATM_Acceptor.cpp @@ -236,8 +236,8 @@ int ACE_ATM_Acceptor::accept (ACE_ATM_Stream &new_sap, ACE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle, + bool restart, + bool reset_new_handle, ACE_ATM_Params params, ACE_ATM_QoS qos) { diff --git a/ACE/ace/ATM_Acceptor.h b/ACE/ace/ATM_Acceptor.h index 5ed236099e3..d99dba62923 100644 --- a/ACE/ace/ATM_Acceptor.h +++ b/ACE/ace/ATM_Acceptor.h @@ -88,8 +88,8 @@ public: int accept (ACE_ATM_Stream &new_sap, ACE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0, + bool restart = true, + bool reset_new_handle = false, ACE_ATM_Params params = ACE_ATM_Params(), ACE_ATM_QoS qos = ACE_ATM_QoS()); diff --git a/ACE/ace/ATM_Connector.h b/ACE/ace/ATM_Connector.h index 7e820ae765e..4f0bead3383 100644 --- a/ACE/ace/ATM_Connector.h +++ b/ACE/ace/ATM_Connector.h @@ -136,7 +136,7 @@ public: ACE_ATM_QoS &qos); /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); + bool reset_new_handle (ACE_HANDLE handle); // = Meta-type info typedef ACE_ATM_Addr PEER_ADDR; diff --git a/ACE/ace/ATM_Connector.inl b/ACE/ace/ATM_Connector.inl index b9372ccb34d..ef0773b8930 100644 --- a/ACE/ace/ATM_Connector.inl +++ b/ACE/ace/ATM_Connector.inl @@ -114,7 +114,7 @@ ACE_ATM_Connector::add_leaf (ACE_ATM_Stream ¤t_stream, } ACE_INLINE -int +bool ACE_ATM_Connector::reset_new_handle (ACE_HANDLE handle) { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) @@ -124,7 +124,7 @@ ACE_ATM_Connector::reset_new_handle (ACE_HANDLE handle) 0); #else /* !defined ACE_HAS_WINSOCK2 */ ACE_UNUSED_ARG (handle); - return 0; + return false; #endif /* ACE_WIN32 */ } diff --git a/ACE/ace/Acceptor.cpp b/ACE/ace/Acceptor.cpp index 1b780f24ef1..1b708cbe7cd 100644 --- a/ACE/ace/Acceptor.cpp +++ b/ACE/ace/Acceptor.cpp @@ -287,12 +287,12 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler // created handle. This is because the newly created handle will // inherit the properties of the listen handle, including its event // associations. - int reset_new_handle = this->reactor ()->uses_event_associations (); + bool const reset_new_handle = this->reactor ()->uses_event_associations (); if (this->acceptor ().accept (svc_handler->peer (), // stream 0, // remote address 0, // timeout - 1, // restart + true, // restart reset_new_handle // reset new handler ) == -1) { @@ -984,7 +984,7 @@ template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::register_handler (SVC_HANDLER *svc_handler, const ACE_Synch_Options &synch_options, - int restart) + bool restart) { ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::register_handler"); // Can't do this if we don't have a Reactor. @@ -1037,8 +1037,8 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::shared_accept (SVC_HANDLER *svc_handler, ACE_PEER_ACCEPTOR_ADDR *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) + bool restart, + bool reset_new_handle) { ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::shared_accept"); if (svc_handler == 0) @@ -1074,8 +1074,8 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept (SVC_HANDLER *svc_handler, ACE_PEER_ACCEPTOR_ADDR *remote_addr, const ACE_Synch_Options &synch_options, - int restart, - int reset_new_handle) + bool restart, + bool reset_new_handle) { ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept"); // Note that if timeout == ACE_Time_Value (x, y) where (x > 0 || y > @@ -1128,7 +1128,7 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE // created handle. This is because the newly created handle will // inherit the properties of the listen handle, including its event // associations. - int reset_new_handle = this->reactor ()->uses_event_associations (); + bool const reset_new_handle = this->reactor ()->uses_event_associations (); // There is a use-case whereby this object will be gone upon return // from shared_accept - if the Svc_Handler deletes this Oneshot_Acceptor diff --git a/ACE/ace/Acceptor.h b/ACE/ace/Acceptor.h index 3212696cddc..6a024bca6ff 100644 --- a/ACE/ace/Acceptor.h +++ b/ACE/ace/Acceptor.h @@ -568,8 +568,8 @@ public: 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, - int reset_new_handle = 0); + bool restart = true, + bool reset_new_handle = false); /// Cancel a oneshot acceptor that was started asynchronously. virtual int cancel (void); @@ -605,8 +605,8 @@ protected: int shared_accept (SVC_HANDLER *svc_handler, ACE_PEER_ACCEPTOR_ADDR *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle); + bool restart, + bool reset_new_handle); // = Demultiplexing hooks. /// Returns the listening acceptor's {ACE_HANDLE}. @@ -654,13 +654,13 @@ private: */ int register_handler (SVC_HANDLER *svc_handler, const ACE_Synch_Options &options, - int restart); + bool restart); /// Hold the svc_handler_ across asynchrony boundaries. SVC_HANDLER *svc_handler_; /// Hold the restart flag across asynchrony boundaries. - int restart_; + bool restart_; /// Factory that establishes connections passively. ACE_PEER_ACCEPTOR peer_acceptor_; diff --git a/ACE/ace/Bound_Ptr.h b/ACE/ace/Bound_Ptr.h index a310e3b8a56..6e1f07838b9 100644 --- a/ACE/ace/Bound_Ptr.h +++ b/ACE/ace/Bound_Ptr.h @@ -223,7 +223,7 @@ public: /// Allows us to check for NULL on all ACE_Strong_Bound_Ptr /// objects. - int null (void) const; + bool null (void) const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -359,7 +359,7 @@ public: long remove_ref (void); /// Allows us to check for NULL on all ACE_Weak_Bound_Ptr objects. - int null (void) const; + bool null (void) const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Bound_Ptr.inl b/ACE/ace/Bound_Ptr.inl index 52c100e16b0..5f5af57d4e5 100644 --- a/ACE/ace/Bound_Ptr.inl +++ b/ACE/ace/Bound_Ptr.inl @@ -288,7 +288,7 @@ ACE_Strong_Bound_Ptr<X, ACE_LOCK>::get (void) const return this->ptr_; } -template <class X, class ACE_LOCK> inline int +template <class X, class ACE_LOCK> inline bool ACE_Strong_Bound_Ptr<X, ACE_LOCK>::null (void) const { return this->ptr_ == 0; @@ -453,13 +453,13 @@ ACE_Weak_Bound_Ptr<X, ACE_LOCK>::unsafe_get (void) const return this->ptr_; } -template <class X, class ACE_LOCK> inline int +template <class X, class ACE_LOCK> inline bool ACE_Weak_Bound_Ptr<X, ACE_LOCK>::null (void) const { // A weak pointer must behave as though it is automatically set to null // if the underlying object has been deleted. if (COUNTER::object_was_deleted (this->counter_)) - return 1; + return true; return this->ptr_ == 0; } diff --git a/ACE/ace/Connector.cpp b/ACE/ace/Connector.cpp index 121e30884b0..842bc9599f4 100644 --- a/ACE/ace/Connector.cpp +++ b/ACE/ace/Connector.cpp @@ -593,7 +593,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::initialize_svc_handler { // Try to find out if the reactor uses event associations for the // handles it waits on. If so we need to reset it. - int reset_new_handle = + bool reset_new_handle = this->reactor ()->uses_event_associations (); if (reset_new_handle) diff --git a/ACE/ace/DEV_Connector.h b/ACE/ace/DEV_Connector.h index 9e001c412f4..66fdaa84059 100644 --- a/ACE/ace/DEV_Connector.h +++ b/ACE/ace/DEV_Connector.h @@ -87,7 +87,7 @@ public: int perms = 0); /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); + bool reset_new_handle (ACE_HANDLE handle); /// Dump the state of an object. void dump (void) const; diff --git a/ACE/ace/DEV_Connector.inl b/ACE/ace/DEV_Connector.inl index 314952699de..9ece5f47f13 100644 --- a/ACE/ace/DEV_Connector.inl +++ b/ACE/ace/DEV_Connector.inl @@ -23,12 +23,11 @@ ACE_DEV_Connector::ACE_DEV_Connector (ACE_DEV_IO &new_io, remote_sap.get_path_name (), ACE_TEXT ("ACE_DEV_IO"))); } -ACE_INLINE int -ACE_DEV_Connector::reset_new_handle (ACE_HANDLE handle) +ACE_INLINE bool +ACE_DEV_Connector::reset_new_handle (ACE_HANDLE) { - ACE_UNUSED_ARG (handle); // Nothing to do here since the handle is not a socket - return 0; + return false; } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp index 526a994c2c1..808dca429a8 100644 --- a/ACE/ace/Dev_Poll_Reactor.cpp +++ b/ACE/ace/Dev_Poll_Reactor.cpp @@ -693,7 +693,7 @@ ACE_Dev_Poll_Reactor::~ACE_Dev_Poll_Reactor (void) int ACE_Dev_Poll_Reactor::open (size_t size, - int restart, + bool restart, ACE_Sig_Handler *sh, ACE_Timer_Queue *tq, int disable_notify_pipe, @@ -1879,12 +1879,12 @@ ACE_Dev_Poll_Reactor::resumable_handler (void) return 0; } -int +bool ACE_Dev_Poll_Reactor::uses_event_associations (void) { // Since the Dev_Poll_Reactor does not do any event associations, - // this method always return zero. - return 0; + // this method always return false. + return false; } long diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h index b6af574ae3e..75b5183b11b 100644 --- a/ACE/ace/Dev_Poll_Reactor.h +++ b/ACE/ace/Dev_Poll_Reactor.h @@ -471,7 +471,7 @@ public: * access violations. */ ACE_Dev_Poll_Reactor (size_t size, - int restart = 0, + bool restart = false, ACE_Sig_Handler * = 0, ACE_Timer_Queue * = 0, int disable_notify_pipe = 0, @@ -484,7 +484,7 @@ public: /// Initialization. virtual int open (size_t size, - int restart = 0, + bool restart = false, ACE_Sig_Handler * = 0, ACE_Timer_Queue * = 0, int disable_notify_pipe = 0, @@ -701,9 +701,9 @@ public: /// the application. virtual int resumable_handler (void); - /// Return 1 if we any event associations were made by the reactor - /// for the handles that it waits on, 0 otherwise. - virtual int uses_event_associations (void); + /// Return true if we any event associations were made by the reactor + /// for the handles that it waits on, false otherwise. + virtual bool uses_event_associations (void); // = Timer management. @@ -875,7 +875,7 @@ public: virtual int owner (ACE_thread_t *owner); /// Get the existing restart value. - virtual int restart (void); + virtual bool restart (void); /// Set a new value for restart and return the original value. /** @@ -885,7 +885,7 @@ public: * * @return Returns the previous "restart" value. */ - virtual int restart (int r); + virtual bool restart (int r); /// Set position of the owner thread. /** @@ -1132,7 +1132,7 @@ protected: /// Restart the handle_events event loop method automatically when /// polling function in use (ioctl() in this case) is interrupted /// via an EINTR signal. - int restart_; + bool restart_; protected: diff --git a/ACE/ace/FILE_Connector.h b/ACE/ace/FILE_Connector.h index b02b01e7dbb..aefa688f23b 100644 --- a/ACE/ace/FILE_Connector.h +++ b/ACE/ace/FILE_Connector.h @@ -90,7 +90,7 @@ public: int perms = ACE_DEFAULT_FILE_PERMS); /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); + bool reset_new_handle (ACE_HANDLE handle); /// Dump the state of an object. void dump (void) const; diff --git a/ACE/ace/FILE_Connector.inl b/ACE/ace/FILE_Connector.inl index d598341ba8d..75a941ff220 100644 --- a/ACE/ace/FILE_Connector.inl +++ b/ACE/ace/FILE_Connector.inl @@ -25,12 +25,11 @@ ACE_FILE_Connector::ACE_FILE_Connector (ACE_FILE_IO &new_io, ACE_TEXT ("ACE_FILE_IO"))); } -ACE_INLINE int -ACE_FILE_Connector::reset_new_handle (ACE_HANDLE handle) +ACE_INLINE bool +ACE_FILE_Connector::reset_new_handle (ACE_HANDLE) { - ACE_UNUSED_ARG (handle); // Nothing to do here since the handle is not a socket - return 0; + return false; } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/File_Lock.h b/ACE/ace/File_Lock.h index eec103e1fe0..0e1c9612e96 100644 --- a/ACE/ace/File_Lock.h +++ b/ACE/ace/File_Lock.h @@ -125,10 +125,10 @@ public: /** * Set underlying ACE_HANDLE. Note that this method assumes - * ownership of the <handle> and will close it down in <remove>. If - * you want the <handle> to stay open when <remove> is called make - * sure to call <dup> on the <handle> before closing it. You are - * responsible for the closing the existing <handle> before + * ownership of the @a handle and will close it down in <remove>. If + * you want the @a handle to stay open when <remove> is called make + * sure to call <dup> on the @a handle before closing it. You are + * responsible for the closing the existing @a handle before * overwriting it. */ void set_handle (ACE_HANDLE); diff --git a/ACE/ace/FlReactor/FlReactor.cpp b/ACE/ace/FlReactor/FlReactor.cpp index 611b9a14a19..e41822cf1ab 100644 --- a/ACE/ace/FlReactor/FlReactor.cpp +++ b/ACE/ace/FlReactor/FlReactor.cpp @@ -12,7 +12,7 @@ ACE_ALLOC_HOOK_DEFINE (ACE_FlReactor) // Must be called with lock held ACE_FlReactor::ACE_FlReactor (size_t size, - int restart, + bool restart, ACE_Sig_Handler *h) : ACE_Select_Reactor (size, restart, h) { diff --git a/ACE/ace/FlReactor/FlReactor.h b/ACE/ace/FlReactor/FlReactor.h index c2e3c64df06..bb4f4ea7ac1 100644 --- a/ACE/ace/FlReactor/FlReactor.h +++ b/ACE/ace/FlReactor/FlReactor.h @@ -49,7 +49,7 @@ class ACE_FlReactor_Export ACE_FlReactor : public ACE_Select_Reactor public: // = Initialization and termination methods. ACE_FlReactor (size_t size = DEFAULT_SIZE, - int restart = 0, + bool restart = false, ACE_Sig_Handler * = 0); virtual ~ACE_FlReactor (void); diff --git a/ACE/ace/FoxReactor/FoxReactor.cpp b/ACE/ace/FoxReactor/FoxReactor.cpp index 6656e8aa6a5..38ad0a868d9 100644 --- a/ACE/ace/FoxReactor/FoxReactor.cpp +++ b/ACE/ace/FoxReactor/FoxReactor.cpp @@ -20,7 +20,7 @@ ACE_ALLOC_HOOK_DEFINE (ACE_FoxReactor) // Must be called with lock held ACE_FoxReactor::ACE_FoxReactor (FXApp* a, size_t size, - int restart, + bool restart, ACE_Sig_Handler *h) : ACE_Select_Reactor (size, restart, h), fxapp(a) { diff --git a/ACE/ace/FoxReactor/FoxReactor.h b/ACE/ace/FoxReactor/FoxReactor.h index f44062853fb..94ffd92508b 100644 --- a/ACE/ace/FoxReactor/FoxReactor.h +++ b/ACE/ace/FoxReactor/FoxReactor.h @@ -45,7 +45,7 @@ public: // = Initialization and termination methods. ACE_FoxReactor (FXApp* a=0, size_t size = DEFAULT_SIZE, - int restart = 0, + bool restart = false, ACE_Sig_Handler * = 0); virtual ~ACE_FoxReactor (void); diff --git a/ACE/ace/Guard_T.h b/ACE/ace/Guard_T.h index 184d776dc47..3c0870e1562 100644 --- a/ACE/ace/Guard_T.h +++ b/ACE/ace/Guard_T.h @@ -52,8 +52,8 @@ public: ACE_Guard (ACE_LOCK &l, bool block); /// Initialise the guard without implicitly acquiring the lock. The - /// <become_owner> parameter indicates whether the guard should release - /// the lock implicitly on destruction. The <block> parameter is + /// @a become_owner parameter indicates whether the guard should release + /// the lock implicitly on destruction. The @a block parameter is /// ignored and is used here to disambiguate with the preceding /// constructor. ACE_Guard (ACE_LOCK &l, bool block, int become_owner); @@ -77,9 +77,9 @@ public: void disown (void); // = Utility methods. - /// 1 if locked, 0 if couldn't acquire the lock + /// true if locked, false if couldn't acquire the lock /// (errno will contain the reason for this). - int locked (void) const; + bool locked (void) const; /// Explicitly remove the lock. int remove (void); diff --git a/ACE/ace/Guard_T.inl b/ACE/ace/Guard_T.inl index 7dab2dfdcc3..e37ac76bb6c 100644 --- a/ACE/ace/Guard_T.inl +++ b/ACE/ace/Guard_T.inl @@ -65,7 +65,7 @@ ACE_Guard<ACE_LOCK>::~ACE_Guard (void) this->release (); } -template <class ACE_LOCK> ACE_INLINE int +template <class ACE_LOCK> ACE_INLINE bool ACE_Guard<ACE_LOCK>::locked (void) const { return this->owner_ != -1; diff --git a/ACE/ace/Handle_Set.h b/ACE/ace/Handle_Set.h index 845c332526a..2d020fb572a 100644 --- a/ACE/ace/Handle_Set.h +++ b/ACE/ace/Handle_Set.h @@ -23,10 +23,6 @@ #include "ace/os_include/sys/os_select.h" #include "ace/os_include/os_limits.h" -#if defined (__QNX__) - typedef long fd_mask; -#endif /* __QNX__ */ - // Default size of the ACE Reactor. #if defined (FD_SETSIZE) int const ACE_FD_SETSIZE = FD_SETSIZE; diff --git a/ACE/ace/LOCK_SOCK_Acceptor.cpp b/ACE/ace/LOCK_SOCK_Acceptor.cpp index 183338b7efa..4ca1cb127d5 100644 --- a/ACE/ace/LOCK_SOCK_Acceptor.cpp +++ b/ACE/ace/LOCK_SOCK_Acceptor.cpp @@ -12,8 +12,8 @@ template <class ACE_LOCK> int ACE_LOCK_SOCK_Acceptor<ACE_LOCK>::accept (ACE_SOCK_Stream &stream, ACE_Addr *remote_address, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const + bool restart, + bool reset_new_handle) const { ACE_GUARD_RETURN (ACE_LOCK, ace_mon, (ACE_LOCK &) this->lock_, -1); diff --git a/ACE/ace/LOCK_SOCK_Acceptor.h b/ACE/ace/LOCK_SOCK_Acceptor.h index cfca422e8d7..55c953e69ff 100644 --- a/ACE/ace/LOCK_SOCK_Acceptor.h +++ b/ACE/ace/LOCK_SOCK_Acceptor.h @@ -42,8 +42,8 @@ public: 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; + bool restart = true, + bool reset_new_handle = false) const; /// Return a reference to the lock. ACE_LOCK &lock (void); diff --git a/ACE/ace/LSOCK_Acceptor.cpp b/ACE/ace/LSOCK_Acceptor.cpp index ee154e3e087..d192c5003e8 100644 --- a/ACE/ace/LSOCK_Acceptor.cpp +++ b/ACE/ace/LSOCK_Acceptor.cpp @@ -84,8 +84,8 @@ int ACE_LSOCK_Acceptor::accept (ACE_LSOCK_Stream &new_stream, ACE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const + bool restart, + bool reset_new_handle) const { ACE_TRACE ("ACE_LSOCK_Acceptor::accept"); diff --git a/ACE/ace/LSOCK_Acceptor.h b/ACE/ace/LSOCK_Acceptor.h index a215736355e..86cb296bdb3 100644 --- a/ACE/ace/LSOCK_Acceptor.h +++ b/ACE/ace/LSOCK_Acceptor.h @@ -63,8 +63,8 @@ public: 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; + bool restart = true, + bool reset_new_handle = false) const; /// Close down the ACE_LSOCK and remove the rendezvous point from the /// file system. diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index 4ea1b6d9921..99ebb619cc9 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -2273,20 +2273,20 @@ ACE_Log_Msg::log_hexdump (ACE_Log_Priority log_priority, } void -ACE_Log_Msg::set (const char *filename, +ACE_Log_Msg::set (const char *file, int line, - int status, - int err, - int rs, + int op_status, + int errnum, + bool restart, ACE_OSTREAM_TYPE *os, ACE_Log_Msg_Callback *c) { ACE_TRACE ("ACE_Log_Msg::set"); - this->file (filename); + this->file (file); this->linenum (line); - this->op_status (status); - this->errnum (err); - this->restart (rs); + this->op_status (op_status); + this->errnum (errnum); + this->restart (restart); this->msg_ostream (os); this->msg_callback (c); } diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h index e7b525f8a69..1c28ee30815 100644 --- a/ACE/ace/Log_Msg.h +++ b/ACE/ace/Log_Msg.h @@ -315,11 +315,11 @@ public: /// Set the field that indicates whether interrupted calls should be /// restarted. - void restart (int); + void restart (bool r); /// Get the field that indicates whether interrupted calls should be /// restarted. - int restart (void) const; + bool restart (void) const; // = Notice that the following two function is equivalent to // "void msg_ostream (HANDLE)" and "HANDLE msg_ostream (void)" @@ -469,7 +469,7 @@ public: int line, int op_status = -1, int errnum = 0, - int restart = 1, + bool restart = true, ACE_OSTREAM_TYPE *os = 0, ACE_Log_Msg_Callback *c = 0); @@ -602,7 +602,7 @@ private: /// Indicates whether we should restart system calls that are /// interrupted. - int restart_; + bool restart_; /// The ostream where logging messages can be written. ACE_OSTREAM_TYPE *ostream_; diff --git a/ACE/ace/Log_Msg.inl b/ACE/ace/Log_Msg.inl index 677a6856d8f..87a09279763 100644 --- a/ACE/ace/Log_Msg.inl +++ b/ACE/ace/Log_Msg.inl @@ -41,13 +41,13 @@ ACE_Log_Msg::op_status (void) const ACE_INLINE void -ACE_Log_Msg::restart (int r) +ACE_Log_Msg::restart (bool r) { this->restart_ = r; } ACE_INLINE -int +bool ACE_Log_Msg::restart (void) const { return this->restart_; diff --git a/ACE/ace/MEM_Acceptor.cpp b/ACE/ace/MEM_Acceptor.cpp index fed5da3a328..f8c6f0cd850 100644 --- a/ACE/ace/MEM_Acceptor.cpp +++ b/ACE/ace/MEM_Acceptor.cpp @@ -82,8 +82,8 @@ int ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream, ACE_MEM_Addr *remote_sap, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) + bool restart, + bool reset_new_handle) { ACE_TRACE ("ACE_MEM_Acceptor::accept"); @@ -225,7 +225,7 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream, int ACE_MEM_Acceptor::shared_accept_finish (ACE_MEM_Stream new_stream, int in_blocking_mode, - int reset_new_handle) const + bool reset_new_handle) const { ACE_TRACE ("ACE_MEM_Acceptor::shared_accept_finish ()"); diff --git a/ACE/ace/MEM_Acceptor.h b/ACE/ace/MEM_Acceptor.h index 4a57b7528ff..09b60e45c63 100644 --- a/ACE/ace/MEM_Acceptor.h +++ b/ACE/ace/MEM_Acceptor.h @@ -83,14 +83,14 @@ public: int accept (ACE_MEM_Stream &new_ipc_sap, ACE_MEM_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0); + bool restart = true, + bool reset_new_handle = false); /// Perform operations that must occur after <ACE_OS::accept> is /// called. int shared_accept_finish (ACE_MEM_Stream new_stream, int in_blocking_mode, - int reset_new_handle) const; + bool reset_new_handle) const; /** * Accessor/mutator of mmap filename prefix. By default, the @@ -155,16 +155,16 @@ protected: 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; + bool restart = true, + bool reset_new_handle = false) const; #if !defined (ACE_HAS_WINCE) int accept (ACE_SOCK_Stream &new_stream, ACE_Accept_QoS_Params qos_params, ACE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0) const; + bool restart = true, + bool reset_new_handle = false) const; #endif // ACE_HAS_WINCE private: diff --git a/ACE/ace/MEM_Acceptor.inl b/ACE/ace/MEM_Acceptor.inl index c06cdaaee4a..39e6807f69c 100644 --- a/ACE/ace/MEM_Acceptor.inl +++ b/ACE/ace/MEM_Acceptor.inl @@ -23,8 +23,8 @@ ACE_INLINE int ACE_MEM_Acceptor::accept (ACE_SOCK_Stream &new_stream, ACE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const + bool restart, + bool reset_new_handle) const { return this->ACE_SOCK_Acceptor::accept (new_stream, remote_addr, timeout, restart, reset_new_handle); @@ -36,8 +36,8 @@ ACE_MEM_Acceptor::accept (ACE_SOCK_Stream &new_stream, ACE_Accept_QoS_Params qos_params, ACE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const + bool restart, + bool reset_new_handle) const { return this->ACE_SOCK_Acceptor::accept (new_stream, qos_params, remote_addr, timeout, restart, reset_new_handle); diff --git a/ACE/ace/Message_Block.h b/ACE/ace/Message_Block.h index e8906c94048..00d7dfe5b2c 100644 --- a/ACE/ace/Message_Block.h +++ b/ACE/ace/Message_Block.h @@ -138,7 +138,7 @@ public: * responsibility to take care of the memory allocated for the * data_block */ - ACE_Message_Block (ACE_Data_Block *, + ACE_Message_Block (ACE_Data_Block *data_block, Message_Flags flags = 0, ACE_Allocator *message_block_allocator = 0); diff --git a/ACE/ace/Message_Queue.h b/ACE/ace/Message_Queue.h index b5f847700fd..52be1b0f02b 100644 --- a/ACE/ace/Message_Queue.h +++ b/ACE/ace/Message_Queue.h @@ -21,10 +21,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/IO_Cntl_Msg.h" -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) -# include "ace/Synch_Traits.h" /* Needed in ACE_Message_Queue_NT */ -# include "ace/Thread_Mutex.h" /* Needed in ACE_Message_Queue_NT */ -#endif ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Message_Queue_NT.h b/ACE/ace/Message_Queue_NT.h index 94f14b0d673..34e009e62a8 100644 --- a/ACE/ace/Message_Queue_NT.h +++ b/ACE/ace/Message_Queue_NT.h @@ -69,7 +69,7 @@ public: // = Enqueue and dequeue methods. /** - * Enqueue an <ACE_Message_Block *> at the end of the queue. + * Enqueue an ACE_Message_Block * at the end of the queue. * Returns -1 on failure, else the number of items still on the * queue. */ @@ -79,7 +79,7 @@ public: ACE_Time_Value *timeout = 0); /** - * Dequeue and return the <ACE_Message_Block *> at the head of the + * Dequeue and return the ACE_Message_Block * at the head of the * queue. Returns -1 on failure, else the number of items still on * the queue. */ diff --git a/ACE/ace/Notification_Queue.cpp b/ACE/ace/Notification_Queue.cpp index 5d42ca5b44f..d0ce3bc161c 100644 --- a/ACE/ace/Notification_Queue.cpp +++ b/ACE/ace/Notification_Queue.cpp @@ -26,8 +26,7 @@ ACE_Notification_Queue:: } int -ACE_Notification_Queue:: -open() +ACE_Notification_Queue::open() { ACE_TRACE ("ACE_Notification_Queue::open"); @@ -40,8 +39,7 @@ open() } void -ACE_Notification_Queue:: -reset() +ACE_Notification_Queue::reset() { ACE_TRACE ("ACE_Notification_Queue::reset"); @@ -75,8 +73,8 @@ reset() Buffer_List().swap(free_queue_); } -int ACE_Notification_Queue:: -allocate_more_buffers() +int +ACE_Notification_Queue::allocate_more_buffers() { ACE_TRACE ("ACE_Notification_Queue::allocate_more_buffers"); @@ -155,8 +153,7 @@ purge_pending_notifications(ACE_Event_Handler * eh, return number_purged; } -int ACE_Notification_Queue:: -push_new_notification( +int ACE_Notification_Queue::push_new_notification( ACE_Notification_Buffer const & buffer) { ACE_TRACE ("ACE_Notification_Queue::push_new_notification"); diff --git a/ACE/ace/OS_Log_Msg_Attributes.h b/ACE/ace/OS_Log_Msg_Attributes.h index 072084f4bbc..107280f5ffd 100644 --- a/ACE/ace/OS_Log_Msg_Attributes.h +++ b/ACE/ace/OS_Log_Msg_Attributes.h @@ -59,7 +59,7 @@ protected: /// Indicates whether we should restart system calls that are /// interrupted. - int restart_; + bool restart_; /// Depth of the nesting for printing traces. int trace_depth_; diff --git a/ACE/ace/OS_NS_dirent.cpp b/ACE/ace/OS_NS_dirent.cpp index b8c3f3401a6..d9d05b0b2d6 100644 --- a/ACE/ace/OS_NS_dirent.cpp +++ b/ACE/ace/OS_NS_dirent.cpp @@ -41,11 +41,11 @@ ACE_DIR * ACE_OS::opendir_emulation (const ACE_TCHAR *filename) { #if defined (ACE_WIN32) -# if defined (ACE_HAS_WINCE) && !defined (INVALID_FILE_ATTRIBUTES) +# if !defined (INVALID_FILE_ATTRIBUTES) # define INVALID_FILE_ATTRIBUTES 0xFFFFFFFF # endif - ACE_DIR *dir; + ACE_DIR *dir = 0; ACE_TCHAR extra[3] = {0,0,0}; // Check if filename is a directory. @@ -72,7 +72,7 @@ ACE_OS::opendir_emulation (const ACE_TCHAR *filename) Phil Mesnier */ - size_t lastchar = ACE_OS::strlen (filename); + size_t const lastchar = ACE_OS::strlen (filename); if (lastchar > 0) { if (filename[lastchar-1] != '*') diff --git a/ACE/ace/OS_NS_netdb.cpp b/ACE/ace/OS_NS_netdb.cpp index 019a58dc0c1..bb53fdaf446 100644 --- a/ACE/ace/OS_NS_netdb.cpp +++ b/ACE/ace/OS_NS_netdb.cpp @@ -276,7 +276,7 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node) # else # if defined (ACE_HAS_PHARLAP_RT) DEVHANDLE ip_dev = (DEVHANDLE)0; - EK_TCPIPCFG *devp; + EK_TCPIPCFG *devp = 0; size_t i; ACE_TCHAR dev_name[16]; diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl index 94249db1099..8f8fb927eb8 100644 --- a/ACE/ace/OS_NS_stdio.inl +++ b/ACE/ace/OS_NS_stdio.inl @@ -365,7 +365,7 @@ ACE_OS::cuserid (char *user, size_t maxlen) ::remCurIdGet (user, 0); return user; } -#elif defined (__QNXNTO__) || defined (ACE_HAS_PHARLAP) || defined (ACE_HAS_WINCE) +#elif defined (ACE_HAS_PHARLAP) || defined (ACE_HAS_WINCE) ACE_UNUSED_ARG (user); ACE_UNUSED_ARG (maxlen); ACE_NOTSUP_RETURN (0); @@ -593,8 +593,7 @@ ACE_INLINE FILE * ACE_OS::fopen (const char *filename, const char *mode) { ACE_OS_TRACE ("ACE_OS::fopen"); - ACE_OSCALL_RETURN - (::fopen (filename, mode), FILE *, 0); + ACE_OSCALL_RETURN (::fopen (filename, mode), FILE *, 0); } #if defined (ACE_HAS_WCHAR) @@ -604,17 +603,16 @@ ACE_OS::fopen (const char *filename, const wchar_t *mode) { ACE_OS_TRACE ("ACE_OS::fopen"); ACE_Wide_To_Ascii n_mode (mode); - ACE_OSCALL_RETURN - (::fopen (filename, n_mode.char_rep ()), FILE *, 0); + ACE_OSCALL_RETURN (::fopen (filename, n_mode.char_rep ()), FILE *, 0); } + // Win32 PC implementation of fopen () is in OS_NS_stdio.cpp. ACE_INLINE FILE * ACE_OS::fopen (const wchar_t *filename, const wchar_t *mode) { ACE_OS_TRACE ("ACE_OS::fopen"); #if defined (ACE_HAS_WINCE) - ACE_OSCALL_RETURN - (::_wfopen (filename, mode), FILE *, 0); + ACE_OSCALL_RETURN (::_wfopen (filename, mode), FILE *, 0); #else // Non-Windows doesn't use wchar_t file systems. ACE_Wide_To_Ascii n_filename (filename); @@ -690,7 +688,7 @@ ACE_INLINE FILE * ACE_OS::freopen (const ACE_TCHAR *filename, const ACE_TCHAR *mode, FILE* stream) { ACE_OS_TRACE ("ACE_OS::freopen"); -#if defined (ACE_WIN32) && (defined(ACE_USES_WCHAR) || defined(ACE_HAS_WINCE)) +#if defined (ACE_WIN32) && defined(ACE_USES_WCHAR) ACE_OSCALL_RETURN (::_wfreopen (ACE_TEXT_ALWAYS_WCHAR (filename), ACE_TEXT_ALWAYS_WCHAR (mode), stream), @@ -1012,8 +1010,7 @@ ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr) (defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \ defined (ACE_HAS_DINKUM_STL) || defined (__DMC__) || \ defined (ACE_HAS_VSWPRINTF) || defined (ACE_WIN32_VC9) || \ - (defined (ACE_WIN32_VC8) && !defined (ACE_HAS_WINCE) && \ - _MSC_FULL_VER > 140050000) + (defined (ACE_WIN32_VC8) && _MSC_FULL_VER > 140050000) // The XPG4/UNIX98/C99 signature of the wide-char sprintf has a // maxlen argument. Since this method doesn't supply one, pass in diff --git a/ACE/ace/OS_NS_stropts.h b/ACE/ace/OS_NS_stropts.h index f713801f80c..5edbab0f5f5 100644 --- a/ACE/ace/OS_NS_stropts.h +++ b/ACE/ace/OS_NS_stropts.h @@ -127,7 +127,7 @@ namespace ACE_OS { ACE_OVERLAPPED_COMPLETION_FUNC func); #if !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) - /// QoS-enabled <ioctl> when the I/O control code is either + /// QoS-enabled @c ioctl when the I/O control code is either /// SIO_SET_QOS or SIO_GET_QOS. extern ACE_Export int ioctl (ACE_HANDLE socket, diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl index fe1804c04e7..2c11331ec57 100644 --- a/ACE/ace/OS_NS_time.inl +++ b/ACE/ace/OS_NS_time.inl @@ -196,7 +196,7 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen) return 0; } - ACE_TCHAR *result; + ACE_TCHAR *result = 0; # if defined (ACE_USES_WCHAR) ACE_OSCALL (::_wctime (t), wchar_t *, 0, result); # else /* ACE_USES_WCHAR */ @@ -262,7 +262,7 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op) # endif /* ! ACE_LACKS_LONGLONG_T */ #if defined (__amd64__) || defined (__x86_64__) - // Read the high res tick counter into 32 bit int variables "eax" and + // Read the high res tick counter into 32 bit int variables "eax" and // "edx", and then combine them into 64 bit int "now" ACE_UINT32 eax, edx; asm volatile ("rdtsc" : "=a" (eax), "=d" (edx) : : "memory"); @@ -453,7 +453,7 @@ ACE_OS::strptime (const char *buf, const char *format, struct tm *tm) return ACE_OS::strptime_emulation (buf, format, tm); # endif /* ACE_REFUSE_STRPTIME_EMULATION */ #else - return ::strptime (buf, format, tm); + return ACE_STD_NAMESPACE::strptime (buf, format, tm); #endif /* ACE_LACKS_STRPTIME */ } @@ -461,14 +461,14 @@ ACE_INLINE time_t ACE_OS::time (time_t *tloc) { ACE_OS_TRACE ("ACE_OS::time"); -#if !defined (ACE_HAS_WINCE) - ACE_OSCALL_RETURN (::time (tloc), time_t, (time_t) -1); -#else +#if !defined (ACE_LACKS_TIME) time_t retv = ACE_OS::gettimeofday ().sec (); if (tloc) *tloc = retv; return retv; -#endif /* ACE_HAS_WINCE */ +#else + ACE_OSCALL_RETURN (::time (tloc), time_t, (time_t) -1); +#endif /* ACE_LACKS_TIME */ } // Linux won't compile unless we explicitly use a namespace here. @@ -491,7 +491,7 @@ ACE_OS::timezone (void) ACE_INLINE void ACE_OS::tzset (void) { -#if !defined (ACE_HAS_WINCE) && !defined (ACE_VXWORKS) && !defined(ACE_HAS_RTEMS) && !defined (ACE_HAS_DINKUM_STL) +#if !defined (ACE_LACKS_TZSET) && !defined (ACE_HAS_DINKUM_STL) # if defined (ACE_WIN32) ::_tzset (); // For Win32. # else @@ -499,7 +499,7 @@ ACE_OS::tzset (void) # endif /* ACE_WIN32 */ # else errno = ENOTSUP; -# endif /* ACE_HAS_WINCE && !VXWORKS && !ACE_HAS_RTEMS && !ACE_HAS_DINKUM_STL */ +# endif /* !ACE_LACKS_TZSET */ } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_unistd.h b/ACE/ace/OS_NS_unistd.h index c68100bbde5..ff9ba5a1cc5 100644 --- a/ACE/ace/OS_NS_unistd.h +++ b/ACE/ace/OS_NS_unistd.h @@ -76,7 +76,6 @@ namespace ACE_OS bool substitute_env_args = true, bool quote_args = false); -#if !defined (ACE_LACKS_CHDIR) ACE_NAMESPACE_INLINE_FUNCTION int chdir (const char *path); @@ -84,7 +83,6 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION int chdir (const wchar_t *path); #endif /* ACE_HAS_WCHAR */ -#endif /* ACE_LACKS_CHDIR */ ACE_NAMESPACE_INLINE_FUNCTION int rmdir (const char *path); @@ -253,7 +251,7 @@ namespace ACE_OS ACE_OVERLAPPED *); /** - * Receive @a len bytes into @a buf from <handle> (uses the + * Receive @a len bytes into @a buf from @a handle (uses the * <ACE_OS::read> call, which uses the <read> system call on UNIX * and the <ReadFile> call on Win32). If errors occur, -1 is * returned. If EOF occurs, 0 is returned. Whatever data has been diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl index d5e3c4f86cb..16a5442bc32 100644 --- a/ACE/ace/OS_NS_unistd.inl +++ b/ACE/ace/OS_NS_unistd.inl @@ -19,16 +19,17 @@ # include "ace/OS_NS_stdio.h" #endif /* ACE_LACKS_ACCESS */ -#if defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_ACCESS_EMULATION) # include "ace/os_include/os_unistd.h" -# if defined (ACE_VXWORKS) && (((ACE_VXWORKS >= 0x620) && (ACE_VXWORKS <= 0x660)) || defined (ACE_HAS_VXWORKS551_MEDUSA)) -# if defined (__RTP__) -# include "ace/os_include/os_strings.h" -# else -# include "ace/os_include/os_string.h" -# endif +#endif /* ACE_HAS_ACCESS_EMULATION */ + +#if defined (ACE_VXWORKS) && (((ACE_VXWORKS >= 0x620) && (ACE_VXWORKS <= 0x660)) || defined (ACE_HAS_VXWORKS551_MEDUSA)) +# if defined (__RTP__) +# include "ace/os_include/os_strings.h" +# else +# include "ace/os_include/os_string.h" # endif -#endif /* VXWORKS || ACE_HAS_WINCE */ +#endif ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -37,7 +38,7 @@ ACE_OS::access (const char *path, int amode) { ACE_OS_TRACE ("ACE_OS::access"); #if defined (ACE_LACKS_ACCESS) -# if defined (ACE_HAS_WINCE) || defined (ACE_VXWORKS) +# if defined (ACE_HAS_ACCESS_EMULATION) // @@ WINCE: There should be a Win32 API that can do this. // Hard coded read access here. ACE_UNUSED_ARG (amode); @@ -53,7 +54,7 @@ ACE_OS::access (const char *path, int amode) ACE_UNUSED_ARG (path); ACE_UNUSED_ARG (amode); ACE_NOTSUP_RETURN (-1); -# endif // ACE_HAS_WINCE +# endif /* ACE_HAS_ACCESS_EMULATION */ #elif defined(ACE_WIN32) // Windows doesn't support checking X_OK(6) ACE_OSCALL_RETURN (::access (path, amode & 6), int, -1); @@ -67,11 +68,11 @@ ACE_OS::access (const char *path, int amode) ACE_INLINE int ACE_OS::access (const wchar_t *path, int amode) { -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) && !defined (ACE_LACKS__WACCESS) ACE_OSCALL_RETURN (::_waccess (path, amode), int, -1); #else /* ACE_WIN32 && !ACE_HAS_WINCE */ return ACE_OS::access (ACE_Wide_To_Ascii (path).char_rep (), amode); -#endif /* ACE_WIN32 && !ACE_HAS_WINCE */ +#endif /* ACE_WIN32 && !ACE_LACKS__WACCESS */ } #endif /* ACE_HAS_WCHAR */ @@ -117,16 +118,19 @@ ACE_OS::allocation_granularity (void) #endif /* ACE_WIN32 */ } -#if !defined (ACE_LACKS_CHDIR) ACE_INLINE int ACE_OS::chdir (const char *path) { ACE_OS_TRACE ("ACE_OS::chdir"); -#if defined (ACE_HAS_NONCONST_CHDIR) - ACE_OSCALL_RETURN (::chdir (const_cast<char *> (path)), int, -1); -#elif defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_WINCE) + ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::SetCurrentDirectoryA (path), + ace_result_), + int, -1); +#elif defined (ACE_LACKS_CHDIR) ACE_UNUSED_ARG (path); ACE_NOTSUP_RETURN (-1); +#elif defined (ACE_HAS_NONCONST_CHDIR) + ACE_OSCALL_RETURN (::chdir (const_cast<char *> (path)), int, -1); #else ACE_OSCALL_RETURN (::chdir (path), int, -1); #endif /* ACE_HAS_NONCONST_CHDIR */ @@ -136,20 +140,23 @@ ACE_OS::chdir (const char *path) ACE_INLINE int ACE_OS::chdir (const wchar_t *path) { -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_WINCE) + ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::SetCurrentDirectoryW (path), + ace_result_), + int, -1); +#elif defined (ACE_WIN32) ACE_OSCALL_RETURN (::_wchdir (path), int, -1); #else /* ACE_WIN32 */ return ACE_OS::chdir (ACE_Wide_To_Ascii (path).char_rep ()); #endif /* ACE_WIN32 */ } #endif /* ACE_HAS_WCHAR */ -#endif /* ACE_LACKS_CHDIR */ ACE_INLINE int ACE_OS::rmdir (const char *path) { #if defined (ACE_HAS_WINCE) - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectory (ACE_TEXT_CHAR_TO_TCHAR (path)), + ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectoryA (path), ace_result_), int, -1); #else @@ -206,12 +213,12 @@ ACE_OS::dup (ACE_HANDLE handle) else ACE_FAIL_RETURN (ACE_INVALID_HANDLE); /* NOTREACHED */ -#elif defined (ACE_LACKS_DUP) - ACE_UNUSED_ARG (handle); - ACE_NOTSUP_RETURN (-1); #elif defined (ACE_HAS_WINCE) ACE_UNUSED_ARG (handle); ACE_NOTSUP_RETURN (0); +#elif defined (ACE_LACKS_DUP) + ACE_UNUSED_ARG (handle); + ACE_NOTSUP_RETURN (-1); #else ACE_OSCALL_RETURN (::dup (handle), ACE_HANDLE, ACE_INVALID_HANDLE); #endif /* ACE_WIN32 && !ACE_HAS_WINCE */ @@ -750,13 +757,11 @@ ACE_OS::readlink (const char *path, char *buf, size_t bufsiz) ACE_UNUSED_ARG (buf); ACE_UNUSED_ARG (bufsiz); ACE_NOTSUP_RETURN (-1); +# elif defined(ACE_HAS_NONCONST_READLINK) + ACE_OSCALL_RETURN ( + ::readlink (const_cast <char *>(path), buf, bufsiz), ssize_t, -1); # else -# if !defined(ACE_HAS_NONCONST_READLINK) - ACE_OSCALL_RETURN (::readlink (path, buf, bufsiz), ssize_t, -1); -# else - ACE_OSCALL_RETURN ( - ::readlink (const_cast <char *>(path), buf, bufsiz), ssize_t, -1); -# endif + ACE_OSCALL_RETURN (::readlink (path, buf, bufsiz), ssize_t, -1); # endif /* ACE_LACKS_READLINK */ } diff --git a/ACE/ace/Priority_Reactor.cpp b/ACE/ace/Priority_Reactor.cpp index cba55b0174c..de3a6aa9eb6 100644 --- a/ACE/ace/Priority_Reactor.cpp +++ b/ACE/ace/Priority_Reactor.cpp @@ -51,10 +51,10 @@ ACE_Priority_Reactor::ACE_Priority_Reactor (ACE_Sig_Handler *sh, } ACE_Priority_Reactor::ACE_Priority_Reactor (size_t size, - int rs, + bool restart, ACE_Sig_Handler *sh, ACE_Timer_Queue *tq) - : ACE_Select_Reactor (size, rs, sh, tq), + : ACE_Select_Reactor (size, restart, sh, tq), bucket_ (0), tuple_allocator_ (0) { @@ -84,7 +84,7 @@ ACE_Priority_Reactor::build_bucket (ACE_Handle_Set &dispatch_mask, (handle = handle_iter ()) != ACE_INVALID_HANDLE; ) { - ACE_Event_Handler *event_handler = + ACE_Event_Handler *event_handler = this->handler_rep_.find (handle); if (event_handler == 0) return -1; diff --git a/ACE/ace/Priority_Reactor.h b/ACE/ace/Priority_Reactor.h index 5624fa4c9a7..b36fb387959 100644 --- a/ACE/ace/Priority_Reactor.h +++ b/ACE/ace/Priority_Reactor.h @@ -45,7 +45,7 @@ public: /// Initialize ACE_Priority_Reactor with size @a size. ACE_Priority_Reactor (size_t size, - int restart = 0, + bool restart = false, ACE_Sig_Handler * = 0, ACE_Timer_Queue * = 0); @@ -75,7 +75,7 @@ private: void init_bucket (void); /// Build the bucket from the given dispatch_mask. Return -1 on - /// failure, 0 otherwise. + /// failure, 0 otherwise. int build_bucket (ACE_Handle_Set& dispatch_mask, int &min_priority, int &max_priority); diff --git a/ACE/ace/QoS/qos.mpc b/ACE/ace/QoS/qos.mpc index 9702c646049..f8f19077285 100644 --- a/ACE/ace/QoS/qos.mpc +++ b/ACE/ace/QoS/qos.mpc @@ -7,7 +7,7 @@ project(QoS) : acelib, ace_output, install { dynamicflags = ACE_QoS_BUILD_DLL macros += ACE_HAS_QOS - specific(borland, bmake, nmake, em3, vc6, vc7, vc71, vc8, vc9) { + specific(bmake, nmake, em3, vc6, vc7, vc71, vc8, vc9) { macros += ACE_HAS_WINSOCK2_GQOS } diff --git a/ACE/ace/QtReactor/QtReactor.cpp b/ACE/ace/QtReactor/QtReactor.cpp index 6ce9d9bb4eb..4202bc4cf56 100644 --- a/ACE/ace/QtReactor/QtReactor.cpp +++ b/ACE/ace/QtReactor/QtReactor.cpp @@ -26,7 +26,7 @@ ACE_QtReactor::ACE_QtReactor (QApplication *qapp , // Must be called with lock held ACE_QtReactor::ACE_QtReactor (size_t size, QApplication *qapp, - int restart, + bool restart, ACE_Sig_Handler *sh, ACE_Timer_Queue *tq, int disable_notify_pipe, diff --git a/ACE/ace/QtReactor/QtReactor.h b/ACE/ace/QtReactor/QtReactor.h index ff5cc5aa509..9d34c8d58b8 100644 --- a/ACE/ace/QtReactor/QtReactor.h +++ b/ACE/ace/QtReactor/QtReactor.h @@ -118,7 +118,7 @@ public: */ ACE_QtReactor (size_t size, QApplication *qapp = 0, - int restart = 0, + bool restart = false, ACE_Sig_Handler * = 0, ACE_Timer_Queue * = 0, int disable_notify_pipe = 0, diff --git a/ACE/ace/Reactor.h b/ACE/ace/Reactor.h index 6e7bde775db..423c736bbbb 100644 --- a/ACE/ace/Reactor.h +++ b/ACE/ace/Reactor.h @@ -233,13 +233,13 @@ public: /** * Initialize the ACE_Reactor to manage <max_number_of_handles>. - * If <restart> is non-0 then the ACE_Reactor's <handle_events> + * If @a restart is false then the ACE_Reactor's <handle_events> * method will be restarted automatically when <EINTR> occurs. If - * <signal_handler> or <timer_queue> are non-0 they are used as the + * @a signal_handler or @a timer_queue are non-0 they are used as the * signal handler and timer queue, respectively. */ int open (size_t max_number_of_handles, - int restart = 0, + bool restart = false, ACE_Sig_Handler *signal_handler = 0, ACE_Timer_Queue *timer_queue = 0); @@ -656,7 +656,7 @@ public: int cancel_wakeup (ACE_Event_Handler *event_handler, ACE_Reactor_Mask masks_to_be_cleared); - /// Clear @a masks_to_be_cleared from the <handle>'s entry. + /// Clear @a masks_to_be_cleared from the @a handle's entry. /// Note that this call does not cause the Reactor to re-examine /// its set of handlers - the new masks will be noticed the next /// time the Reactor waits for activity. If there is no other @@ -793,10 +793,10 @@ public: int requeue_position (void); /// Get the existing restart value. - int restart (void); + bool restart (void); /// Set a new value for restart and return the original value. - int restart (int r); + bool restart (bool r); // = Low-level wait_set mask manipulation methods. @@ -819,7 +819,7 @@ public: ACE_Reactor_Mask mask, int ops); - /// GET/SET/ADD/CLR the ready "bit" bound with the <handle> and @a mask. + /// GET/SET/ADD/CLR the ready "bit" bound with the @a handle and @a mask. int ready_ops (ACE_HANDLE handle, ACE_Reactor_Mask mask, int ops); @@ -835,9 +835,9 @@ public: */ int current_info (ACE_HANDLE handle, size_t &msg_size); - /// Return 1 if we any event associations were made by the reactor - /// for the handles that it waits on, 0 otherwise. - int uses_event_associations (void); + /// Return true if we any event associations were made by the reactor + /// for the handles that it waits on, false otherwise. + bool uses_event_associations (void); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Reactor.inl b/ACE/ace/Reactor.inl index b381a1738c2..499f625ee61 100644 --- a/ACE/ace/Reactor.inl +++ b/ACE/ace/Reactor.inl @@ -143,7 +143,7 @@ ACE_Reactor::current_info (ACE_HANDLE handle, size_t &size) ACE_INLINE int ACE_Reactor::open (size_t size, - int restart, + bool restart, ACE_Sig_Handler *signal_handler, ACE_Timer_Queue *timer_queue) { @@ -410,14 +410,14 @@ ACE_Reactor::owner (ACE_thread_t *owner) return this->implementation ()->owner (owner); } -ACE_INLINE int +ACE_INLINE bool ACE_Reactor::restart (void) { return this->implementation ()->restart (); } -ACE_INLINE int -ACE_Reactor::restart (int r) +ACE_INLINE bool +ACE_Reactor::restart (bool r) { return this->implementation ()->restart (r); } @@ -479,7 +479,7 @@ ACE_Reactor::size (void) const return this->implementation ()->size (); } -ACE_INLINE int +ACE_INLINE bool ACE_Reactor::uses_event_associations (void) { return this->implementation ()->uses_event_associations (); diff --git a/ACE/ace/Reactor_Impl.h b/ACE/ace/Reactor_Impl.h index 019581d299e..feddde8ad51 100644 --- a/ACE/ace/Reactor_Impl.h +++ b/ACE/ace/Reactor_Impl.h @@ -133,7 +133,7 @@ public: /// Initialization. virtual int open (size_t size, - int restart = 0, + bool restart = false, ACE_Sig_Handler * = 0, ACE_Timer_Queue * = 0, int disable_notify_pipe = 0, @@ -295,7 +295,7 @@ public: ACE_Reactor_Mask mask) = 0; /** - * Removes <handle>. If @a mask == ACE_Event_Handler::DONT_CALL + * Removes @a handle. If @a mask == ACE_Event_Handler::DONT_CALL * then the <handle_close> method of the associated <event_handler> * is not invoked. */ @@ -330,7 +330,7 @@ public: /// <ACE_Event_Handler::get_handle> to get the handle. virtual int suspend_handler (ACE_Event_Handler *event_handler) = 0; - /// Suspend <handle> temporarily. + /// Suspend @a handle temporarily. virtual int suspend_handler (ACE_HANDLE handle) = 0; /// Suspend all <handles> in handle set temporarily. @@ -343,7 +343,7 @@ public: /// get the handle. virtual int resume_handler (ACE_Event_Handler *event_handler) = 0; - /// Resume <handle>. + /// Resume @a handle. virtual int resume_handler (ACE_HANDLE handle) = 0; /// Resume all <handles> in handle set. @@ -357,9 +357,9 @@ public: /// the application virtual int resumable_handler (void) = 0; - /// Return 1 if we any event associations were made by the reactor - /// for the handles that it waits on, 0 otherwise. - virtual int uses_event_associations (void) = 0; + /// Return true if we any event associations were made by the reactor + /// for the handles that it waits on, false otherwise. + virtual bool uses_event_associations (void) = 0; // If we need to reset handles returned from accept/connect. @@ -422,8 +422,8 @@ public: virtual int schedule_wakeup (ACE_Event_Handler *event_handler, ACE_Reactor_Mask masks_to_be_added) = 0; - /// Add @a masks_to_be_added to the <handle>'s entry. <event_handler> - /// associated with <handle> must already have been registered. + /// Add @a masks_to_be_added to the @a handle's entry. <event_handler> + /// associated with @a handle must already have been registered. virtual int schedule_wakeup (ACE_HANDLE handle, ACE_Reactor_Mask masks_to_be_added) = 0; @@ -431,7 +431,7 @@ public: virtual int cancel_wakeup (ACE_Event_Handler *event_handler, ACE_Reactor_Mask masks_to_be_cleared) = 0; - /// Clear @a masks_to_be_cleared from the <handle>'s entry. + /// Clear @a masks_to_be_cleared from the @a handle's entry. virtual int cancel_wakeup (ACE_HANDLE handle, ACE_Reactor_Mask masks_to_be_cleared) = 0; @@ -476,13 +476,13 @@ public: ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK) = 0; /** - * Return the Event_Handler associated with <handle>. Return 0 if - * <handle> is not registered. + * Return the Event_Handler associated with @a handle. Return 0 if + * @a handle is not registered. */ virtual ACE_Event_Handler *find_handler (ACE_HANDLE handle) = 0; /** - * Check to see if <handle> is associated with a valid Event_Handler + * Check to see if @a handle is associated with a valid Event_Handler * bound to @a mask. Return the @a event_handler associated with this * handler if @a event_handler != 0. */ @@ -519,10 +519,10 @@ public: virtual int owner (ACE_thread_t *owner) = 0; /// Get the existing restart value. - virtual int restart (void) = 0; + virtual bool restart (void) = 0; /// Set a new value for restart and return the original value. - virtual int restart (int r) = 0; + virtual bool restart (bool r) = 0; /// Set position of the owner thread. virtual void requeue_position (int) = 0; @@ -538,7 +538,7 @@ public: ACE_Reactor_Mask mask, int ops) = 0; - /// GET/SET/ADD/CLR the dispatch MASK "bit" bound with the <handle> + /// GET/SET/ADD/CLR the dispatch MASK "bit" bound with the @a handle /// and @a mask. virtual int mask_ops (ACE_HANDLE handle, ACE_Reactor_Mask mask, @@ -551,7 +551,7 @@ public: ACE_Reactor_Mask mask, int ops) = 0; - /// GET/SET/ADD/CLR the ready "bit" bound with the <handle> and @a mask. + /// GET/SET/ADD/CLR the ready "bit" bound with the @a handle and @a mask. virtual int ready_ops (ACE_HANDLE handle, ACE_Reactor_Mask, int ops) = 0; diff --git a/ACE/ace/Recyclable.h b/ACE/ace/Recyclable.h index 18487ab4094..5eae5965371 100644 --- a/ACE/ace/Recyclable.h +++ b/ACE/ace/Recyclable.h @@ -63,8 +63,6 @@ protected: /// Constructor. ACE_Recyclable (ACE_Recyclable_State initial_state); -protected: - /// Our state. ACE_Recyclable_State recycle_state_; }; diff --git a/ACE/ace/SOCK_Acceptor.cpp b/ACE/ace/SOCK_Acceptor.cpp index 70cc5bcf449..140e416b49a 100644 --- a/ACE/ace/SOCK_Acceptor.cpp +++ b/ACE/ace/SOCK_Acceptor.cpp @@ -33,7 +33,7 @@ ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (void) int ACE_SOCK_Acceptor::shared_accept_start (ACE_Time_Value *timeout, - int restart, + bool restart, int &in_blocking_mode) const { ACE_TRACE ("ACE_SOCK_Acceptor::shared_accept_start"); @@ -66,7 +66,7 @@ ACE_SOCK_Acceptor::shared_accept_start (ACE_Time_Value *timeout, int ACE_SOCK_Acceptor::shared_accept_finish (ACE_SOCK_Stream new_stream, int in_blocking_mode, - int reset_new_handle) const + bool reset_new_handle) const { ACE_TRACE ("ACE_SOCK_Acceptor::shared_accept_finish ()"); @@ -105,8 +105,8 @@ int ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, ACE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const + bool restart, + bool reset_new_handle) const { ACE_TRACE ("ACE_SOCK_Acceptor::accept"); @@ -135,7 +135,7 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, addr, len_ptr)); while (new_stream.get_handle () == ACE_INVALID_HANDLE - && restart != 0 + && restart && errno == EINTR && timeout == 0); @@ -161,8 +161,8 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, ACE_Accept_QoS_Params qos_params, ACE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const + bool restart, + bool reset_new_handle) const { ACE_TRACE ("ACE_SOCK_Acceptor::accept"); @@ -192,7 +192,7 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, len_ptr, qos_params)); while (new_stream.get_handle () == ACE_INVALID_HANDLE - && restart != 0 + && restart && errno == EINTR && timeout == 0); diff --git a/ACE/ace/SOCK_Acceptor.h b/ACE/ace/SOCK_Acceptor.h index 2a14cb342db..87e202ba79c 100644 --- a/ACE/ace/SOCK_Acceptor.h +++ b/ACE/ace/SOCK_Acceptor.h @@ -99,8 +99,8 @@ public: // = Passive connection <accept> methods. /** * Accept a new ACE_SOCK_Stream connection. A @a timeout of 0 - * means block forever, a @a timeout of {0, 0} means poll. <restart> - * == 1 means "restart if interrupted," i.e., if errno == EINTR. + * means block forever, a @a timeout of {0, 0} means poll. @a restart + * == true means "restart if interrupted," i.e., if errno == EINTR. * Note that @a new_stream inherits the "blocking mode" of @c this * ACE_SOCK_Acceptor, i.e., if @c this acceptor factory is in * non-blocking mode, the @a new_stream will be in non-blocking mode @@ -109,14 +109,14 @@ public: 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; + bool restart = true, + bool reset_new_handle = false) const; #if !defined (ACE_HAS_WINCE) /** * Accept a new ACE_SOCK_Stream connection using the QoS * information in @a qos_params. A @a timeout of 0 means block - * forever, a @a timeout of {0, 0} means poll. @a restart == 1 means + * forever, a @a timeout of {0, 0} means poll. @a restart == true means * "restart if interrupted," i.e., if errno == EINTR. Note that * @a new_stream inherits the "blocking mode" of @c this * ACE_SOCK_Acceptor, i.e., if @c this acceptor factory is in @@ -127,8 +127,8 @@ public: ACE_Accept_QoS_Params qos_params, ACE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0) const; + bool restart = true, + bool reset_new_handle = false) const; #endif // ACE_HAS_WINCE // = Meta-type info @@ -145,14 +145,14 @@ protected: /// Perform operations that must occur before <ACE_OS::accept> is /// called. int shared_accept_start (ACE_Time_Value *timeout, - int restart, + bool restart, int &in_blocking_mode) const; /// Perform operations that must occur after <ACE_OS::accept> is /// called. int shared_accept_finish (ACE_SOCK_Stream new_stream, int in_blocking_mode, - int reset_new_handle) const; + bool reset_new_handle) const; /** * This method factors out the common <open> code and is called by diff --git a/ACE/ace/SOCK_Connector.h b/ACE/ace/SOCK_Connector.h index 3873d7c95d4..cbd343d1722 100644 --- a/ACE/ace/SOCK_Connector.h +++ b/ACE/ace/SOCK_Connector.h @@ -270,7 +270,7 @@ public: const ACE_Time_Value *timeout = 0); /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); + bool reset_new_handle (ACE_HANDLE handle); // = Meta-type info typedef ACE_INET_Addr PEER_ADDR; diff --git a/ACE/ace/SOCK_Connector.inl b/ACE/ace/SOCK_Connector.inl index bdbf5cd19f6..c4862d0ea75 100644 --- a/ACE/ace/SOCK_Connector.inl +++ b/ACE/ace/SOCK_Connector.inl @@ -21,7 +21,7 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (void) ACE_TRACE ("ACE_SOCK_Connector::ACE_SOCK_Connector"); } -ACE_INLINE int +ACE_INLINE bool ACE_SOCK_Connector::reset_new_handle (ACE_HANDLE handle) { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) @@ -31,7 +31,7 @@ ACE_SOCK_Connector::reset_new_handle (ACE_HANDLE handle) 0); #else /* !defined ACE_HAS_WINSOCK2 */ ACE_UNUSED_ARG (handle); - return 0; + return false; #endif /* ACE_WIN32 */ } diff --git a/ACE/ace/SOCK_SEQPACK_Acceptor.cpp b/ACE/ace/SOCK_SEQPACK_Acceptor.cpp index 2a4664b1609..3e502a4d61f 100644 --- a/ACE/ace/SOCK_SEQPACK_Acceptor.cpp +++ b/ACE/ace/SOCK_SEQPACK_Acceptor.cpp @@ -30,7 +30,7 @@ ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (void) int ACE_SOCK_SEQPACK_Acceptor::shared_accept_start (ACE_Time_Value *timeout, - int restart, + bool restart, int &in_blocking_mode) const { ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::shared_accept_start"); @@ -63,7 +63,7 @@ ACE_SOCK_SEQPACK_Acceptor::shared_accept_start (ACE_Time_Value *timeout, int ACE_SOCK_SEQPACK_Acceptor::shared_accept_finish (ACE_SOCK_SEQPACK_Association new_association, int in_blocking_mode, - int reset_new_handle) const + bool reset_new_handle) const { ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::shared_accept_finish ()"); @@ -102,8 +102,8 @@ int ACE_SOCK_SEQPACK_Acceptor::accept (ACE_SOCK_SEQPACK_Association &new_association, ACE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const + bool restart, + bool reset_new_handle) const { ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::accept"); diff --git a/ACE/ace/SOCK_SEQPACK_Acceptor.h b/ACE/ace/SOCK_SEQPACK_Acceptor.h index 0d5501dd204..95234c36caa 100644 --- a/ACE/ace/SOCK_SEQPACK_Acceptor.h +++ b/ACE/ace/SOCK_SEQPACK_Acceptor.h @@ -133,8 +133,8 @@ public: int accept (ACE_SOCK_SEQPACK_Association &new_association, ACE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0) const; + bool restart = true, + bool reset_new_handle = false) const; // = Meta-type info typedef ACE_Multihomed_INET_Addr PEER_ADDR; @@ -150,14 +150,14 @@ protected: /// Perform operations that must occur before <ACE_OS::accept> is /// called. int shared_accept_start (ACE_Time_Value *timeout, - int restart, + bool restart, int &in_blocking_mode) const; /// Perform operations that must occur after <ACE_OS::accept> is /// called. int shared_accept_finish (ACE_SOCK_SEQPACK_Association new_association, int in_blocking_mode, - int reset_new_handle) const; + bool reset_new_handle) const; /** * This method factors out the common <open> code and is called by diff --git a/ACE/ace/SOCK_SEQPACK_Connector.h b/ACE/ace/SOCK_SEQPACK_Connector.h index ac689917fa8..aaac7c77a49 100644 --- a/ACE/ace/SOCK_SEQPACK_Connector.h +++ b/ACE/ace/SOCK_SEQPACK_Connector.h @@ -275,7 +275,7 @@ public: const ACE_Time_Value *timeout = 0); /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); + bool reset_new_handle (ACE_HANDLE handle); // = Meta-type info typedef ACE_Multihomed_INET_Addr PEER_ADDR; diff --git a/ACE/ace/SOCK_SEQPACK_Connector.inl b/ACE/ace/SOCK_SEQPACK_Connector.inl index c932ad2eed6..93704f89d9e 100644 --- a/ACE/ace/SOCK_SEQPACK_Connector.inl +++ b/ACE/ace/SOCK_SEQPACK_Connector.inl @@ -21,7 +21,7 @@ ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector (void) ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector"); } -ACE_INLINE int +ACE_INLINE bool ACE_SOCK_SEQPACK_Connector::reset_new_handle (ACE_HANDLE handle) { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) @@ -31,7 +31,7 @@ ACE_SOCK_SEQPACK_Connector::reset_new_handle (ACE_HANDLE handle) 0); #else /* !defined ACE_HAS_WINSOCK2 */ ACE_UNUSED_ARG (handle); - return 0; + return false; #endif /* ACE_WIN32 */ } diff --git a/ACE/ace/SPIPE_Acceptor.cpp b/ACE/ace/SPIPE_Acceptor.cpp index 285ddb2438d..5ee499c476a 100644 --- a/ACE/ace/SPIPE_Acceptor.cpp +++ b/ACE/ace/SPIPE_Acceptor.cpp @@ -248,8 +248,8 @@ int ACE_SPIPE_Acceptor::accept (ACE_SPIPE_Stream &new_io, ACE_SPIPE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) + bool restart, + bool reset_new_handle) { ACE_TRACE ("ACE_SPIPE_Acceptor::accept"); ACE_UNUSED_ARG (reset_new_handle); diff --git a/ACE/ace/SPIPE_Acceptor.h b/ACE/ace/SPIPE_Acceptor.h index 2c7d9958756..74e616c1c9c 100644 --- a/ACE/ace/SPIPE_Acceptor.h +++ b/ACE/ace/SPIPE_Acceptor.h @@ -121,8 +121,8 @@ public: 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); + bool restart = true, + bool reset_new_handle = false); // = Meta-type info typedef ACE_SPIPE_Addr PEER_ADDR; diff --git a/ACE/ace/SPIPE_Connector.h b/ACE/ace/SPIPE_Connector.h index 51e3476816b..3237874aa6c 100644 --- a/ACE/ace/SPIPE_Connector.h +++ b/ACE/ace/SPIPE_Connector.h @@ -95,7 +95,7 @@ public: int pipe_mode = PIPE_READMODE_MESSAGE | PIPE_WAIT); /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); + bool reset_new_handle (ACE_HANDLE handle); // = Meta-type info typedef ACE_SPIPE_Addr PEER_ADDR; diff --git a/ACE/ace/SPIPE_Connector.inl b/ACE/ace/SPIPE_Connector.inl index bbec9b8f468..1d41abe08d4 100644 --- a/ACE/ace/SPIPE_Connector.inl +++ b/ACE/ace/SPIPE_Connector.inl @@ -4,12 +4,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_INLINE int -ACE_SPIPE_Connector::reset_new_handle (ACE_HANDLE handle) +ACE_INLINE bool +ACE_SPIPE_Connector::reset_new_handle (ACE_HANDLE) { - ACE_UNUSED_ARG (handle); // Nothing to do here since the handle is not a socket - return 0; + return false; } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp b/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp index 23ab657f75c..37809f9bc13 100644 --- a/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp +++ b/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp @@ -176,8 +176,8 @@ int ACE_SSL_SOCK_Acceptor::accept (ACE_SSL_SOCK_Stream &new_stream, ACE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const + bool restart, + bool reset_new_handle) const { ACE_TRACE ("ACE_SSL_SOCK_Acceptor::accept"); @@ -214,8 +214,8 @@ ACE_SSL_SOCK_Acceptor::accept (ACE_SSL_SOCK_Stream &new_stream, ACE_Accept_QoS_Params qos_params, ACE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const + bool restart, + bool reset_new_handle) const { ACE_TRACE ("ACE_SSL_SOCK_Acceptor::accept"); diff --git a/ACE/ace/SSL/SSL_SOCK_Acceptor.h b/ACE/ace/SSL/SSL_SOCK_Acceptor.h index ae1c13ccdf8..25fa8741f7d 100644 --- a/ACE/ace/SSL/SSL_SOCK_Acceptor.h +++ b/ACE/ace/SSL/SSL_SOCK_Acceptor.h @@ -138,8 +138,8 @@ public: int accept (ACE_SSL_SOCK_Stream &new_stream, ACE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0) const; + bool restart = true, + bool reset_new_handle = false) const; /** * Accept a new ACE_SSL_SOCK_Stream connection using the RVSP QoS @@ -160,8 +160,8 @@ public: ACE_Accept_QoS_Params qos_params, ACE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0) const; + bool restart = true, + bool reset_new_handle = false) const; //@} /// Meta-type info diff --git a/ACE/ace/SSL/SSL_SOCK_Connector.h b/ACE/ace/SSL/SSL_SOCK_Connector.h index 5419161cf4e..747235bd0f8 100644 --- a/ACE/ace/SSL/SSL_SOCK_Connector.h +++ b/ACE/ace/SSL/SSL_SOCK_Connector.h @@ -279,7 +279,7 @@ public: const ACE_Time_Value *timeout = 0); /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); + bool reset_new_handle (ACE_HANDLE handle); /// Meta-type info //@{ diff --git a/ACE/ace/Select_Reactor_Base.h b/ACE/ace/Select_Reactor_Base.h index 36b163d72c5..b8f86fa7d32 100644 --- a/ACE/ace/Select_Reactor_Base.h +++ b/ACE/ace/Select_Reactor_Base.h @@ -554,7 +554,7 @@ protected: /// Restart the <handle_events> event-loop method automatically when /// <select> is interrupted via <EINTR>. - int restart_; + bool restart_; /** * Position that the main ACE_Select_Reactor thread is requeued in diff --git a/ACE/ace/Select_Reactor_T.cpp b/ACE/ace/Select_Reactor_T.cpp index 23b8bff9afc..1eb5a17d79d 100644 --- a/ACE/ace/Select_Reactor_T.cpp +++ b/ACE/ace/Select_Reactor_T.cpp @@ -64,7 +64,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::any_ready_i { ACE_TRACE ("ACE_Select_Reactor_T::any_ready_i"); - int number_ready = this->ready_set_.rd_mask_.num_set () + int const number_ready = this->ready_set_.rd_mask_.num_set () + this->ready_set_.wr_mask_.num_set () + this->ready_set_.ex_mask_.num_set (); @@ -117,7 +117,9 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::owner (ACE_thread_t tid, ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); if (o_id) - *o_id = this->owner_; + { + *o_id = this->owner_; + } this->owner_ = tid; @@ -133,18 +135,18 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::owner (ACE_thread_t *t_id) return 0; } -template <class ACE_SELECT_REACTOR_TOKEN> int +template <class ACE_SELECT_REACTOR_TOKEN> bool ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::restart (void) { - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); + ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, false)); return this->restart_; } -template <class ACE_SELECT_REACTOR_TOKEN> int -ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::restart (int r) +template <class ACE_SELECT_REACTOR_TOKEN> bool +ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::restart (bool r) { - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); - int const current_value = this->restart_; + ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, false)); + bool const current_value = this->restart_; this->restart_ = r; return current_value; } @@ -367,7 +369,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ready_ops template <class ACE_SELECT_REACTOR_TOKEN> int ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::open (size_t size, - int restart, + bool restart, ACE_Sig_Handler *sh, ACE_Timer_Queue *tq, int disable_notify_pipe, @@ -444,8 +446,7 @@ template <class ACE_SELECT_REACTOR_TOKEN> int ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::set_sig_handler (ACE_Sig_Handler *signal_handler) { - if (this->delete_signal_handler_) - delete this->signal_handler_; + delete this->signal_handler_; this->signal_handler_ = signal_handler; this->delete_signal_handler_ = false; return 0; @@ -461,8 +462,7 @@ template <class ACE_SELECT_REACTOR_TOKEN> int ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::timer_queue (ACE_Timer_Queue *tq) { - if (this->delete_timer_queue_) - delete this->timer_queue_; + delete this->timer_queue_; this->timer_queue_ = tq; this->delete_timer_queue_ = false; return 0; @@ -522,7 +522,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T template <class ACE_SELECT_REACTOR_TOKEN> ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T (size_t size, - int rs, + bool restart, ACE_Sig_Handler *sh, ACE_Timer_Queue *tq, int disable_notify_pipe, @@ -538,7 +538,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T this->token_.reactor (*this); if (this->open (size, - rs, + restart, sh, tq, disable_notify_pipe, @@ -741,7 +741,9 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::reset_timer_interval ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); if (0 != this->timer_queue_) - return this->timer_queue_->reset_interval (timer_id, interval); + { + return this->timer_queue_->reset_interval (timer_id, interval); + } errno = ESHUTDOWN; return -1; @@ -809,7 +811,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::notify_handle event_handler->add_reference (); } - int status = (event_handler->*ptmf) (handle); + int const status = (event_handler->*ptmf) (handle); if (status < 0) this->remove_handler_i (handle, mask); @@ -846,13 +848,9 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::mask_ops // <wait_set_>, otherwise set the <suspend_set_>. if (this->is_suspended_i (handle)) - return this->bit_ops (handle, mask, - this->suspend_set_, - ops); + return this->bit_ops (handle, mask, this->suspend_set_, ops); else - return this->bit_ops (handle, mask, - this->wait_set_, - ops); + return this->bit_ops (handle, mask, this->wait_set_, ops); } template <class ACE_SELECT_REACTOR_TOKEN> ACE_Event_Handler * @@ -861,11 +859,12 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::find_handler_i { ACE_TRACE ("ACE_Select_Reactor_T::find_handler_i"); - ACE_Event_Handler *event_handler = - this->handler_rep_.find (handle); + ACE_Event_Handler *event_handler = this->handler_rep_.find (handle); if (event_handler) - event_handler->add_reference (); + { + event_handler->add_reference (); + } return event_handler; } @@ -879,8 +878,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handler_i ACE_Event_Handler **eh) { ACE_TRACE ("ACE_Select_Reactor_T::handler_i"); - ACE_Event_Handler *event_handler = - this->handler_rep_.find (handle); + ACE_Event_Handler *event_handler = this->handler_rep_.find (handle); if (event_handler == 0) return -1; diff --git a/ACE/ace/Select_Reactor_T.h b/ACE/ace/Select_Reactor_T.h index e41ef26a1ab..458f7ebac73 100644 --- a/ACE/ace/Select_Reactor_T.h +++ b/ACE/ace/Select_Reactor_T.h @@ -89,7 +89,7 @@ public: * for efficiency reasons. */ ACE_Select_Reactor_T (size_t size, - int restart = 0, + bool restart = false, ACE_Sig_Handler * = 0, ACE_Timer_Queue * = 0, int disable_notify_pipe = ACE_DISABLE_NOTIFY_PIPE_DEFAULT, @@ -115,7 +115,7 @@ public: * reasons. */ virtual int open (size_t max_number_of_handles = DEFAULT_SIZE, - int restart = 0, + bool restart = false, ACE_Sig_Handler * = 0, ACE_Timer_Queue * = 0, int disable_notify_pipe = ACE_DISABLE_NOTIFY_PIPE_DEFAULT, @@ -261,8 +261,8 @@ public: ACE_Sig_Action *new_disp = 0); /** - * Removes the @a mask binding of <eh> from the Select_Reactor. If - * there are no more bindings for this <eh> then it is removed from + * Removes the @a mask binding of @a eh from the Select_Reactor. If + * there are no more bindings for this @a eh then it is removed from * the Select_Reactor. Note that the Select_Reactor will call * <ACE_Event_Handler::get_handle> to extract the underlying I/O * handle. @@ -272,8 +272,8 @@ public: /** * Removes the @a mask bind of <Event_Handler> whose handle is - * <handle> from the Select_Reactor. If there are no more bindings - * for this <eh> then it is removed from the Select_Reactor. + * @a handle from the Select_Reactor. If there are no more bindings + * for this @a eh then it is removed from the Select_Reactor. */ virtual int remove_handler (ACE_HANDLE handle, ACE_Reactor_Mask); @@ -303,10 +303,10 @@ public: // = Suspend and resume Handlers. - /// Temporarily suspend the <Event_Handler> associated with <eh>. + /// Temporarily suspend the <Event_Handler> associated with @a eh. virtual int suspend_handler (ACE_Event_Handler *eh); - /// Temporarily suspend the <Event_Handler> associated with <handle>. + /// Temporarily suspend the <Event_Handler> associated with @a handle. virtual int suspend_handler (ACE_HANDLE handle); /// Suspend all <handles> in handle set temporarily. @@ -316,11 +316,11 @@ public: virtual int suspend_handlers (void); /// Resume a temporarily suspend <Event_Handler> associated with - /// <eh>. + /// @a eh. virtual int resume_handler (ACE_Event_Handler *eh); /// Resume a temporarily suspended <Event_Handler> associated with - /// <handle>. + /// @a handle. virtual int resume_handler (ACE_HANDLE handle); /// Resume all <handles> in handle set. @@ -330,12 +330,12 @@ public: virtual int resume_handlers (void); /** - * Return 1 if we any event associations were made by the reactor - * for the handles that it waits on, 0 otherwise. Since the + * Return true if we any event associations were made by the reactor + * for the handles that it waits on, false otherwise. Since the * Select_Reactor does not do any event associations, this function - * always return 0. + * always return false. */ - virtual int uses_event_associations (void); + virtual bool uses_event_associations (void); // = Timer management. /** @@ -396,19 +396,19 @@ public: // = High-level Event_Handler scheduling operations - /// ADD the dispatch MASK "bit" bound with the <eh> and the @a mask. + /// ADD the dispatch MASK "bit" bound with the @a eh and the @a mask. virtual int schedule_wakeup (ACE_Event_Handler *eh, ACE_Reactor_Mask mask); - /// ADD the dispatch MASK "bit" bound with the <handle> and the @a mask. + /// ADD the dispatch MASK "bit" bound with the @a handle and the @a mask. virtual int schedule_wakeup (ACE_HANDLE handle, ACE_Reactor_Mask mask); - /// CLR the dispatch MASK "bit" bound with the <eh> and the @a mask. + /// CLR the dispatch MASK "bit" bound with the @a eh and the @a mask. virtual int cancel_wakeup (ACE_Event_Handler *eh, ACE_Reactor_Mask mask); - /// CLR the dispatch MASK "bit" bound with the <handle> and the @a mask. + /// CLR the dispatch MASK "bit" bound with the @a handle and the @a mask. virtual int cancel_wakeup (ACE_HANDLE handle, ACE_Reactor_Mask mask); @@ -449,10 +449,10 @@ public: virtual int max_notify_iterations (void); /// Get the existing restart value. - virtual int restart (void); + virtual bool restart (void); /// Set a new value for restart and return the original value. - virtual int restart (int r); + virtual bool restart (bool r); /// Set position that the main ACE_Select_Reactor thread is requeued in the /// list of waiters during a <notify> callback. @@ -463,25 +463,25 @@ public: virtual int requeue_position (void); // = Low-level wait_set mask manipulation methods. - /// GET/SET/ADD/CLR the dispatch mask "bit" bound with the <eh> and + /// GET/SET/ADD/CLR the dispatch mask "bit" bound with the @a eh and /// @a mask. virtual int mask_ops (ACE_Event_Handler *eh, ACE_Reactor_Mask mask, int ops); - /// GET/SET/ADD/CLR the dispatch MASK "bit" bound with the <handle> + /// GET/SET/ADD/CLR the dispatch MASK "bit" bound with the @a handle /// and @a mask. virtual int mask_ops (ACE_HANDLE handle, ACE_Reactor_Mask mask, int ops); // = Low-level ready_set mask manipulation methods. - /// GET/SET/ADD/CLR the ready "bit" bound with the <eh> and @a mask. + /// GET/SET/ADD/CLR the ready "bit" bound with the @a eh and @a mask. virtual int ready_ops (ACE_Event_Handler *eh, ACE_Reactor_Mask mask, int ops); - /// GET/SET/ADD/CLR the ready "bit" bound with the <handle> and @a mask. + /// GET/SET/ADD/CLR the ready "bit" bound with the @a handle and @a mask. virtual int ready_ops (ACE_HANDLE handle, ACE_Reactor_Mask, int ops); @@ -500,15 +500,15 @@ public: // = Miscellaneous Handler operations. /** - * Return the Event_Handler associated with <handle>. Return 0 if - * <handle> is not registered. + * Return the Event_Handler associated with @a handle. Return 0 if + * @a handle is not registered. */ virtual ACE_Event_Handler *find_handler (ACE_HANDLE handle); /** - * Check to see if <handle> is associated with a valid Event_Handler + * Check to see if @a handle is associated with a valid Event_Handler * bound to @a mask. Return the @a eh associated with this @a handler - * if <eh> != 0. + * if @a eh != 0. */ virtual int handler (ACE_HANDLE handle, ACE_Reactor_Mask mask, @@ -516,8 +516,8 @@ public: /** * Check to see if @a signum is associated with a valid Event_Handler - * bound to a signal. Return the <eh> associated with this - * handler if <eh> != 0. + * bound to a signal. Return the @a eh associated with this + * handler if @a eh != 0. */ virtual int handler (int signum, ACE_Event_Handler ** = 0); @@ -550,7 +550,7 @@ protected: // All of these methods assume that the token // lock is held by the public methods that call down to them. - /// Do the work of actually binding the <handle> and <eh> with the + /// Do the work of actually binding the @a handle and @a eh with the /// @a mask. virtual int register_handler_i (ACE_HANDLE handle, ACE_Event_Handler *eh, @@ -561,7 +561,7 @@ protected: ACE_Event_Handler *handler, ACE_Reactor_Mask mask); - /// Do the work of actually unbinding the <handle> and <eh> with the + /// Do the work of actually unbinding the @a handle and @a eh with the /// @a mask. virtual int remove_handler_i (ACE_HANDLE handle, ACE_Reactor_Mask); @@ -570,14 +570,14 @@ protected: virtual int remove_handler_i (const ACE_Handle_Set &handles, ACE_Reactor_Mask); - /// Suspend the <Event_Handler> associated with <handle> + /// Suspend the <Event_Handler> associated with @a handle virtual int suspend_i (ACE_HANDLE handle); - /// Check to see if the <Event_Handler> associated with <handle> is + /// Check to see if the <Event_Handler> associated with @a handle is /// suspended. Returns 0 if not, 1 if so. virtual int is_suspended_i (ACE_HANDLE handle); - /// Resume the <Event_Handler> associated with <handle> + /// Resume the <Event_Handler> associated with @a handle virtual int resume_i (ACE_HANDLE handle); /// Implement the public handler method. @@ -593,7 +593,7 @@ protected: /** * Check if there are any HANDLEs enabled in the <ready_set_>, and - * if so, update the <handle_set> and return the number ready. If + * if so, update the @a handle_set and return the number ready. If * there aren't any HANDLEs enabled return 0. */ virtual int any_ready (ACE_Select_Reactor_Handle_Set &handle_set); @@ -666,8 +666,8 @@ protected: ACE_Handle_Set& ready_mask, ACE_EH_PTMF callback); - /// Notify the appropriate <callback> in the context of the <eh> - /// associated with <handle> that a particular event has occurred. + /// Notify the appropriate <callback> in the context of the @a eh + /// associated with @a handle that a particular event has occurred. virtual void notify_handle (ACE_HANDLE handle, ACE_Reactor_Mask mask, ACE_Handle_Set &, diff --git a/ACE/ace/Select_Reactor_T.inl b/ACE/ace/Select_Reactor_T.inl index ebbdfba1e5f..1e5a96fe31a 100644 --- a/ACE/ace/Select_Reactor_T.inl +++ b/ACE/ace/Select_Reactor_T.inl @@ -116,12 +116,12 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::remove_handler (int signum, } template <class ACE_SELECT_REACTOR_TOKEN> -ACE_INLINE int +ACE_INLINE bool ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::uses_event_associations (void) { // Since the Select_Reactor does not do any event associations, this - // function always return 0. - return 0; + // function always return false. + return false; } // = The remaining methods in this file must be called with locks diff --git a/ACE/ace/Service_Manager.cpp b/ACE/ace/Service_Manager.cpp index 5561ee6ad44..30ca81e4074 100644 --- a/ACE/ace/Service_Manager.cpp +++ b/ACE/ace/Service_Manager.cpp @@ -68,7 +68,7 @@ ACE_Service_Manager::open (const ACE_INET_Addr &sia) { return -1; } - + return 0; } @@ -89,7 +89,7 @@ ACE_Service_Manager::info (ACE_TCHAR **strp, size_t length) const sa.get_port_number (), ACE_TEXT ("tcp"), ACE_TEXT ("# lists all services in the daemon\n")); - + if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) { return -1; @@ -98,7 +98,7 @@ ACE_Service_Manager::info (ACE_TCHAR **strp, size_t length) const { ACE_OS::strsncpy (*strp, buf, length); } - + return static_cast<int> (ACE_OS::strlen (buf)); } @@ -143,7 +143,7 @@ ACE_Service_Manager::init (int argc, ACE_TCHAR *argv[]) ACE_TEXT ("registering service with ACE_Reactor\n")), -1); } - + return 0; } @@ -160,18 +160,18 @@ ACE_Service_Manager::fini (void) ACE_TRACE ("ACE_Service_Manager::fini"); int retv = 0; - + if (this->get_handle () != ACE_INVALID_HANDLE) { retv = ACE_Reactor::instance ()->remove_handler ( this, ACE_Event_Handler::ACCEPT_MASK | ACE_Event_Handler::DONT_CALL); - + this->handle_close (ACE_INVALID_HANDLE, ACE_Event_Handler::NULL_MASK); } - + return retv; } @@ -227,7 +227,7 @@ ACE_Service_Manager::list_services (void) if (len > 0) { ssize_t n = this->client_stream_.send_n (buf, len); - + if (n <= 0 && errno != EPIPE) { ACE_ERROR ((LM_ERROR, @@ -315,7 +315,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) // created handle. This is because the newly created handle will // inherit the properties of the listen handle, including its event // associations. - int reset_new_handle = + bool reset_new_handle = ACE_Reactor::instance ()->uses_event_associations (); if (this->acceptor_.accept (this->client_stream_, // stream @@ -334,7 +334,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) ACE_TEXT ("client_stream fd = %d\n"), this->client_stream_.get_handle ())); ACE_INET_Addr sa; - + if (this->client_stream_.get_remote_addr (sa) == -1) { return -1; @@ -361,12 +361,12 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) // contains an incomplete string. int error; - + do { result = client_stream_.recv (offset, remaining); error = errno; - + if (result == 0 && error != EWOULDBLOCK) { remaining = 0; @@ -403,7 +403,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) ACE_TEXT ("%p\n"), ACE_TEXT ("recv"))); } - + break; case 0: return 0; @@ -430,7 +430,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) ACE_TEXT ("%p\n"), ACE_TEXT ("close"))); } - + return 0; } diff --git a/ACE/ace/Service_Object.h b/ACE/ace/Service_Object.h index 1109bc19f32..10f733fe54e 100644 --- a/ACE/ace/Service_Object.h +++ b/ACE/ace/Service_Object.h @@ -53,10 +53,10 @@ public: /// Destructor. virtual ~ACE_Service_Object (void); - /// Temporarily disable a service without removing it completely. + /// Temporarily disable a service without removing it completely. virtual int suspend (void); - /// Re-enable a previously suspended service. + /// Re-enable a previously suspended service. virtual int resume (void); }; @@ -162,7 +162,7 @@ private: * * 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 + * ACE_Service_Objects, as shown in the * ./netsvcs/server/main.cpp example. */ class ACE_Export ACE_Service_Object_Ptr diff --git a/ACE/ace/Strategies_T.cpp b/ACE/ace/Strategies_T.cpp index 9eb85b93927..6aaef5eb2cc 100644 --- a/ACE/ace/Strategies_T.cpp +++ b/ACE/ace/Strategies_T.cpp @@ -301,7 +301,7 @@ ACE_Thread_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *svc_handler template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open - (const ACE_PEER_ACCEPTOR_ADDR &local_addr, int reuse_addr) + (const ACE_PEER_ACCEPTOR_ADDR &local_addr, bool reuse_addr) { this->reuse_addr_ = reuse_addr; this->peer_acceptor_addr_ = local_addr; @@ -321,7 +321,7 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy (const ACE_PEER_ACCEPTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, ACE_Reactor *reactor) : reactor_ (reactor) { @@ -344,7 +344,7 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler // created handle. This is because the newly created handle will // inherit the properties of the listen handle, including its event // associations. - int reset_new_handle = this->reactor_->uses_event_associations (); + bool reset_new_handle = this->reactor_->uses_event_associations (); if (this->peer_acceptor_.accept (svc_handler->peer (), // stream 0, // remote address @@ -372,7 +372,7 @@ ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms) { @@ -394,7 +394,7 @@ ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms) { @@ -646,7 +646,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::check_hin const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms, CONNECTION_MAP_ENTRY *&entry, @@ -721,7 +721,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::find_or_c const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms, CONNECTION_MAP_ENTRY *&entry, @@ -816,7 +816,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::new_conne const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms) { @@ -840,7 +840,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_s const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms) { @@ -905,7 +905,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_s const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms) { @@ -972,7 +972,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_s const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms, int& found) diff --git a/ACE/ace/Strategies_T.h b/ACE/ace/Strategies_T.h index 4acb9411d98..2dd8c2fd543 100644 --- a/ACE/ace/Strategies_T.h +++ b/ACE/ace/Strategies_T.h @@ -511,13 +511,13 @@ public: /// Initialize the @c peer_acceptor_ with @a local_addr. ACE_Accept_Strategy (const ACE_PEER_ACCEPTOR_ADDR &local_addr, - int restart = 0, + bool restart = false, ACE_Reactor *reactor = ACE_Reactor::instance ()); /// Initialize the <peer_acceptor_> with @a local_addr, indicating /// whether to @a reuse_addr if it's already in use. virtual int open (const ACE_PEER_ACCEPTOR_ADDR &local_addr, - int reuse_addr = 0); + bool reuse_addr = false); /// Return the underlying ACE_HANDLE of the <peer_acceptor_>. virtual ACE_HANDLE get_handle (void) const; @@ -546,7 +546,7 @@ protected: ACE_Reactor *reactor_; /// Needed to reopen the socket if <accept> fails. - int reuse_addr_; + bool reuse_addr_; /// Needed to reopen the socket if <accept> fails. ACE_PEER_ACCEPTOR_ADDR peer_acceptor_addr_; @@ -588,7 +588,7 @@ public: const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms); @@ -602,7 +602,7 @@ public: const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms); @@ -905,7 +905,7 @@ public: const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms); virtual int connect_svc_handler (SVC_HANDLER *&sh, @@ -913,7 +913,7 @@ public: const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms); @@ -965,7 +965,7 @@ protected: const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms); @@ -995,7 +995,7 @@ protected: const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms, CONNECTION_MAP_ENTRY *&entry, @@ -1005,7 +1005,7 @@ protected: const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms, CONNECTION_MAP_ENTRY *&entry, @@ -1016,7 +1016,7 @@ protected: const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms, int &found); diff --git a/ACE/ace/TLI_Acceptor.cpp b/ACE/ace/TLI_Acceptor.cpp index b6820c5db4e..0fdd265fb7a 100644 --- a/ACE/ace/TLI_Acceptor.cpp +++ b/ACE/ace/TLI_Acceptor.cpp @@ -30,7 +30,7 @@ public: ACE_HANDLE open (ACE_HANDLE fd, int size); int close (void); - int enqueue (const char device[], int restart, int rwflag); + int enqueue (const char device[], bool restart, int rwflag); int dequeue (ACE_TLI_Request *&ptr); int remove (int sequence_number); @@ -238,7 +238,7 @@ ACE_TLI_Request_Queue::ACE_TLI_Request_Queue (void) int ACE_TLI_Request_Queue::enqueue (const char device[], - int restart, int rwflag) + bool restart, int rwflag) { ACE_TRACE ("ACE_TLI_Request_Queue::enqueue"); ACE_TLI_Request *temp = this->alloc (); @@ -430,7 +430,7 @@ ACE_TLI_Acceptor::close (void) // events while we are trying to accept a new connection request. int -ACE_TLI_Acceptor::handle_async_event (int restart, int rwf) +ACE_TLI_Acceptor::handle_async_event (bool restart, int rwf) { ACE_TRACE ("ACE_TLI_Acceptor::handle_async_event"); int event = this->look (); @@ -456,8 +456,8 @@ int ACE_TLI_Acceptor::accept (ACE_TLI_Stream &new_tli_sap, ACE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle, + bool restart, + bool reset_new_handle, int rwf, netbuf *udata, netbuf *opt) diff --git a/ACE/ace/TLI_Acceptor.h b/ACE/ace/TLI_Acceptor.h index 7a6577800ad..db916368966 100644 --- a/ACE/ace/TLI_Acceptor.h +++ b/ACE/ace/TLI_Acceptor.h @@ -80,8 +80,8 @@ public: 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, + bool restart = true, + bool reset_new_handle = false, int rwflag = 1, netbuf *udata = 0, netbuf *opt = 0); @@ -107,7 +107,7 @@ private: int rwflag_; /// Handle TLI accept insanity... - int handle_async_event (int restart, int rwflag); + int handle_async_event (bool restart, int rwflag); /// Used for queueing up pending requests. ACE_TLI_Request_Queue *queue_; diff --git a/ACE/ace/TLI_Connector.h b/ACE/ace/TLI_Connector.h index 971b9c82b92..9dc42123101 100644 --- a/ACE/ace/TLI_Connector.h +++ b/ACE/ace/TLI_Connector.h @@ -106,7 +106,7 @@ public: ACE_Time_Value *tv); /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); + bool reset_new_handle (ACE_HANDLE handle); // = Meta-type info typedef ACE_INET_Addr PEER_ADDR; diff --git a/ACE/ace/TLI_Connector.inl b/ACE/ace/TLI_Connector.inl index 8dc40b1eaa6..bce426abc13 100644 --- a/ACE/ace/TLI_Connector.inl +++ b/ACE/ace/TLI_Connector.inl @@ -38,12 +38,11 @@ ACE_TLI_Connector::ACE_TLI_Connector (ACE_TLI_Stream &new_stream, } ACE_INLINE -int -ACE_TLI_Connector::reset_new_handle (ACE_HANDLE handle) +bool +ACE_TLI_Connector::reset_new_handle (ACE_HANDLE) { - ACE_UNUSED_ARG (handle); // Nothing to do here since the handle is not a socket - return 0; + return false; } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/TP_Reactor.cpp b/ACE/ace/TP_Reactor.cpp index da3c6e69aa9..f0df1119550 100644 --- a/ACE/ace/TP_Reactor.cpp +++ b/ACE/ace/TP_Reactor.cpp @@ -109,7 +109,7 @@ ACE_TP_Reactor::ACE_TP_Reactor (ACE_Sig_Handler *sh, } ACE_TP_Reactor::ACE_TP_Reactor (size_t max_number_of_handles, - int restart, + bool restart, ACE_Sig_Handler *sh, ACE_Timer_Queue *tq, bool mask_signals, diff --git a/ACE/ace/TP_Reactor.h b/ACE/ace/TP_Reactor.h index 430fcf053b5..de59c8b8af1 100644 --- a/ACE/ace/TP_Reactor.h +++ b/ACE/ace/TP_Reactor.h @@ -192,7 +192,7 @@ public: * timer queue, respectively. */ ACE_TP_Reactor (size_t max_number_of_handles, - int restart = 0, + bool restart = false, ACE_Sig_Handler *sh = 0, ACE_Timer_Queue *tq = 0, bool mask_signals = true, diff --git a/ACE/ace/TkReactor/TkReactor.cpp b/ACE/ace/TkReactor/TkReactor.cpp index 942f66d7d1d..23b446230f4 100644 --- a/ACE/ace/TkReactor/TkReactor.cpp +++ b/ACE/ace/TkReactor/TkReactor.cpp @@ -11,7 +11,7 @@ ACE_ALLOC_HOOK_DEFINE (ACE_TkReactor) // Must be called with lock held ACE_TkReactor::ACE_TkReactor (size_t size, - int restart, + bool restart, ACE_Sig_Handler *h) : ACE_Select_Reactor (size, restart, h), ids_ (0), diff --git a/ACE/ace/TkReactor/TkReactor.h b/ACE/ace/TkReactor/TkReactor.h index 159022a518b..d5ffb997492 100644 --- a/ACE/ace/TkReactor/TkReactor.h +++ b/ACE/ace/TkReactor/TkReactor.h @@ -63,7 +63,7 @@ class ACE_TkReactor_Export ACE_TkReactor : public ACE_Select_Reactor public: // = Initialization and termination methods. ACE_TkReactor (size_t size = DEFAULT_SIZE, - int restart = 0, + bool restart = false, ACE_Sig_Handler * = 0); virtual ~ACE_TkReactor (void); diff --git a/ACE/ace/UPIPE_Acceptor.cpp b/ACE/ace/UPIPE_Acceptor.cpp index 08878a8b5c5..f3d17b8dd2b 100644 --- a/ACE/ace/UPIPE_Acceptor.cpp +++ b/ACE/ace/UPIPE_Acceptor.cpp @@ -72,8 +72,8 @@ int ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream, ACE_UPIPE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) + bool restart, + bool reset_new_handle) { ACE_TRACE ("ACE_UPIPE_Acceptor::accept"); ACE_UNUSED_ARG (reset_new_handle); diff --git a/ACE/ace/UPIPE_Acceptor.h b/ACE/ace/UPIPE_Acceptor.h index b7b94179cb6..4e7b62f94e3 100644 --- a/ACE/ace/UPIPE_Acceptor.h +++ b/ACE/ace/UPIPE_Acceptor.h @@ -69,8 +69,8 @@ public: 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); + bool restart = true, + bool reset_new_handle = false); /// Dump the state of an object. void dump (void) const; diff --git a/ACE/ace/UPIPE_Connector.h b/ACE/ace/UPIPE_Connector.h index 77bbf00550e..5e0b4e1a531 100644 --- a/ACE/ace/UPIPE_Connector.h +++ b/ACE/ace/UPIPE_Connector.h @@ -89,7 +89,7 @@ public: int perms = 0); /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); + bool reset_new_handle (ACE_HANDLE handle); // = Meta-type info typedef ACE_UPIPE_Addr PEER_ADDR; diff --git a/ACE/ace/UPIPE_Connector.inl b/ACE/ace/UPIPE_Connector.inl index 24252234f2e..5b3d2513b20 100644 --- a/ACE/ace/UPIPE_Connector.inl +++ b/ACE/ace/UPIPE_Connector.inl @@ -24,11 +24,11 @@ ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream, ACE_TEXT ("ACE_UPIPE_Connector"))); } -ACE_INLINE int +ACE_INLINE bool ACE_UPIPE_Connector::reset_new_handle (ACE_HANDLE /* handle */) { // Nothing to do here since the handle is not a socket - return 0; + return false; } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Unbounded_Queue.cpp b/ACE/ace/Unbounded_Queue.cpp index 96a1603952a..8db9ceaff53 100644 --- a/ACE/ace/Unbounded_Queue.cpp +++ b/ACE/ace/Unbounded_Queue.cpp @@ -154,7 +154,6 @@ ACE_Unbounded_Queue<T>::~ACE_Unbounded_Queue (void) this->allocator_->free, ACE_Node, <T>); - this->head_ = 0; } template <class T> int diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp index 42e69e69082..b2f849ae3ad 100644 --- a/ACE/ace/WFMO_Reactor.cpp +++ b/ACE/ace/WFMO_Reactor.cpp @@ -1137,15 +1137,12 @@ ACE_WFMO_Reactor::current_info (ACE_HANDLE, size_t &) int ACE_WFMO_Reactor::open (size_t size, - int unused, + bool, ACE_Sig_Handler *sh, ACE_Timer_Queue *tq, - int disable_notify_pipe, + int, ACE_Reactor_Notify *notify) { - ACE_UNUSED_ARG (unused); - ACE_UNUSED_ARG (disable_notify_pipe); - // This GUARD is necessary since we are updating shared state. ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); diff --git a/ACE/ace/WFMO_Reactor.h b/ACE/ace/WFMO_Reactor.h index a791e5230a4..a0ad4c95d4b 100644 --- a/ACE/ace/WFMO_Reactor.h +++ b/ACE/ace/WFMO_Reactor.h @@ -337,7 +337,7 @@ public: // = Sanity checking. - // Check the <handle> to make sure it's a valid ACE_HANDLE + // Check the @a handle to make sure it's a valid ACE_HANDLE int invalid_handle (ACE_HANDLE handle) const; // = Accessors. @@ -412,13 +412,13 @@ public: ACE_Reactor_Mask to_be_removed_masks); /** - * Return the Event_Handler associated with <handle>. Return 0 if - * <handle> is not registered. + * Return the Event_Handler associated with @a handle. Return 0 if + * @a handle is not registered. */ ACE_Event_Handler *find_handler (ACE_HANDLE handle); /** - * Check to see if <handle> is associated with a valid Event_Handler + * Check to see if @a handle is associated with a valid Event_Handler * bound to @a mask. Return the <event_handler> associated with this * @a handler if <event_handler> != 0. */ @@ -427,7 +427,7 @@ public: ACE_Event_Handler **event_handler = 0); /** - * Check to see if <handle> is associated with a valid + * Check to see if @a handle is associated with a valid * Event_Handler. Return Event_Handler and associated masks. */ ACE_Event_Handler *handler (ACE_HANDLE handle, @@ -540,7 +540,7 @@ public: /// Verify whether the buffer has dispatchable info or not. virtual int is_dispatchable (ACE_Notification_Buffer &buffer); - /// Read one of the notify call on the <handle> into the + /// Read one of the notify call on the @a handle into the /// <buffer>. This could be because of a thread trying to unblock /// the <Reactor_Impl> virtual int read_notify_pipe (ACE_HANDLE handle, @@ -570,7 +570,7 @@ public: /** * Purge any notifications pending in this reactor for the specified - * ACE_Event_Handler object. If <eh> == 0, all notifications for all + * ACE_Event_Handler object. If @a eh == 0, all notifications for all * handlers are removed (but not any notifications posted just to wake up * the reactor itself). Returns the number of notifications purged. * Returns -1 on error. @@ -697,7 +697,7 @@ public: * used for internal management purposes. */ virtual int open (size_t size = ACE_WFMO_Reactor::DEFAULT_SIZE, - int restart = 0, + bool restart = false, ACE_Sig_Handler * = 0, ACE_Timer_Queue * = 0, int disable_notify_pipe = 0, @@ -790,9 +790,9 @@ public: /** * 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 + * @a handle being passed in is an event handle and when the event * becomes signaled, <WFMO_Reactor> will call handle_signal on - * <event_handler>. If <handle> == <ACE_INVALID_HANDLE> the + * <event_handler>. If @a handle == <ACE_INVALID_HANDLE> the * <ACE_WFMO_Reactor> will call the <get_handle> method of * <event_handler> to extract the underlying event handle. */ @@ -861,20 +861,20 @@ public: * the <ACE_WFMO_Reactor> will call the <get_handle> method of * <event_handler> to extract the underlying handle. If @a mask == * ACE_Event_Handler::DONT_CALL then the <handle_close> method of - * the <event_handler> is not invoked. Note that the <handle> can + * the <event_handler> is not invoked. Note that the @a handle can * either be the <event_handle> or the <io_handle> */ virtual int remove_handler (ACE_Event_Handler *event_handler, ACE_Reactor_Mask mask); /** - * Removes <handle> from the <ACE_WFMO_Reactor>. If @a mask == + * Removes @a handle from the <ACE_WFMO_Reactor>. If @a mask == * ACE_Event_Handler::DONT_CALL then the <handle_close> method of - * the <event_handler> is not invoked. Note that the <handle> can + * the <event_handler> is not invoked. Note that the @a handle can * either be the <event_handle> or the <io_handle> * * For the case of I/O entries, this removes the @a mask binding of - * <Event_Handler> whose handle is <handle> from <WFMO_Reactor>. If + * <Event_Handler> whose handle is @a handle from <WFMO_Reactor>. If * there are no more bindings for this <event_handler> then it is * removed from the WFMO_Reactor. For simple event entries, mask is * mostly ignored and the <Event_Handler> is always removed from @@ -912,7 +912,7 @@ public: /// <ACE_Event_Handler::get_handle> to get the handle. virtual int suspend_handler (ACE_Event_Handler *event_handler); - /// Suspend <handle> temporarily. + /// Suspend @a handle temporarily. virtual int suspend_handler (ACE_HANDLE handle); /// Suspend all <handles> in handle set temporarily. @@ -925,7 +925,7 @@ public: /// get the handle. virtual int resume_handler (ACE_Event_Handler *event_handler); - /// Resume <handle>. + /// Resume @a handle. virtual int resume_handler (ACE_HANDLE handle); /// Resume all <handles> in handle set. @@ -941,12 +941,12 @@ public: virtual int resumable_handler (void); /** - * Return 1 if we any event associations were made by the reactor - * for the handles that it waits on, 0 otherwise. Since the + * Return true if we any event associations were made by the reactor + * for the handles that it waits on, false otherwise. Since the * WFMO_Reactor does use event associations, this function always - * return 1. + * return true. */ - virtual int uses_event_associations (void); + virtual bool uses_event_associations (void); // Timer management. @@ -1012,7 +1012,7 @@ public: /** * Add @a masks_to_be_added to the @a handle's entry in WFMO_Reactor. - * The Event_Handler associated with <handle> must already have been + * The Event_Handler associated with @a handle must already have been * registered with WFMO_Reactor. */ virtual int schedule_wakeup (ACE_HANDLE handle, @@ -1129,10 +1129,10 @@ public: virtual int owner (ACE_thread_t *owner); /// Get the existing restart value. - virtual int restart (void); + virtual bool restart (void); /// Set a new value for restart and return the original value. - virtual int restart (int r); + virtual bool restart (bool r); /// Not implemented virtual void requeue_position (int); diff --git a/ACE/ace/WFMO_Reactor.inl b/ACE/ace/WFMO_Reactor.inl index ff83ab84ece..8a97a6526ed 100644 --- a/ACE/ace/WFMO_Reactor.inl +++ b/ACE/ace/WFMO_Reactor.inl @@ -865,12 +865,12 @@ ACE_WFMO_Reactor::resume_handlers (void) return error ? -1 : 0; } -ACE_INLINE int +ACE_INLINE bool ACE_WFMO_Reactor::uses_event_associations (void) { // Since the WFMO_Reactor does use event associations, this function // always return 1. - return 1; + return true; } ACE_INLINE int @@ -1104,16 +1104,16 @@ ACE_WFMO_Reactor::requeue_position (void) ACE_NOTSUP_RETURN (-1); } -ACE_INLINE int +ACE_INLINE bool ACE_WFMO_Reactor::restart (void) { - return 0; + return false; } -ACE_INLINE int -ACE_WFMO_Reactor::restart (int) +ACE_INLINE bool +ACE_WFMO_Reactor::restart (bool) { - return 0; + return false; } ACE_INLINE int diff --git a/ACE/ace/XtReactor/XtReactor.cpp b/ACE/ace/XtReactor/XtReactor.cpp index 7bdef11b936..8159b24bf4d 100644 --- a/ACE/ace/XtReactor/XtReactor.cpp +++ b/ACE/ace/XtReactor/XtReactor.cpp @@ -14,7 +14,7 @@ ACE_ALLOC_HOOK_DEFINE (ACE_XtReactor) // Must be called with lock held ACE_XtReactor::ACE_XtReactor (XtAppContext context, size_t size, - int restart, + bool restart, ACE_Sig_Handler *h) : ACE_Select_Reactor (size, restart, h), context_ (context), diff --git a/ACE/ace/XtReactor/XtReactor.h b/ACE/ace/XtReactor/XtReactor.h index ee1aa882710..f3483fcd35a 100644 --- a/ACE/ace/XtReactor/XtReactor.h +++ b/ACE/ace/XtReactor/XtReactor.h @@ -60,7 +60,7 @@ public: // = Initialization and termination methods. ACE_XtReactor (XtAppContext context = 0, size_t size = DEFAULT_SIZE, - int restart = 0, + bool restart = false, ACE_Sig_Handler * = 0); virtual ~ACE_XtReactor (void); diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc index eac066ea00c..1a4d562211f 100644 --- a/ACE/ace/ace_for_tao.mpc +++ b/ACE/ace/ace_for_tao.mpc @@ -195,7 +195,7 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, } // ACE_Token implementation uses semaphores on Windows and VxWorks. - conditional(vc6,vc71,vc8,vc9,nmake,bmake,borland) { + conditional(vc6,vc71,vc8,vc9,nmake,bmake) { NT_Service.cpp // Required by ace_for_tao sponsors Semaphore.cpp Process_Mutex.cpp diff --git a/ACE/ace/ace_qt3reactor.mpc b/ACE/ace/ace_qt3reactor.mpc index 6f64672c34b..de810925e8e 100644 --- a/ACE/ace/ace_qt3reactor.mpc +++ b/ACE/ace/ace_qt3reactor.mpc @@ -11,7 +11,6 @@ project(ACE_Qt3Reactor) : acedefaults, install, acelib, ace_output, ace_qt3 { } Source_Files { - QtReactor/QtReactor_moc.cpp QtReactor } diff --git a/ACE/ace/config-WinCE.h b/ACE/ace/config-WinCE.h index 4f94ac7086d..76ed2d2eed3 100644 --- a/ACE/ace/config-WinCE.h +++ b/ACE/ace/config-WinCE.h @@ -80,6 +80,8 @@ #define ACE_LACKS_GETPROCESSTIMES #define ACE_LACKS_PDH_H #define ACE_LACKS_PDHMSG_H +#define ACE_LACKS_TIME +#define ACE_LACKS_TZSET #define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1 @@ -180,6 +182,8 @@ #define ACE_LACKS_STRCASECMP // WinCE doesn't support _stricmp #define ACE_LACKS_GETSERVBYNAME #define ACE_LACKS_ACCESS +#define ACE_LACKS__WACCESS +#define ACE_HAS_ACCESS_EMULATION #define ACE_LACKS_FILELOCKS #define ACE_LACKS_EXEC #define ACE_LACKS_MKTEMP @@ -193,7 +197,7 @@ #define ACE_LACKS_PIPE //#define ACE_LACKS_CUSERID -//#define ACE_LACKS_CHDIR +#define ACE_LACKS_CHDIR #define ACE_LACKS_ENV #define ACE_LACKS_HOSTNAME #define ACE_LACKS_REALPATH diff --git a/ACE/ace/config-borland-common.h b/ACE/ace/config-borland-common.h index c3a33ab5fc9..ac2d58df2e1 100644 --- a/ACE/ace/config-borland-common.h +++ b/ACE/ace/config-borland-common.h @@ -47,7 +47,6 @@ # define ACE_HAS_USER_MODE_MASKS 1 # define ACE_LACKS_ACE_IOSTREAM 1 # define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 -# define ACE_LACKS_STRPTIME 1 # if (__BORLANDC__ < 0x590) # define ACE_LACKS_PLACEMENT_OPERATOR_DELETE 1 # endif diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h index a3a17f75a20..c3d709c3645 100644 --- a/ACE/ace/config-linux-common.h +++ b/ACE/ace/config-linux-common.h @@ -396,6 +396,8 @@ #define ACE_HAS_VOIDPTR_MMAP +#define ACE_HAS_ICMP_SUPPORT 1 + #if defined (ACE_LACKS_NETWORKING) # include "ace/config-posix-nonetworking.h" #else diff --git a/ACE/ace/config-mvs.h b/ACE/ace/config-mvs.h index 4545e151d0f..785f94209d2 100644 --- a/ACE/ace/config-mvs.h +++ b/ACE/ace/config-mvs.h @@ -13,7 +13,6 @@ #define NSIG 44 /* missing from Signal.h */ #define MAXHOSTNAMELEN 256 /* missing form netdb.h */ #define howmany __howmany /* MVS uses different names than most others */ -#define fd_mask __fd_mask #define MAXNAMLEN __DIR_NAME_MAX #if defined (log) /* log is a macro in math.h */ # undef log /* conflicts with log function in ACE */ @@ -111,6 +110,7 @@ #define ACE_LACKS_THREAD_PROCESS_SCOPING #define ACE_LACKS_PTHREAD_ATTR_SETSTACKADDR #define ACE_LACKS_TIMESPEC_T +#define ACE_LACKS_FD_MASK #if !defined (ACE_MT_SAFE) # define ACE_MT_SAFE 1 diff --git a/ACE/ace/config-qnx-rtp-62x.h b/ACE/ace/config-qnx-rtp-62x.h index 6ccea40af39..2deaa6b78f8 100644 --- a/ACE/ace/config-qnx-rtp-62x.h +++ b/ACE/ace/config-qnx-rtp-62x.h @@ -99,6 +99,8 @@ #define ACE_LACKS_T_ERRNO #define ACE_LACKS_U_LONGLONG_T #define ACE_LACKS_ALPHASORT +#define ACE_LACKS_FD_MASK +#define ACE_LACKS_NFDBITS #define ACE_LACKS_RLIMIT // QNX rlimit syscalls don't work properly with ACE. diff --git a/ACE/ace/config-qnx-rtp-pre62x.h b/ACE/ace/config-qnx-rtp-pre62x.h index 00ad0166f18..f3696811662 100644 --- a/ACE/ace/config-qnx-rtp-pre62x.h +++ b/ACE/ace/config-qnx-rtp-pre62x.h @@ -105,6 +105,8 @@ #define ACE_LACKS_UCONTEXT_H #define ACE_LACKS_UNIX_DOMAIN_SOCKETS #define ACE_LACKS_U_LONGLONG_T +#define ACE_LACKS_FD_MASK +#define ACE_LACKS_NFDBITS #define ACE_LACKS_RLIMIT // QNX rlimit syscalls don't work properly with ACE. diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h index b32fbb8c15a..a7f2d2622d2 100644 --- a/ACE/ace/config-rtems.h +++ b/ACE/ace/config-rtems.h @@ -59,6 +59,7 @@ #define ACE_LACKS_RAND_REENTRANT_FUNCTIONS #define ACE_LACKS_REALPATH #define ACE_LACKS_TEMPNAM +#define ACE_LACKS_TZSET // Temporarily, enabling this results in compile errors with // rtems 4.6.6. diff --git a/ACE/ace/config-tandem-nsk-mips-v2.h b/ACE/ace/config-tandem-nsk-mips-v2.h index b87626b9a23..9c302e3c21a 100644 --- a/ACE/ace/config-tandem-nsk-mips-v2.h +++ b/ACE/ace/config-tandem-nsk-mips-v2.h @@ -48,9 +48,6 @@ // note: on nsk TNS/R there is room in // sigset_t for 128 signals but those // above 31 are not valid. -typedef long fd_mask; // should be in select.h but no such file -#define NBBY 8 // must be consistent with value in sys/types.h -#define NFDBITS (sizeof (fd_mask) * NBBY) /* bits per mask */ #define MAXNAMLEN 248 // missing from dirent.h #define ERRMAX 4218 // from errno.h @@ -285,6 +282,8 @@ typedef enum CMA_T_SCHED_POLICY { #define ACE_HAS_UCONTEXT_T #endif +#define ACE_LACKS_FD_MASK + //========================================================================= // Include file characteristics //========================================================================= diff --git a/ACE/ace/config-tandem-nsk-mips-v3.h b/ACE/ace/config-tandem-nsk-mips-v3.h index 58552b40304..a70c0016a34 100644 --- a/ACE/ace/config-tandem-nsk-mips-v3.h +++ b/ACE/ace/config-tandem-nsk-mips-v3.h @@ -49,9 +49,6 @@ // note: on nsk TNS/R there is room in // sigset_t for 128 signals but those // above 31 are not valid. -typedef long fd_mask; // should be in select.h but no such file -#define NBBY 8 // must be consistent with value in sys/types.h -#define NFDBITS (sizeof (fd_mask) * NBBY) /* bits per mask */ #define MAXNAMLEN 248 // missing from dirent.h #define ERRMAX 4218 // from errno.h @@ -261,6 +258,8 @@ typedef enum CMA_T_SCHED_POLICY { // Platform lacks alphasort() #define ACE_LACKS_ALPHASORT +#define ACE_LACKS_FD_MASK +#define ACE_LACKS_NFDBITS //========================================================================= // Threads specific parts diff --git a/ACE/ace/os_include/sys/os_select.h b/ACE/ace/os_include/sys/os_select.h index a8de27cbba8..1cfc68386f1 100644 --- a/ACE/ace/os_include/sys/os_select.h +++ b/ACE/ace/os_include/sys/os_select.h @@ -42,13 +42,15 @@ extern "C" { #endif /* __cplusplus */ +#if defined (ACE_LACKS_FD_MASK) + typedef long fd_mask; +#endif /* __QNX__ */ + #if defined (ACE_WIN32) // This will help until we figure out everything: # define NFDBITS 32 /* only used in unused functions... */ -#elif defined (__QNX__) -# if !defined (NFDBITS) -# define NFDBITS (sizeof(fd_mask) * NBBY) /* bits per mask */ -# endif /* ! NFDBITS */ +#elif defined (ACE_LACKS_NFDBITS) +# define NFDBITS (sizeof(fd_mask) * NBBY) /* bits per mask */ #endif /* ACE_WIN32 */ #ifdef __cplusplus |