diff options
| author | silinoron <none@none> | 2010-08-15 13:21:05 -0700 |
|---|---|---|
| committer | silinoron <none@none> | 2010-08-15 13:21:05 -0700 |
| commit | 4d5296299b7a72c37cda56bfa885c82167066c3c (patch) | |
| tree | 2936b23000015173a0c2d82907df9ce7fdc8f785 | |
| parent | e3b8a5923d5e5512cfe6e0f02246d22146691008 (diff) | |
Backed out changeset: 6b66f86b01e4
Should fix windows compile. Blame me and click (but mostly click)
--HG--
branch : trunk
85 files changed, 589 insertions, 5264 deletions
diff --git a/externals/PackageList.txt b/externals/PackageList.txt index 70a5f1009fe..4cf05f3c6ec 100644 --- a/externals/PackageList.txt +++ b/externals/PackageList.txt @@ -2,7 +2,7 @@ TrinityCore uses (parts of or in whole) the following opensource software : ACE (ADAPTIVE Communication Environment) http://www.cs.wustl.edu/~schmidt/ACE.html - Version: 5.8.1 + Version: 5.7.9 bzip2 (a freely available, patent free, high-quality data compressor) http://www.bzip.org/ @@ -18,7 +18,7 @@ jemalloc (a general-purpose scalable concurrent malloc-implementation) libMPQ (a library for reading MPQ files) https://libmpq.org/ - Version: 1.0.4+ + Version: 1.0.4 MersenneTwister (a very fast random number generator) http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html diff --git a/externals/ace/ACE.cpp b/externals/ace/ACE.cpp index 3dd5e2e6f9b..24fb3839ca2 100644 --- a/externals/ace/ACE.cpp +++ b/externals/ace/ACE.cpp @@ -1,4 +1,4 @@ -// $Id: ACE.cpp 91066 2010-07-12 11:05:04Z johnnyw $ +// $Id: ACE.cpp 88193 2009-12-16 09:14:06Z mcorino $ #include "ace/ACE.h" @@ -40,7 +40,7 @@ extern "C" int maxFiles; ACE_RCSID (ace, ACE, - "$Id: ACE.cpp 91066 2010-07-12 11:05:04Z johnnyw $") + "$Id: ACE.cpp 88193 2009-12-16 09:14:06Z mcorino $") // Open versioned namespace, if enabled by the user. @@ -658,7 +658,8 @@ ACE::recv_n_i (ACE_HANDLE handle, errno == EWOULDBLOCK) { // Wait upto <timeout> for the blocking to subside. - int const rtn = ACE::handle_read_ready (handle, timeout); + int rtn = ACE::handle_read_ready (handle, + timeout); // Did select() succeed? if (rtn != -1) @@ -719,7 +720,8 @@ ACE::t_rcv_n_i (ACE_HANDLE handle, if (errno == EWOULDBLOCK) { // Wait for the blocking to subside. - int const result = ACE::handle_read_ready (handle, 0); + int result = ACE::handle_read_ready (handle, + 0); // Did select() succeed? if (result != -1) @@ -776,7 +778,8 @@ ACE::t_rcv_n_i (ACE_HANDLE handle, errno == EWOULDBLOCK) { // Wait upto <timeout> for the blocking to subside. - int const rtn = ACE::handle_read_ready (handle, timeout); + int rtn = ACE::handle_read_ready (handle, + timeout); // Did select() succeed? if (rtn != -1) @@ -836,7 +839,8 @@ ACE::recv_n_i (ACE_HANDLE handle, if (errno == EWOULDBLOCK) { // Wait for the blocking to subside. - int const result = ACE::handle_read_ready (handle, 0); + int result = ACE::handle_read_ready (handle, + 0); // Did select() succeed? if (result != -1) @@ -891,7 +895,8 @@ ACE::recv_n_i (ACE_HANDLE handle, errno == EWOULDBLOCK) { // Wait upto <timeout> for the blocking to subside. - int const rtn = ACE::handle_read_ready (handle, timeout); + int rtn = ACE::handle_read_ready (handle, + timeout); // Did select() succeed? if (rtn != -1) @@ -929,8 +934,8 @@ ssize_t ACE::recv (ACE_HANDLE handle, size_t n, ...) { va_list argp; - int const total_tuples = static_cast<int> (n / 2); - iovec *iovp = 0; + int total_tuples = static_cast<int> (n / 2); + iovec *iovp; #if defined (ACE_HAS_ALLOCA) iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); #else @@ -947,7 +952,7 @@ ACE::recv (ACE_HANDLE handle, size_t n, ...) iovp[i].iov_len = va_arg (argp, int); } - ssize_t const result = ACE_OS::recvv (handle, iovp, total_tuples); + ssize_t result = ACE_OS::recvv (handle, iovp, total_tuples); #if !defined (ACE_HAS_ALLOCA) delete [] iovp; #endif /* !defined (ACE_HAS_ALLOCA) */ @@ -987,10 +992,14 @@ ACE::recvv_n_i (ACE_HANDLE handle, size_t &bytes_transferred = bt == 0 ? temp : *bt; bytes_transferred = 0; - for (int s = 0; s < iovcnt; ) + for (int s = 0; + s < iovcnt; + ) { // Try to transfer as much of the remaining data as possible. - ssize_t n = ACE_OS::recvv (handle, iov + s, iovcnt - s); + ssize_t n = ACE_OS::recvv (handle, + iov + s, + iovcnt - s); // Check EOF. if (n == 0) return 0; @@ -1002,7 +1011,8 @@ ACE::recvv_n_i (ACE_HANDLE handle, if (errno == EWOULDBLOCK) { // Wait for the blocking to subside. - int const result = ACE::handle_read_ready (handle, 0); + int result = ACE::handle_read_ready (handle, + 0); // Did select() succeed? if (result != -1) @@ -1050,21 +1060,28 @@ ACE::recvv_n_i (ACE_HANDLE handle, int val = 0; ACE::record_and_set_non_blocking_mode (handle, val); - for (int s = 0; s < iovcnt; ) + for (int s = 0; + s < iovcnt; + ) { // Try to transfer as much of the remaining data as possible. // Since the socket is in non-blocking mode, this call will not // block. - ssize_t n = ACE_OS::recvv (handle, iov + s, iovcnt - s); + ssize_t n = ACE_OS::recvv (handle, + iov + s, + iovcnt - s); // Check for errors. - if (n == 0 || n == -1) + if (n == 0 || + n == -1) { // Check for possible blocking. - if (n == -1 && errno == EWOULDBLOCK) + if (n == -1 && + errno == EWOULDBLOCK) { // Wait upto <timeout> for the blocking to subside. - int const rtn = ACE::handle_read_ready (handle, timeout); + int rtn = ACE::handle_read_ready (handle, + timeout); // Did select() succeed? if (rtn != -1) @@ -1225,8 +1242,7 @@ ACE::send (ACE_HANDLE handle, return -1; else { - ssize_t const bytes_transferred = - ACE_OS::send (handle, (const char *) buf, n, flags); + ssize_t bytes_transferred = ACE_OS::send (handle, (const char *) buf, n, flags); ACE::restore_non_blocking_mode (handle, val); return bytes_transferred; } @@ -1251,8 +1267,7 @@ ACE::t_snd (ACE_HANDLE handle, return -1; else { - ssize_t const bytes_transferred = - ACE_OS::t_snd (handle, (const char *) buf, n, flags); + ssize_t bytes_transferred = ACE_OS::t_snd (handle, (const char *) buf, n, flags); ACE::restore_non_blocking_mode (handle, val); return bytes_transferred; } @@ -1276,7 +1291,7 @@ ACE::send (ACE_HANDLE handle, return -1; else { - ssize_t const bytes_transferred = ACE::send_i (handle, buf, n); + ssize_t bytes_transferred = ACE::send_i (handle, buf, n); ACE::restore_non_blocking_mode (handle, val); return bytes_transferred; } @@ -1298,8 +1313,7 @@ ACE::sendmsg (ACE_HANDLE handle, return -1; else { - ssize_t const bytes_transferred = - ACE_OS::sendmsg (handle, msg, flags); + ssize_t bytes_transferred = ACE_OS::sendmsg (handle, msg, flags); ACE::restore_non_blocking_mode (handle, val); return bytes_transferred; } @@ -1324,7 +1338,7 @@ ACE::sendto (ACE_HANDLE handle, return -1; else { - ssize_t const bytes_transferred = + ssize_t bytes_transferred = ACE_OS::sendto (handle, buf, len, flags, addr, addrlen); ACE::restore_non_blocking_mode (handle, val); return bytes_transferred; @@ -1367,7 +1381,8 @@ ACE::send_n_i (ACE_HANDLE handle, #endif /* ACE_WIN32 */ { // Wait for the blocking to subside. - int const result = ACE::handle_write_ready (handle, 0); + int result = ACE::handle_write_ready (handle, + 0); // Did select() succeed? if (result != -1) @@ -1420,10 +1435,12 @@ ACE::send_n_i (ACE_HANDLE handle, n == -1) { // Check for possible blocking. - if (n == -1 && (errno == EWOULDBLOCK || errno == ENOBUFS)) + if (n == -1 && + (errno == EWOULDBLOCK || errno == ENOBUFS)) { // Wait upto <timeout> for the blocking to subside. - int const rtn = ACE::handle_write_ready (handle, timeout); + int rtn = ACE::handle_write_ready (handle, + timeout); // Did select() succeed? if (rtn != -1) @@ -1488,7 +1505,8 @@ ACE::t_snd_n_i (ACE_HANDLE handle, if (errno == EWOULDBLOCK || errno == ENOBUFS) { // Wait for the blocking to subside. - int const result = ACE::handle_write_ready (handle, 0); + int result = ACE::handle_write_ready (handle, + 0); // Did select() succeed? if (result != -1) @@ -1545,7 +1563,8 @@ ACE::t_snd_n_i (ACE_HANDLE handle, errno == EWOULDBLOCK || errno == ENOBUFS) { // Wait upto <timeout> for the blocking to subside. - int const rtn = ACE::handle_write_ready (handle, timeout); + int rtn = ACE::handle_write_ready (handle, + timeout); // Did select() succeed? if (rtn != -1) @@ -1606,7 +1625,8 @@ ACE::send_n_i (ACE_HANDLE handle, if (errno == EWOULDBLOCK || errno == ENOBUFS) { // Wait for the blocking to subside. - int const result = ACE::handle_write_ready (handle, 0); + int result = ACE::handle_write_ready (handle, + 0); // Did select() succeed? if (result != -1) @@ -1661,7 +1681,8 @@ ACE::send_n_i (ACE_HANDLE handle, (errno == EWOULDBLOCK || errno == ENOBUFS)) { // Wait upto <timeout> for the blocking to subside. - int const rtn = ACE::handle_write_ready (handle, timeout); + int rtn = ACE::handle_write_ready (handle, + timeout); // Did select() succeed? if (rtn != -1) @@ -1767,8 +1788,9 @@ ACE::sendv_n_i (ACE_HANDLE handle, ) { // Try to transfer as much of the remaining data as possible. - ssize_t n = ACE_OS::sendv (handle, iov + s, iovcnt - s); - + ssize_t n = ACE_OS::sendv (handle, + iov + s, + iovcnt - s); // Check EOF. if (n == 0) return 0; @@ -1780,7 +1802,8 @@ ACE::sendv_n_i (ACE_HANDLE handle, if (errno == EWOULDBLOCK || errno == ENOBUFS) { // Wait for the blocking to subside. - int const result = ACE::handle_write_ready (handle, 0); + int result = ACE::handle_write_ready (handle, + 0); // Did select() succeed? if (result != -1) @@ -1837,7 +1860,9 @@ ACE::sendv_n_i (ACE_HANDLE handle, // Try to transfer as much of the remaining data as possible. // Since the socket is in non-blocking mode, this call will not // block. - ssize_t n = ACE_OS::sendv (handle, iov + s, iovcnt - s); + ssize_t n = ACE_OS::sendv (handle, + iov + s, + iovcnt - s); // Check for errors. if (n == 0 || @@ -1848,7 +1873,8 @@ ACE::sendv_n_i (ACE_HANDLE handle, (errno == EWOULDBLOCK || errno == ENOBUFS)) { // Wait upto <timeout> for the blocking to subside. - int const rtn = ACE::handle_write_ready (handle, timeout); + int rtn = ACE::handle_write_ready (handle, + timeout); // Did select() succeed? if (rtn != -1) diff --git a/externals/ace/Activation_Queue.h b/externals/ace/Activation_Queue.h index ab58eedb586..454640474c1 100644 --- a/externals/ace/Activation_Queue.h +++ b/externals/ace/Activation_Queue.h @@ -4,7 +4,7 @@ /** * @file Activation_Queue.h * - * $Id: Activation_Queue.h 91066 2010-07-12 11:05:04Z johnnyw $ + * $Id: Activation_Queue.h 80826 2008-03-04 14:51:23Z wotte $ * * @author Andres Kruse <Andres.Kruse@cern.ch> * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> @@ -23,7 +23,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Message_Queue.h" -#include "ace/Copy_Disabled.h" #include "ace/Condition_Thread_Mutex.h" /// Define to be compatible with the terminology in the POSA2 book! @@ -36,8 +35,7 @@ class ACE_Method_Request; /** * @class ACE_Activation_Queue * - * @brief - * Reifies a method into a request. Subclasses typically + * @brief Reifies a method into a request. Subclasses typically * represent necessary state and behavior. * * Maintains a priority-ordered queue of ACE_Method_Request objects. @@ -49,9 +47,10 @@ class ACE_Method_Request; * * @sa ACE_Method_Request */ -class ACE_Export ACE_Activation_Queue : private ACE_Copy_Disabled +class ACE_Export ACE_Activation_Queue { public: + // = Initialization and termination methods. /// Constructor. /** * Initializes a new activation queue. @@ -140,6 +139,12 @@ public: /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; +private: + + // = Prevent copying and assignment. + ACE_Activation_Queue (const ACE_Activation_Queue &); + void operator= (const ACE_Activation_Queue &); + protected: /// Stores the Method_Requests. diff --git a/externals/ace/Active_Map_Manager.h b/externals/ace/Active_Map_Manager.h index a6c167e5f88..744abc0df03 100644 --- a/externals/ace/Active_Map_Manager.h +++ b/externals/ace/Active_Map_Manager.h @@ -4,7 +4,7 @@ /** * @file Active_Map_Manager.h * - * $Id: Active_Map_Manager.h 91066 2010-07-12 11:05:04Z johnnyw $ + * $Id: Active_Map_Manager.h 83956 2008-12-03 07:57:38Z johnnyw $ * * @author Irfan Pyarali */ @@ -95,7 +95,7 @@ private: /// Slot index in the active map. ACE_UINT32 slot_index_; - /// Slot generation number of @c slot_index_ slot in the active map. + /// Slot generation number of <slot_index_> slot in the active map. ACE_UINT32 slot_generation_; }; diff --git a/externals/ace/Basic_Types.h b/externals/ace/Basic_Types.h index bc467fafb5c..a4f819a1021 100644 --- a/externals/ace/Basic_Types.h +++ b/externals/ace/Basic_Types.h @@ -4,7 +4,7 @@ /** * @file Basic_Types.h * - * $Id: Basic_Types.h 91161 2010-07-21 18:25:12Z schmidt $ + * $Id: Basic_Types.h 87392 2009-11-07 09:32:06Z johnnyw $ * * @author David L. Levine * @@ -712,7 +712,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # if defined (PRId8) # define ACE_INT8_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRId8) # else -# define ACE_INT8_FORMAT_SPECIFIER ACE_TEXT (ACE_INT8_FORMAT_SPECIFIER_ASCII) +# define ACE_INT8_FORMAT_SPECIFIER ACE_TEXT (ACE_INT8_FORMAT_SPECIFIER) # endif /* defined (PRId8) */ #endif /* ACE_INT8_FORMAT_SPECIFIER */ diff --git a/externals/ace/Cached_Connect_Strategy_T.h b/externals/ace/Cached_Connect_Strategy_T.h index e95218f60fc..d062e1eaa7a 100644 --- a/externals/ace/Cached_Connect_Strategy_T.h +++ b/externals/ace/Cached_Connect_Strategy_T.h @@ -4,7 +4,7 @@ /** * @file Cached_Connect_Strategy_T.h * - * $Id: Cached_Connect_Strategy_T.h 91077 2010-07-13 14:33:08Z johnnyw $ + * $Id: Cached_Connect_Strategy_T.h 82771 2008-09-17 18:47:48Z johnnyw $ * * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> */ @@ -116,12 +116,12 @@ protected: /// Add to cache (non-locking version). virtual int cache_i (const void *recycling_act); - /// Get/Set recycle_state (non-locking version). + /// Get/Set <recycle_state> (non-locking version). virtual int recycle_state_i (const void *recycling_act, ACE_Recyclable_State new_state); virtual ACE_Recyclable_State recycle_state_i (const void *recycling_act) const; - /// Cleanup hint and reset @c *act_holder to zero if @a act_holder != 0. + /// Cleanup hint and reset <*act_holder> to zero if <act_holder != 0>. virtual int cleanup_hint_i (const void *recycling_act, void **act_holder); @@ -184,20 +184,19 @@ protected: /** * @class ACE_Bounded_Cached_Connect_Strategy * - * @brief - * A connection strategy which caches connections to peers - * (represented by SVC_HANDLER instances), thereby allowing - * subsequent re-use of unused, but available, connections. - * This strategy should be used when the cache is bounded by - * maximum size. + * @brief A connection strategy which caches connections to peers + * (represented by SVC_HANDLER instances), thereby allowing + * subsequent re-use of unused, but available, connections. + * This strategy should be used when the cache is bounded by + * maximum size. * - * Bounded_Cached_Connect_Strategy is intended to be used as a - * plug-in connection strategy for ACE_Strategy_Connector. - * It's added value is re-use of established connections and - * tweaking the role of the cache as per the caching strategy. - * Thanks to Edan Ayal <edana@bandwiz.com> for contributing this - * class and Susan Liebeskind <shl@janis.gtri.gatech.edu> for - * brainstorming about it. + * <Bounded_Cached_Connect_Strategy> is intended to be used as a + * plug-in connection strategy for ACE_Strategy_Connector. + * It's added value is re-use of established connections and + * tweaking the role of the cache as per the caching strategy. + * Thanks to Edan Ayal <edana@bandwiz.com> for contributing this + * class and Susan Liebeskind <shl@janis.gtri.gatech.edu> for + * brainstorming about it. */ template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, @@ -245,7 +244,7 @@ protected: protected: - /// Max items in the cache, used as a bound for the creation of svc_handlers. + /// max items in the cache, used as a bound for the creation of svc_handlers. size_t max_size_; }; diff --git a/externals/ace/Capabilities.h b/externals/ace/Capabilities.h index f4c8b5cc6fb..e893d987c08 100644 --- a/externals/ace/Capabilities.h +++ b/externals/ace/Capabilities.h @@ -4,7 +4,7 @@ /** * @file Capabilities.h * - * $Id: Capabilities.h 91077 2010-07-13 14:33:08Z johnnyw $ + * $Id: Capabilities.h 80826 2008-03-04 14:51:23Z wotte $ * * @author Arturo Montes <mitosys@colomsat.net.co> */ @@ -124,17 +124,16 @@ protected: /** * @class ACE_Capabilities * - * @brief - * This class implement the ACE Capabilities. + * @brief This class implement the ACE Capabilities. * * This is a container class for ACE Capabilities * values. Currently exist three different capability values: - * ACE_IntCapEntry (integer), ACE_BoolCapEntry (bool) and - * ACE_StringCapEntry (String). An ACE_Capabilities is a - * unordered set of pair = (String, ACE_CapEntry *). Where + * <ACE_IntCapEntry> (integer), <ACE_BoolCapEntry> (bool) and + * <ACE_StringCapEntry> (String). An ACE_Capabilities is a + * unordered set of pair = (<String>, <ACE_CapEntry> *). Where * the first component is the name of capability and the second * component is a pointer to the capability value container. A - * FILE is a container for ACE_Capabilities, the + * <FILE> is a container for ACE_Capabilities, the * ACE_Capabilities has a name in the file, as a termcap file. */ class ACE_Export ACE_Capabilities @@ -189,6 +188,7 @@ private: /// This is the set of ACE_CapEntry. CAPABILITIES_MAP caps_; + }; #if defined (ACE_IS_SPLITTING) diff --git a/externals/ace/Connector.h b/externals/ace/Connector.h index d0b98cfa923..08ef2aa0b8d 100644 --- a/externals/ace/Connector.h +++ b/externals/ace/Connector.h @@ -4,7 +4,7 @@ /** * @file Connector.h * - * $Id: Connector.h 91058 2010-07-12 08:20:09Z johnnyw $ + * $Id: Connector.h 89510 2010-03-17 12:21:14Z vzykov $ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ @@ -424,7 +424,7 @@ public: SUPER; /** - * Initialize a connector. @a flags indicates how SVC_HANDLER's + * Initialize a connector. @a flags indicates how <SVC_HANDLER>'s * should be initialized prior to being activated. Right now, the * only flag that is processed is ACE_NONBLOCK, which enabled * non-blocking I/O on the SVC_HANDLER when it is opened. @@ -535,21 +535,21 @@ protected: /// Creation strategy for an Connector. CREATION_STRATEGY *creation_strategy_; - /// True if Connector created the creation strategy and thus should + /// true if Connector created the creation strategy and thus should /// delete it, else false. bool delete_creation_strategy_; /// Connect strategy for a Connector. CONNECT_STRATEGY *connect_strategy_; - /// True if Connector created the connect strategy and thus should + /// true if Connector created the connect strategy and thus should /// delete it, else false. bool delete_connect_strategy_; - /// Concurrency strategy for a Connector. + /// Concurrency strategy for an <Connector>. CONCURRENCY_STRATEGY *concurrency_strategy_; - /// True if Connector created the concurrency strategy and thus should + /// true if Connector created the concurrency strategy and thus should /// delete it, else false. bool delete_concurrency_strategy_; }; diff --git a/externals/ace/DLL.h b/externals/ace/DLL.h index 20d333db81a..fa748e8d944 100644 --- a/externals/ace/DLL.h +++ b/externals/ace/DLL.h @@ -4,7 +4,7 @@ /** * @file DLL.h * - * $Id: DLL.h 91064 2010-07-12 10:11:24Z johnnyw $ + * $Id: DLL.h 80826 2008-03-04 14:51:23Z wotte $ * * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> */ @@ -151,12 +151,12 @@ public: * Return the handle to the caller. If @a become_owner is non-0 then * caller assumes ownership of the handle and the ACE_DLL object * won't call close() when it goes out of scope, even if - * @c close_handle_on_destruction is set. + * <close_handle_on_destruction> is set. */ ACE_SHLIB_HANDLE get_handle (int become_owner = 0) const; /// Set the handle for the DLL object. By default, the close() - /// operation on / the object will be invoked before it is destroyed. + //operation on / the object will be invoked before it is destroyed. int set_handle (ACE_SHLIB_HANDLE handle, bool close_handle_on_destruction = true); diff --git a/externals/ace/DLL_Manager.cpp b/externals/ace/DLL_Manager.cpp index be73f455800..9f2578e10aa 100644 --- a/externals/ace/DLL_Manager.cpp +++ b/externals/ace/DLL_Manager.cpp @@ -1,4 +1,4 @@ -// $Id: DLL_Manager.cpp 90712 2010-06-18 20:01:29Z shuston $ +// $Id: DLL_Manager.cpp 86478 2009-08-13 07:15:05Z johnnyw $ #include "ace/DLL_Manager.h" @@ -61,7 +61,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, { if (ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE (%P|%t) DLL_Handle::open: error, ") + ACE_TEXT ("(%P|%t) DLL_Handle::open: error, ") ACE_TEXT ("tried to reopen %s with name %s\n"), this->dll_name_, dll_name)); @@ -370,7 +370,7 @@ ACE_DLL_Handle::get_handle (int become_owner) if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("ACE (%P|%t) DLL_Handle::get_handle: ") + ACE_TEXT ("ACE (%P|%t) ACE_DLL_Handle::get_handle: ") ACE_TEXT ("post call: handle %s, refcount %d\n"), this->handle_ == ACE_SHLIB_INVALID_HANDLE ? ACE_TEXT ("invalid") : ACE_TEXT ("valid"), @@ -537,7 +537,7 @@ ACE_DLL_Manager::ACE_DLL_Manager (int size) if (this->open (size) != 0 && ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE (%P|%t) DLL_Manager ctor failed to allocate ") + ACE_TEXT ("ACE_DLL_Manager ctor failed to allocate ") ACE_TEXT ("handle_vector_.\n"))); } @@ -547,7 +547,7 @@ ACE_DLL_Manager::~ACE_DLL_Manager (void) if (this->close () != 0 && ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE (%P|%t) DLL_Manager dtor failed to close ") + ACE_TEXT ("ACE_DLL_Manager dtor failed to close ") ACE_TEXT ("properly.\n"))); } @@ -583,7 +583,7 @@ ACE_DLL_Manager::open_dll (const ACE_TCHAR *dll_name, // Error while opening dll. Free temp handle if (ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE (%P|%t) DLL_Manager::open_dll: Could not ") + ACE_TEXT ("ACE_DLL_Manager::open_dll: Could not ") ACE_TEXT ("open dll %s.\n"), dll_name)); @@ -766,7 +766,7 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload) { if (ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE (%P|%t) DLL_Manager::unload error.\n"))); + ACE_TEXT ("ACE_DLL_Manager::unload error.\n"))); return -1; } @@ -775,7 +775,7 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload) { if (ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE (%P|%t) DLL_Manager::unload_dll called with ") + ACE_TEXT ("ACE_DLL_Manager::unload_dll called with ") ACE_TEXT ("null pointer.\n"))); return -1; diff --git a/externals/ace/DLL_Manager.h b/externals/ace/DLL_Manager.h index 716e3299557..63b9ee04a84 100644 --- a/externals/ace/DLL_Manager.h +++ b/externals/ace/DLL_Manager.h @@ -4,7 +4,7 @@ /** * @file DLL_Manager.h * - * $Id: DLL_Manager.h 91064 2010-07-12 10:11:24Z johnnyw $ + * $Id: DLL_Manager.h 80826 2008-03-04 14:51:23Z wotte $ * * @author Don Hinton <dhinton@ieee.org> */ @@ -45,7 +45,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * on some platforms. It is refcounted and managed by * ACE_DLL_Manager, so there will only be a single instance of this * class for each dll loaded, no matter how many instances of ACE_DLL - * an application has open. Operations open(), close(), and symbol() + * an application has open. Operations <open>, <close>, and <symbol> * have been implemented to help opening/closing and extracting symbol * information from a DLL, respectively. * @@ -69,11 +69,11 @@ public: /** * This method opens and dynamically links @a dll_name. The default - * mode is @c RTLD_LAZY, which loads identifier symbols but not the + * mode is <RTLD_LAZY>, which loads identifier symbols but not the * symbols for functions, which are loaded dynamically on-demand. - * Other supported modes include: @c RTLD_NOW, which performs all + * Other supported modes include: <RTLD_NOW>, which performs all * necessary relocations when @a dll_name is first loaded and - * @c RTLD_GLOBAL, which makes symbols available for relocation + * <RTLD_GLOBAL>, which makes symbols available for relocation * processing of any other DLLs. Returns -1 on failure and 0 on * success. */ @@ -110,20 +110,20 @@ private: /// to the caller. auto_ptr <ACE_TString> error (void); - /// Builds array of DLL names to try to dlopen, based on platform - /// and configured DLL prefixes/suffixes. - /// Returns the array of names to try in try_names. + // Builds array of DLL names to try to dlopen, based on platform + // and configured DLL prefixes/suffixes. + // Returns the array of names to try in try_names. void get_dll_names (const ACE_TCHAR *dll_name, ACE_Array<ACE_TString> &try_names); - /// Disallow copying and assignment since we don't handle them. + // Disallow copying and assignment since we don't handle them. ACE_DLL_Handle (const ACE_DLL_Handle &); void operator= (const ACE_DLL_Handle &); private: - /// Keep track of how many ACE_DLL objects have a reference to this - /// dll. + // Keep track of how many ACE_DLL objects have a reference to this + // dll. sig_atomic_t refcount_; /// Name of the shared library. @@ -218,16 +218,16 @@ protected: /// Destructor. ~ACE_DLL_Manager (void); - /// Allocate handle_vector_. + // Allocate handle_vector_. int open (int size); - /// Close all open dlls and deallocate memory. + // Close all open dlls and deallocate memory. int close (void); - /// Find dll in handle_vector_. + // Find dll in handle_vector_. ACE_DLL_Handle *find_dll (const ACE_TCHAR *dll_name) const; - /// Applies strategy for unloading dll. + // Applies strategy for unloading dll. int unload_dll (ACE_DLL_Handle *dll_handle, int force_unload = 0); private: @@ -235,7 +235,7 @@ private: /// Close the singleton instance. static void close_singleton (void); - /// Disallow copying and assignment since we don't handle these. + // Disallow copying and assignment since we don't handle these. ACE_DLL_Manager (const ACE_DLL_Manager &); void operator= (const ACE_DLL_Manager &); diff --git a/externals/ace/Dev_Poll_Reactor.h b/externals/ace/Dev_Poll_Reactor.h index 68724bf8f9c..030ad241810 100644 --- a/externals/ace/Dev_Poll_Reactor.h +++ b/externals/ace/Dev_Poll_Reactor.h @@ -4,7 +4,7 @@ /** * @file Dev_Poll_Reactor.h * - * $Id: Dev_Poll_Reactor.h 91066 2010-07-12 11:05:04Z johnnyw $ + * $Id: Dev_Poll_Reactor.h 90177 2010-05-19 11:44:22Z vzykov $ * * @c /dev/poll (or Linux @c sys_epoll) based Reactor implementation. * @@ -56,6 +56,52 @@ class ACE_Dev_Poll_Reactor; // --------------------------------------------------------------------- +#if 0 +/** + * @class ACE_Dev_Poll_Ready_Set + * + * @brief Class that contains the list of "ready" file descriptors. + * + * This class points to an array of pollfd structures corresponding to + * "ready" file descriptors, such as those corresponding to event + * handlers that request an additional callback after being initially + * dispatched (i.e. return a value greater than zero). + * @par + * The idea is to store the "ready" set in an existing area of memory + * that already contains pollfd instances. Doing so is safe since the + * "ready" set is dispatched before polling for additional events, + * thus avoiding being potentially overwritten during the event poll. + * @par + * When the "ready" set is dispatched, all that needs to be done is to + * iterate over the contents of the array. There is no need to "walk" + * the array in search of ready file descriptors since the array by + * design only contains ready file descriptors. As such, this + * implementation of a ready set is much more efficient in the + * presence of a large number of file descriptors in terms of both + * time and space than the one used in the Select_Reactor, for + * example. + */ +class ACE_Dev_Poll_Ready_Set +{ +public: + + /// Constructor. + ACE_Dev_Poll_Ready_Set (void); + +public: + + /// The array containing the pollfd structures corresponding to the + /// "ready" file descriptors. + struct pollfd *pfds; + + /// The number of "ready" file descriptors in the above array. + int nfds; + +}; +#endif /* 0 */ + +// --------------------------------------------------------------------- + /** * @class ACE_Dev_Poll_Reactor_Notify * @@ -1004,6 +1050,10 @@ protected: */ ACE_HANDLE poll_fd_; + /// Track HANDLES we are interested in for various events that must + /// be dispatched *without* polling. + /// ACE_Dev_Poll_Ready_Set ready_set_; + #if defined (ACE_HAS_EVENT_POLL) /// Event structure to be filled by epoll_wait. epoll_wait() only gets /// one event at a time and we rely on it's internals for fairness. diff --git a/externals/ace/Dev_Poll_Reactor.inl b/externals/ace/Dev_Poll_Reactor.inl index 0e72b305c62..2008107bc2c 100644 --- a/externals/ace/Dev_Poll_Reactor.inl +++ b/externals/ace/Dev_Poll_Reactor.inl @@ -1,5 +1,6 @@ // -*- C++ -*- -// $Id: Dev_Poll_Reactor.inl 91066 2010-07-12 11:05:04Z johnnyw $ +// +// $Id: Dev_Poll_Reactor.inl 90177 2010-05-19 11:44:22Z vzykov $ #include "ace/Log_Msg.h" @@ -19,6 +20,17 @@ ACE_Dev_Poll_Reactor::Event_Tuple::Event_Tuple (ACE_Event_Handler *eh, // --------------------------------------------------------------------- +#if 0 +ACE_INLINE +ACE_Dev_Poll_Ready_Set::ACE_Dev_Poll_Ready_Set (void) + : pfds (0), + nfds (0) +{ +} +#endif /* 0 */ + +// --------------------------------------------------------------------- + ACE_INLINE size_t ACE_Dev_Poll_Reactor::Handler_Repository::size (void) const { diff --git a/externals/ace/Dirent.h b/externals/ace/Dirent.h index 7735fb1f293..8d15e5337da 100644 --- a/externals/ace/Dirent.h +++ b/externals/ace/Dirent.h @@ -4,7 +4,7 @@ /** * @file Dirent.h * - * $Id: Dirent.h 91064 2010-07-12 10:11:24Z johnnyw $ + * $Id: Dirent.h 84316 2009-02-03 19:46:05Z johnnyw $ * * Define a portable C++ interface to ACE_OS_Dirent directory-entry * manipulation. @@ -59,21 +59,21 @@ public: * refers, and positions the directory stream at the next entry, * except on read-only filesystems. It returns a NULL pointer upon * reaching the end of the directory stream, or upon detecting an - * invalid location in the directory. @c read() shall not return + * invalid location in the directory. <readdir> shall not return * directory entries containing empty names. It is unspecified * whether entries are returned for dot or dot-dot. The pointer - * returned by @c read() points to data that may be overwritten by - * another call to @c read() on the same directory stream. This - * data shall not be overwritten by another call to @c read() on a - * different directory stream. @c read() may buffer several - * directory entries per actual read operation; @c read() marks for + * returned by <readdir> points to data that may be overwritten by + * another call to <readdir> on the same directory stream. This + * data shall not be overwritten by another call to <readdir> on a + * different directory stream. <readdir> may buffer several + * directory entries per actual read operation; <readdir> marks for * update the st_atime field of the directory each time the * directory is actually read. */ ACE_DIRENT *read (void); /** - * Has the equivalent functionality as @c read() except that an + * Has the equivalent functionality as <readdir> except that an * @a entry and @a result buffer must be supplied by the caller to * store the result. */ @@ -86,15 +86,15 @@ public: long tell (void); /** - * Sets the position of the next @c read() operation on the + * Sets the position of the next <readdir> operation on the * directory stream. The new position reverts to the position - * associated with the directory stream at the time the @c tell() + * associated with the directory stream at the time the <telldir> * operation that provides loc was performed. Values returned by - * @c tell() are good only for the lifetime of the ACE_DIR pointer from + * <telldir> are good only for the lifetime of the <ACE_DIR> pointer from * which they are derived. If the directory is closed and then - * reopened, the @c telldir() value may be invalidated due to + * reopened, the <telldir> value may be invalidated due to * undetected directory compaction. It is safe to use a previous - * @c telldir() value immediately after a call to @c opendir() and before + * <telldir> value immediately after a call to <opendir> and before * any calls to readdir. */ void seek (long loc); @@ -103,7 +103,7 @@ public: * Resets the position of the directory stream to the beginning of * the directory. It also causes the directory stream to refer to * the current state of the corresponding directory, as a call to - * @c opendir() would. + * <opendir> would. */ void rewind (void); diff --git a/externals/ace/Dump_T.h b/externals/ace/Dump_T.h index 4186cabf937..92b57addce6 100644 --- a/externals/ace/Dump_T.h +++ b/externals/ace/Dump_T.h @@ -4,7 +4,7 @@ /** * @file Dump_T.h * - * $Id: Dump_T.h 91064 2010-07-12 10:11:24Z johnnyw $ + * $Id: Dump_T.h 80826 2008-03-04 14:51:23Z wotte $ * * @author Doug Schmidt */ @@ -26,8 +26,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class ACE_Dumpable_Adapter * - * @brief - * This class inherits the interface of the abstract ACE_Dumpable + * @brief This class inherits the interface of the abstract ACE_Dumpable * class and is instantiated with the implementation of the * concrete component class <class Concrete>. * diff --git a/externals/ace/Event_Handler.h b/externals/ace/Event_Handler.h index 417f78578e7..2e1414ec336 100644 --- a/externals/ace/Event_Handler.h +++ b/externals/ace/Event_Handler.h @@ -4,7 +4,7 @@ /** * @file Event_Handler.h * - * $Id: Event_Handler.h 91066 2010-07-12 11:05:04Z johnnyw $ + * $Id: Event_Handler.h 86576 2009-08-29 22:42:51Z shuston $ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ @@ -38,8 +38,7 @@ typedef unsigned long ACE_Reactor_Mask; /** * @class ACE_Event_Handler * - * @brief - * Provides an abstract interface for handling various types of + * @brief Provides an abstract interface for handling various types of * I/O, timer, and signal events. * * Subclasses read/write input/output on an I/O descriptor, @@ -95,9 +94,9 @@ public: // = Get/set priority + // Priorities run from MIN_PRIORITY (which is the "lowest priority") + // to MAX_PRIORITY (which is the "highest priority"). /// Get the priority of the Event_Handler. - /// @note Priorities run from MIN_PRIORITY (which is the "lowest priority") - /// to MAX_PRIORITY (which is the "highest priority"). virtual int priority (void) const; /// Set the priority of the Event_Handler. @@ -178,8 +177,8 @@ public: * non-sockets (such as ACE_STDIN). This is commonly used in * situations where the Reactor is used to demultiplex read events * on ACE_STDIN on UNIX. Note that @a event_handler must be a - * subclass of ACE_Event_Handler. If the get_handle() method of - * this event handler returns ACE_INVALID_HANDLE we default to + * subclass of ACE_Event_Handler. If the <get_handle> method of + * this event handler returns <ACE_INVALID_HANDLE> we default to * reading from ACE_STDIN. */ static ACE_THR_FUNC_RETURN read_adapter (void *event_handler); @@ -194,7 +193,7 @@ public: ACE_Thread_Manager *thr_mgr, int flags = THR_DETACHED); - /// Performs the inverse of the register_stdin_handler() method. + /// Performs the inverse of the <register_stdin_handler> method. static int remove_stdin_handler (ACE_Reactor *reactor, ACE_Thread_Manager *thr_mgr); @@ -239,8 +238,7 @@ public: /** * @class Reference_Counting_Policy * - * @brief - * This policy dictates the reference counting requirements + * @brief This policy dictates the reference counting requirements * for the handler. * * This policy allows applications to configure whether it wants the diff --git a/externals/ace/File_Lock.h b/externals/ace/File_Lock.h index 4cd58fcd184..2820f71053d 100644 --- a/externals/ace/File_Lock.h +++ b/externals/ace/File_Lock.h @@ -4,7 +4,7 @@ /** * @file File_Lock.h * - * $Id: File_Lock.h 91064 2010-07-12 10:11:24Z johnnyw $ + * $Id: File_Lock.h 87213 2009-10-23 13:11:34Z johnnyw $ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ @@ -69,7 +69,7 @@ public: /** * Note, for interface uniformity with other synchronization - * wrappers we include the acquire() method. This is implemented as + * wrappers we include the <acquire> method. This is implemented as * a write-lock to be on the safe-side... */ int acquire (short whence = 0, ACE_OFF_T start = 0, ACE_OFF_T len = 1); diff --git a/externals/ace/Filecache.h b/externals/ace/Filecache.h index 9165a70fcd3..60b8a90f620 100644 --- a/externals/ace/Filecache.h +++ b/externals/ace/Filecache.h @@ -4,7 +4,7 @@ /** * @file Filecache.h * - * $Id: Filecache.h 91066 2010-07-12 11:05:04Z johnnyw $ + * $Id: Filecache.h 80826 2008-03-04 14:51:23Z wotte $ * * @author James Hu */ @@ -41,8 +41,7 @@ class ACE_Filecache_Object; /** * @class ACE_Filecache_Handle * - * @brief - * Abstraction over a real file. This is meant to be the entry + * @brief Abstraction over a real file. This is meant to be the entry * point into the Cached Virtual Filesystem. * * This is a cached filesystem implementation based loosely on the @@ -144,7 +143,7 @@ private: /// A reference to the low level instance. ACE_Filecache_Object *file_; - /// A dup'd version of the one from file_. + /// A <dup>'d version of the one from <file_>. ACE_HANDLE handle_; int mapit_; @@ -158,8 +157,7 @@ typedef ACE_Hash_Map_Entry<const ACE_TCHAR *, ACE_Filecache_Object *> ACE_Fileca /** * @class ACE_Filecache * - * @brief - * A hash table holding the information about entry point into + * @brief A hash table holding the information about entry point into * the Cached Virtual Filesystem. On insertion, the reference * count is incremented. On destruction, reference count is * decremented. @@ -233,8 +231,7 @@ private: /** * @class ACE_Filecache_Object * - * @brief - * Abstraction over a real file. This is what the Virtual + * @brief Abstraction over a real file. This is what the Virtual * Filesystem contains. This class is not intended for general * consumption. Please consult a physician before attempting to * use this class. diff --git a/externals/ace/Handle_Gobbler.inl b/externals/ace/Handle_Gobbler.inl index 6a053d88be0..cca9e4bd7be 100644 --- a/externals/ace/Handle_Gobbler.inl +++ b/externals/ace/Handle_Gobbler.inl @@ -1,12 +1,11 @@ // -*- C++ -*- // -// $Id: Handle_Gobbler.inl 90388 2010-06-02 15:27:59Z vzykov $ +// $Id: Handle_Gobbler.inl 85911 2009-07-07 05:45:14Z olli $ // Since this is only included in Handle_Gobbler.h, these should be // inline, not ACE_INLINE. // FUZZ: disable check_for_inline -#include "ace/ACE.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_fcntl.h" diff --git a/externals/ace/INET_Addr.h b/externals/ace/INET_Addr.h index ba8978c256c..d68e6409cdb 100644 --- a/externals/ace/INET_Addr.h +++ b/externals/ace/INET_Addr.h @@ -4,7 +4,7 @@ /** * @file INET_Addr.h * - * $Id: INET_Addr.h 91064 2010-07-12 10:11:24Z johnnyw $ + * $Id: INET_Addr.h 82789 2008-09-19 14:47:28Z johnnyw $ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ @@ -71,15 +71,15 @@ public: explicit ACE_INET_Addr (u_short port_number, ACE_UINT32 ip_addr = INADDR_ANY); - /// Uses getservbyname() to create an ACE_INET_Addr from a - /// @a port_name, the remote @a host_name, and the @a protocol. + /// Uses <getservbyname> to create an ACE_INET_Addr from a + /// <port_name>, the remote @a host_name, and the @a protocol. ACE_INET_Addr (const char port_name[], const char host_name[], const char protocol[] = "tcp"); /** - * Uses getservbyname() to create an ACE_INET_Addr from a - * @a port_name, an Internet @a ip_addr, and the @a protocol. This + * Uses <getservbyname> to create an ACE_INET_Addr from a + * <port_name>, an Internet @a ip_addr, and the @a protocol. This * method assumes that @a ip_addr is in host byte order. */ ACE_INET_Addr (const char port_name[], diff --git a/externals/ace/Log_Msg_Callback.h b/externals/ace/Log_Msg_Callback.h index a67407459e6..f743987b472 100644 --- a/externals/ace/Log_Msg_Callback.h +++ b/externals/ace/Log_Msg_Callback.h @@ -4,7 +4,7 @@ /** * @file Log_Msg_Callback.h * - * $Id: Log_Msg_Callback.h 91064 2010-07-12 10:11:24Z johnnyw $ + * $Id: Log_Msg_Callback.h 80826 2008-03-04 14:51:23Z wotte $ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ @@ -35,7 +35,7 @@ class ACE_Log_Record; * Log_Msg class and make sure that they turn on the * ACE_Log_Msg::MSG_CALLBACK flag. * - * Your log() routine is called with an instance of + * Your <log> routine is called with an instance of * ACE_Log_Record. From this class, you can get the log * message, the verbose log message, message type, message * priority, and so on. @@ -43,9 +43,9 @@ class ACE_Log_Record; * Remember that there is one Log_Msg object per thread. * Therefore, you may need to register your callback object with * many ACE_Log_Msg objects (and have the correct - * synchronization in the log() method) or have a separate + * synchronization in the <log> method) or have a separate * callback object per Log_Msg object. Moreover, - * ACE_Log_Msg_Callbacks are not inherited when a new thread + * <ACE_Log_Msg_Callbacks> are not inherited when a new thread * is spawned because it might have been allocated off of the * stack of the original thread, in which case all hell would * break loose... Therefore, you'll need to reset these in each diff --git a/externals/ace/Log_Msg_UNIX_Syslog.h b/externals/ace/Log_Msg_UNIX_Syslog.h index 56d75029e46..3c762e8daa9 100644 --- a/externals/ace/Log_Msg_UNIX_Syslog.h +++ b/externals/ace/Log_Msg_UNIX_Syslog.h @@ -4,7 +4,7 @@ /** * @file Log_Msg_UNIX_Syslog.h * - * $Id: Log_Msg_UNIX_Syslog.h 90388 2010-06-02 15:27:59Z vzykov $ + * $Id: Log_Msg_UNIX_Syslog.h 80826 2008-03-04 14:51:23Z wotte $ * * @author Jerry D. De Master <jdemaster@rite-solutions.com> */ @@ -23,7 +23,6 @@ #if !defined (ACE_LACKS_UNIX_SYSLOG) #include "ace/Log_Msg_Backend.h" -#include "ace/Basic_Types.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/externals/ace/Log_Record.h b/externals/ace/Log_Record.h index aaf2a21ede5..c7161581a7a 100644 --- a/externals/ace/Log_Record.h +++ b/externals/ace/Log_Record.h @@ -4,7 +4,7 @@ /** * @file Log_Record.h * - * $Id: Log_Record.h 91064 2010-07-12 10:11:24Z johnnyw $ + * $Id: Log_Record.h 85236 2009-05-01 11:43:56Z johnnyw $ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ @@ -56,7 +56,7 @@ public: // = Initialization /** - * Create a Log_Record and set its priority, time stamp, and + * Create a <Log_Record> and set its priority, time stamp, and * process id. */ ACE_Log_Record (void); @@ -72,7 +72,7 @@ public: /// Write the contents of the logging record to the appropriate - /// FILE if the corresponding type is enabled. + /// <FILE> if the corresponding type is enabled. int print (const ACE_TCHAR host_name[], u_long verbose_flag, #if !defined (ACE_HAS_WINCE) @@ -101,67 +101,62 @@ public: static const ACE_TCHAR *priority_name (ACE_Log_Priority p); /// IMPORTANT: @a name must be a statically allocated const ACE_TCHAR* - static void priority_name (ACE_Log_Priority p, const ACE_TCHAR *name); + static void priority_name (ACE_Log_Priority p, + const ACE_TCHAR *name); // = Marshall/demarshall - /** - * Encode the @c Log_Record for transmission on the network. - * @deprecated - * The encode() and decode() metods are deprecated; please use - * the CDR insertion and extraction operators to properly encode and decode - * ACE_Log_Record objects. - */ + /// Encode the @c Log_Record for transmission on the network. + /// @deprecated The encode() and decode() metods are deprecated; please use + /// the CDR insertion and extraction operators to properly encode and decode + /// ACE_Log_Record objects. void encode (void); - /** - * Decode the @c Log_Record received from the network. - * @deprecated - * The encode() and decode() metods are deprecated; please use - * the CDR insertion and extraction operators to properly encode and decode - * ACE_Log_Record objects. - */ + /// Decode the @c Log_Record received from the network. + /// @deprecated The encode() and decode() metods are deprecated; please use + /// the CDR insertion and extraction operators to properly encode and decode + /// ACE_Log_Record objects. void decode (void); // = Set/get methods - /// Get the type of the Log_Record. + /// Get the type of the <Log_Record>. ACE_UINT32 type (void) const; - /// Set the type of the Log_Record. + /// Set the type of the <Log_Record>. void type (ACE_UINT32); /** - * Get the priority of the Log_Record <type_>. This is computed + * Get the priority of the <Log_Record> <type_>. This is computed * as the base 2 logarithm of <type_> (which must be a power of 2, - * as defined by the enums in ACE_Log_Priority). + * as defined by the enums in <ACE_Log_Priority>). */ u_long priority (void) const; - /// Set the priority of the Log_Record <type_> (which must be a - /// power of 2, as defined by the enums in ACE_Log_Priority). + /// Set the priority of the <Log_Record> <type_> (which must be a + /// power of 2, as defined by the enums in <ACE_Log_Priority>). void priority (u_long num); - /// Get the total length of the Log_Record, which includes the + /// Get the total length of the <Log_Record>, which includes the /// size of the various data member fields. long length (void) const; - /// Set the total length of the Log_Record, which needs to account for + /// Set the total length of the <Log_Record>, which needs to account for /// the size of the various data member fields. void length (long); - /// Get the time stamp of the Log_Record. + /// Get the time stamp of the <Log_Record>. ACE_Time_Value time_stamp (void) const; - /// Set the time stamp of the Log_Record. + /// Set the time stamp of the <Log_Record>. void time_stamp (const ACE_Time_Value &ts); - /// Get the process id of the Log_Record. + /// Get the process id of the <Log_Record>. long pid (void) const; - /// Set the process id of the Log_Record. + /// Set the process id of the <Log_Record>. void pid (long); - /// Get the message data of the Log_Record. + /// Get the message data of the <Log_Record>. const ACE_TCHAR *msg_data (void) const; /// Set the message data of the record. If @a data is longer than the @@ -169,7 +164,7 @@ public: /// fit. If such a reallocation faisl, this method returns -1, else 0. int msg_data (const ACE_TCHAR *data); - /// Get the size of the message data of the Log_Record, including + /// Get the size of the message data of the <Log_Record>, including /// a byte for the NUL. size_t msg_data_len (void) const; diff --git a/externals/ace/Logging_Strategy.cpp b/externals/ace/Logging_Strategy.cpp index 04899f74dad..1b868d6f696 100644 --- a/externals/ace/Logging_Strategy.cpp +++ b/externals/ace/Logging_Strategy.cpp @@ -1,9 +1,8 @@ -// $Id: Logging_Strategy.cpp 90712 2010-06-18 20:01:29Z shuston $ +// $Id: Logging_Strategy.cpp 89512 2010-03-17 14:42:24Z vzykov $ #include "ace/Logging_Strategy.h" #include "ace/Service_Config.h" #include "ace/ACE.h" -#include "ace/ACE_export.h" #include "ace/Get_Opt.h" // FUZZ: disable check_for_streams_include @@ -18,7 +17,7 @@ ACE_RCSID (ace, Logging_Strategy, - "$Id: Logging_Strategy.cpp 90712 2010-06-18 20:01:29Z shuston $") + "$Id: Logging_Strategy.cpp 89512 2010-03-17 14:42:24Z vzykov $") ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -604,11 +603,3 @@ ACE_STATIC_SVC_DEFINE (ACE_Logging_Strategy, 0) ACE_FACTORY_DEFINE (ACE, ACE_Logging_Strategy) - -// _get_dll_unload_policy() prevents ACE from being unloaded and having its -// framework components run down if/when the Logging Strategy is unloaded. -extern "C" ACE_Export int -_get_dll_unload_policy() -{ - return ACE_DLL_UNLOAD_POLICY_LAZY; -} diff --git a/externals/ace/Logging_Strategy.h b/externals/ace/Logging_Strategy.h index 7792c106121..00a50eae082 100644 --- a/externals/ace/Logging_Strategy.h +++ b/externals/ace/Logging_Strategy.h @@ -4,7 +4,7 @@ /** * @file Logging_Strategy.h * - * $Id: Logging_Strategy.h 91064 2010-07-12 10:11:24Z johnnyw $ + * $Id: Logging_Strategy.h 89512 2010-03-17 14:42:24Z vzykov $ * * @author Prashant Jain <pjain@cs.wustl.edu> * @author Orlando Ribeiro <oribeiro@inescporto.pt> @@ -30,8 +30,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class ACE_Logging_Strategy * - * @brief - * This class provides a way to dynamically configure the ACE logging + * @brief This class provides a way to dynamically configure the ACE logging * mechanism at run time as well as enable the mechanisms for limiting * log file size and log file backup/rotation capability. * @@ -171,16 +170,16 @@ protected: /// Program name to be used for %n format specifier. ACE_TCHAR *program_name_; - /// If true then wipeout the logfile, otherwise append to it. - /// Default value is false. + /// If non-0 then wipeout the logfile, otherwise append to it. + /// Default value is 0. bool wipeout_logfile_; - /// If true we have a maximum number of log files we can write. - /// Default value is false, i.e., no maximum number. + /// If non-0 we have a maximum number of log files we can write. + /// Default value is 0, i.e., no maximum number. bool fixed_number_; - /// If true we order the files as we rotate them. Default value - /// is false, i.e., we do not rotate files by default. + /// If non-0 we order the files as we rotate them. Default value + /// is 0, i.e., we do not rotate files by default. bool order_files_; /// This tells us in what file we last wrote. It will be increased diff --git a/externals/ace/Makefile.am b/externals/ace/Makefile.am deleted file mode 100644 index 7b1e44dc792..00000000000 --- a/externals/ace/Makefile.am +++ /dev/null @@ -1,1464 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id: Makefile.am 89339 2010-03-05 12:20:47Z johnnyw $ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -includedir = @includedir@/ace -pkgconfigdir = @libdir@/pkgconfig - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -SUBDIRS = \ - . \ - ETCL \ - Monitor_Control \ - SSL - -CLEANFILES = -lib_LTLIBRARIES = -pkgconfig_DATA = -nobase_include_HEADERS = - -## Makefile.ACE.am - -if !BUILD_ACE_FOR_TAO - -lib_LTLIBRARIES += libACE.la - -libACE_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_BUILD_DLL - -libACE_la_SOURCES = \ - ACE.cpp \ - ACE_crc32.cpp \ - ACE_crc_ccitt.cpp \ - ATM_Acceptor.cpp \ - ATM_Addr.cpp \ - ATM_Connector.cpp \ - ATM_Params.cpp \ - ATM_QoS.cpp \ - ATM_Stream.cpp \ - Activation_Queue.cpp \ - Active_Map_Manager.cpp \ - Addr.cpp \ - Argv_Type_Converter.cpp \ - Assert.cpp \ - Asynch_IO.cpp \ - Asynch_IO_Impl.cpp \ - Asynch_Pseudo_Task.cpp \ - Atomic_Op.cpp \ - Atomic_Op_Sparc.c \ - Auto_Event.cpp \ - Barrier.cpp \ - Base_Thread_Adapter.cpp \ - Based_Pointer_Repository.cpp \ - Basic_Stats.cpp \ - Basic_Types.cpp \ - CDR_Base.cpp \ - CDR_Size.cpp \ - CDR_Stream.cpp \ - Capabilities.cpp \ - Cleanup.cpp \ - Codecs.cpp \ - Codeset_IBM1047.cpp \ - Codeset_Registry.cpp \ - Codeset_Registry_db.cpp \ - Condition_Recursive_Thread_Mutex.cpp \ - Condition_Thread_Mutex.cpp \ - Configuration.cpp \ - Configuration_Import_Export.cpp \ - Connection_Recycling_Strategy.cpp \ - Containers.cpp \ - Copy_Disabled.cpp \ - Countdown_Time.cpp \ - DEV.cpp \ - DEV_Addr.cpp \ - DEV_Connector.cpp \ - DEV_IO.cpp \ - DLL.cpp \ - DLL_Manager.cpp \ - Date_Time.cpp \ - Dev_Poll_Reactor.cpp \ - Dirent.cpp \ - Dirent_Selector.cpp \ - Dump.cpp \ - Dynamic.cpp \ - Dynamic_Message_Strategy.cpp \ - Dynamic_Service_Base.cpp \ - Dynamic_Service_Dependency.cpp \ - Encoding_Converter.cpp \ - Encoding_Converter_Factory.cpp \ - Event.cpp \ - Event_Handler.cpp \ - FIFO.cpp \ - FIFO_Recv.cpp \ - FIFO_Recv_Msg.cpp \ - FIFO_Send.cpp \ - FIFO_Send_Msg.cpp \ - FILE.cpp \ - FILE_Addr.cpp \ - FILE_Connector.cpp \ - FILE_IO.cpp \ - File_Lock.cpp \ - Filecache.cpp \ - Flag_Manip.cpp \ - Framework_Component.cpp \ - Functor.cpp \ - Functor_String.cpp \ - Get_Opt.cpp \ - Handle_Ops.cpp \ - Handle_Set.cpp \ - Hashable.cpp \ - High_Res_Timer.cpp \ - ICMP_Socket.cpp \ - INET_Addr.cpp \ - IOStream.cpp \ - IO_Cntl_Msg.cpp \ - IO_SAP.cpp \ - IPC_SAP.cpp \ - Init_ACE.cpp \ - LSOCK.cpp \ - LSOCK_Acceptor.cpp \ - LSOCK_CODgram.cpp \ - LSOCK_Connector.cpp \ - LSOCK_Dgram.cpp \ - LSOCK_Stream.cpp \ - Lib_Find.cpp \ - Local_Memory_Pool.cpp \ - Local_Name_Space.cpp \ - Local_Tokens.cpp \ - Lock.cpp \ - Log_Msg.cpp \ - Log_Msg_Backend.cpp \ - Log_Msg_Callback.cpp \ - Log_Msg_IPC.cpp \ - Log_Msg_NT_Event_Log.cpp \ - Log_Msg_UNIX_Syslog.cpp \ - Log_Record.cpp \ - Logging_Strategy.cpp \ - MEM_Acceptor.cpp \ - MEM_Addr.cpp \ - MEM_Connector.cpp \ - MEM_IO.cpp \ - MEM_SAP.cpp \ - MEM_Stream.cpp \ - MMAP_Memory_Pool.cpp \ - Malloc.cpp \ - Malloc_Allocator.cpp \ - Manual_Event.cpp \ - Mem_Map.cpp \ - Message_Block.cpp \ - Message_Queue.cpp \ - Message_Queue_NT.cpp \ - Message_Queue_Vx.cpp \ - Method_Request.cpp \ - Monitor_Admin.cpp \ - Monitor_Admin_Manager.cpp \ - Monitor_Base.cpp \ - Monitor_Control_Action.cpp \ - Monitor_Control_Types.cpp \ - Monitor_Point_Registry.cpp \ - Monitor_Size.cpp \ - Msg_WFMO_Reactor.cpp \ - Multihomed_INET_Addr.cpp \ - Mutex.cpp \ - NT_Service.cpp \ - Name_Proxy.cpp \ - Name_Request_Reply.cpp \ - Name_Space.cpp \ - Naming_Context.cpp \ - Netlink_Addr.cpp \ - Notification_Queue.cpp \ - Notification_Strategy.cpp \ - OS_Errno.cpp \ - OS_Log_Msg_Attributes.cpp \ - OS_NS_Thread.cpp \ - OS_NS_arpa_inet.cpp \ - OS_NS_ctype.cpp \ - OS_NS_dirent.cpp \ - OS_NS_dlfcn.cpp \ - OS_NS_errno.cpp \ - OS_NS_fcntl.cpp \ - OS_NS_math.cpp \ - OS_NS_netdb.cpp \ - OS_NS_poll.cpp \ - OS_NS_pwd.cpp \ - OS_NS_regex.cpp \ - OS_NS_signal.cpp \ - OS_NS_stdio.cpp \ - OS_NS_stdlib.cpp \ - OS_NS_string.cpp \ - OS_NS_strings.cpp \ - OS_NS_stropts.cpp \ - OS_NS_sys_mman.cpp \ - OS_NS_sys_msg.cpp \ - OS_NS_sys_resource.cpp \ - OS_NS_sys_select.cpp \ - OS_NS_sys_sendfile.cpp \ - OS_NS_sys_shm.cpp \ - OS_NS_sys_socket.cpp \ - OS_NS_sys_stat.cpp \ - OS_NS_sys_time.cpp \ - OS_NS_sys_uio.cpp \ - OS_NS_sys_utsname.cpp \ - OS_NS_sys_wait.cpp \ - OS_NS_time.cpp \ - OS_NS_unistd.cpp \ - OS_NS_wchar.cpp \ - OS_NS_wctype.cpp \ - OS_QoS.cpp \ - OS_TLI.cpp \ - OS_Thread_Adapter.cpp \ - OS_main.cpp \ - Obchunk.cpp \ - Object_Manager.cpp \ - Object_Manager_Base.cpp \ - PI_Malloc.cpp \ - POSIX_Asynch_IO.cpp \ - POSIX_CB_Proactor.cpp \ - POSIX_Proactor.cpp \ - Pagefile_Memory_Pool.cpp \ - Parse_Node.cpp \ - Ping_Socket.cpp \ - Pipe.cpp \ - Priority_Reactor.cpp \ - Proactor.cpp \ - Proactor_Impl.cpp \ - Process.cpp \ - Process_Manager.cpp \ - Process_Mutex.cpp \ - Process_Semaphore.cpp \ - Profile_Timer.cpp \ - RW_Mutex.cpp \ - RW_Process_Mutex.cpp \ - RW_Thread_Mutex.cpp \ - Reactor.cpp \ - Reactor_Impl.cpp \ - Reactor_Notification_Strategy.cpp \ - Reactor_Timer_Interface.cpp \ - Read_Buffer.cpp \ - Recursive_Thread_Mutex.cpp \ - Recyclable.cpp \ - Registry.cpp \ - Registry_Name_Space.cpp \ - Remote_Name_Space.cpp \ - Remote_Tokens.cpp \ - Rtems_init.c \ - SOCK.cpp \ - SOCK_Acceptor.cpp \ - SOCK_CODgram.cpp \ - SOCK_Connector.cpp \ - SOCK_Dgram.cpp \ - SOCK_Dgram_Bcast.cpp \ - SOCK_Dgram_Mcast.cpp \ - SOCK_IO.cpp \ - SOCK_Netlink.cpp \ - SOCK_SEQPACK_Acceptor.cpp \ - SOCK_SEQPACK_Association.cpp \ - SOCK_SEQPACK_Connector.cpp \ - SOCK_Stream.cpp \ - SPIPE.cpp \ - SPIPE_Acceptor.cpp \ - SPIPE_Addr.cpp \ - SPIPE_Connector.cpp \ - SPIPE_Stream.cpp \ - SString.cpp \ - Stack_Trace.cpp \ - SUN_Proactor.cpp \ - SV_Message.cpp \ - SV_Message_Queue.cpp \ - SV_Semaphore_Complex.cpp \ - SV_Semaphore_Simple.cpp \ - SV_Shared_Memory.cpp \ - Sample_History.cpp \ - Sbrk_Memory_Pool.cpp \ - Sched_Params.cpp \ - Select_Reactor_Base.cpp \ - Semaphore.cpp \ - Service_Config.cpp \ - Service_Gestalt.cpp \ - Service_Manager.cpp \ - Service_Object.cpp \ - Service_Repository.cpp \ - Service_Types.cpp \ - Shared_Memory.cpp \ - Shared_Memory_MM.cpp \ - Shared_Memory_Pool.cpp \ - Shared_Memory_SV.cpp \ - Shared_Object.cpp \ - Sig_Adapter.cpp \ - Sig_Handler.cpp \ - Signal.cpp \ - Sock_Connect.cpp \ - Stats.cpp \ - String_Base_Const.cpp \ - Svc_Conf_Lexer.cpp \ - Svc_Conf_y.cpp \ - Synch_Options.cpp \ - System_Time.cpp \ - TLI.cpp \ - TLI_Acceptor.cpp \ - TLI_Connector.cpp \ - TLI_Stream.cpp \ - TP_Reactor.cpp \ - TSS_Adapter.cpp \ - TTY_IO.cpp \ - Task.cpp \ - Thread.cpp \ - Thread_Adapter.cpp \ - Thread_Control.cpp \ - Thread_Exit.cpp \ - Thread_Hook.cpp \ - Thread_Manager.cpp \ - Thread_Mutex.cpp \ - Thread_Semaphore.cpp \ - Throughput_Stats.cpp \ - Time_Value.cpp \ - Timeprobe.cpp \ - Token.cpp \ - Token_Collection.cpp \ - Token_Invariants.cpp \ - Token_Manager.cpp \ - Token_Request_Reply.cpp \ - Trace.cpp \ - UNIX_Addr.cpp \ - UPIPE_Acceptor.cpp \ - UPIPE_Connector.cpp \ - UPIPE_Stream.cpp \ - UTF16_Encoding_Converter.cpp \ - UTF32_Encoding_Converter.cpp \ - UTF8_Encoding_Converter.cpp \ - UUID.cpp \ - WFMO_Reactor.cpp \ - WIN32_Asynch_IO.cpp \ - WIN32_Proactor.cpp \ - XML_Svc_Conf.cpp \ - XTI_ATM_Mcast.cpp \ - ace_wchar.cpp \ - gethrtime.cpp - -libACE_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ - -nobase_include_HEADERS += \ - ACE.h \ - ACE.inl \ - ACE_export.h \ - ARGV.cpp \ - ARGV.h \ - ARGV.inl \ - ATM_Acceptor.h \ - ATM_Acceptor.inl \ - ATM_Addr.h \ - ATM_Addr.inl \ - ATM_Connector.h \ - ATM_Connector.inl \ - ATM_Params.h \ - ATM_Params.inl \ - ATM_QoS.h \ - ATM_QoS.inl \ - ATM_Stream.h \ - ATM_Stream.inl \ - Acceptor.cpp \ - Acceptor.h \ - Activation_Queue.h \ - Activation_Queue.inl \ - Active_Map_Manager.h \ - Active_Map_Manager.inl \ - Active_Map_Manager_T.cpp \ - Active_Map_Manager_T.h \ - Active_Map_Manager_T.inl \ - Addr.h \ - Addr.inl \ - Arg_Shifter.cpp \ - Arg_Shifter.h \ - Argv_Type_Converter.h \ - Argv_Type_Converter.inl \ - Array.h \ - Array_Base.cpp \ - Array_Base.h \ - Array_Base.inl \ - Array_Map.cpp \ - Array_Map.h \ - Array_Map.inl \ - Assert.h \ - Asynch_Acceptor.cpp \ - Asynch_Acceptor.h \ - Asynch_Connector.cpp \ - Asynch_Connector.h \ - Asynch_IO.h \ - Asynch_IO_Impl.h \ - Asynch_IO_Impl.inl \ - Asynch_Pseudo_Task.h \ - Atomic_Op.h \ - Atomic_Op.inl \ - Atomic_Op_Sparc.h \ - Atomic_Op_T.cpp \ - Atomic_Op_GCC_T.h \ - Atomic_Op_GCC_T.cpp \ - Atomic_Op_GCC_T.inl \ - Atomic_Op_T.h \ - Atomic_Op_T.inl \ - Auto_Event.h \ - Auto_Event.inl \ - Auto_Functor.cpp \ - Auto_Functor.h \ - Auto_Functor.inl \ - Auto_IncDec_T.cpp \ - Auto_IncDec_T.h \ - Auto_IncDec_T.inl \ - Auto_Ptr.cpp \ - Auto_Ptr.h \ - Auto_Ptr.inl \ - Barrier.h \ - Barrier.inl \ - Base_Thread_Adapter.h \ - Base_Thread_Adapter.inl \ - Based_Pointer_Repository.h \ - Based_Pointer_T.cpp \ - Based_Pointer_T.h \ - Based_Pointer_T.inl \ - Basic_Stats.h \ - Basic_Stats.inl \ - Basic_Types.h \ - Basic_Types.inl \ - Bound_Ptr.h \ - Bound_Ptr.inl \ - CDR_Base.h \ - CDR_Base.inl \ - CDR_Size.h \ - CDR_Size.inl \ - CDR_Stream.h \ - CDR_Stream.inl \ - CORBA_macros.h \ - Cache_Map_Manager_T.cpp \ - Cache_Map_Manager_T.h \ - Cache_Map_Manager_T.inl \ - Cached_Connect_Strategy_T.cpp \ - Cached_Connect_Strategy_T.h \ - Caching_Strategies_T.cpp \ - Caching_Strategies_T.h \ - Caching_Strategies_T.inl \ - Caching_Utility_T.cpp \ - Caching_Utility_T.h \ - Capabilities.h \ - Capabilities.inl \ - Cleanup.h \ - Cleanup.inl \ - Cleanup_Strategies_T.cpp \ - Cleanup_Strategies_T.h \ - Codecs.h \ - Codeset_IBM1047.h \ - Codeset_Registry.h \ - Codeset_Registry.inl \ - Condition_Recursive_Thread_Mutex.h \ - Condition_T.cpp \ - Condition_T.h \ - Condition_T.inl \ - Condition_Thread_Mutex.h \ - Condition_Thread_Mutex.inl \ - Configuration.h \ - Configuration.inl \ - Configuration_Import_Export.h \ - Connection_Recycling_Strategy.h \ - Connector.cpp \ - Connector.h \ - Containers.h \ - Containers.inl \ - Containers_T.cpp \ - Containers_T.h \ - Containers_T.inl \ - Copy_Disabled.h \ - Countdown_Time.h \ - Countdown_Time.inl \ - DEV.h \ - DEV.inl \ - DEV_Addr.h \ - DEV_Addr.inl \ - DEV_Connector.h \ - DEV_Connector.inl \ - DEV_IO.h \ - DEV_IO.inl \ - DLL.h \ - DLL_Manager.h \ - Date_Time.h \ - Date_Time.inl \ - Default_Constants.h \ - Dev_Poll_Reactor.h \ - Dev_Poll_Reactor.inl \ - Dirent.h \ - Dirent.inl \ - Dirent_Selector.h \ - Dirent_Selector.inl \ - Dump.h \ - Dump_T.cpp \ - Dump_T.h \ - Dynamic.h \ - Dynamic.inl \ - Dynamic_Message_Strategy.h \ - Dynamic_Message_Strategy.inl \ - Dynamic_Service.cpp \ - Dynamic_Service.h \ - Dynamic_Service.inl \ - Dynamic_Service_Base.h \ - Dynamic_Service_Dependency.h \ - Encoding_Converter.h \ - Encoding_Converter_Factory.h \ - Env_Value_T.cpp \ - Env_Value_T.h \ - Env_Value_T.inl \ - Event.h \ - Event.inl \ - Event_Handler.h \ - Event_Handler.inl \ - Event_Handler_T.cpp \ - Event_Handler_T.h \ - Event_Handler_T.inl \ - Exception_Macros.h \ - FIFO.h \ - FIFO.inl \ - FIFO_Recv.h \ - FIFO_Recv.inl \ - FIFO_Recv_Msg.h \ - FIFO_Recv_Msg.inl \ - FIFO_Send.h \ - FIFO_Send.inl \ - FIFO_Send_Msg.h \ - FIFO_Send_Msg.inl \ - FILE.h \ - FILE.inl \ - FILE_Addr.h \ - FILE_Addr.inl \ - FILE_Connector.h \ - FILE_Connector.inl \ - FILE_IO.h \ - FILE_IO.inl \ - File_Lock.h \ - File_Lock.inl \ - Filecache.h \ - Flag_Manip.h \ - Flag_Manip.inl \ - Framework_Component.h \ - Framework_Component.inl \ - Framework_Component_T.cpp \ - Framework_Component_T.h \ - Free_List.cpp \ - Free_List.h \ - Functor.h \ - Functor.inl \ - Functor_String.h \ - Functor_String.inl \ - Functor_T.cpp \ - Functor_T.h \ - Functor_T.inl \ - Future.cpp \ - Future.h \ - Future_Set.cpp \ - Future_Set.h \ - Get_Opt.h \ - Get_Opt.inl \ - Global_Macros.h \ - Guard_T.cpp \ - Guard_T.h \ - Guard_T.inl \ - Handle_Gobbler.h \ - Handle_Gobbler.inl \ - Handle_Ops.h \ - Handle_Set.h \ - Handle_Set.inl \ - Hash_Cache_Map_Manager_T.cpp \ - Hash_Cache_Map_Manager_T.h \ - Hash_Cache_Map_Manager_T.inl \ - Hash_Map_Manager.h \ - Hash_Map_Manager_T.cpp \ - Hash_Map_Manager_T.h \ - Hash_Map_Manager_T.inl \ - Hash_Map_With_Allocator_T.cpp \ - Hash_Map_With_Allocator_T.h \ - Hash_Map_With_Allocator_T.inl \ - Hash_Multi_Map_Manager_T.cpp \ - Hash_Multi_Map_Manager_T.h \ - Hash_Multi_Map_Manager_T.inl \ - Hashable.h \ - Hashable.inl \ - High_Res_Timer.h \ - High_Res_Timer.inl \ - ICMP_Socket.h \ - INET_Addr.h \ - INET_Addr.inl \ - IOStream.h \ - IOStream_T.cpp \ - IOStream_T.h \ - IOStream_T.inl \ - IO_Cntl_Msg.h \ - IO_Cntl_Msg.inl \ - IO_SAP.h \ - IO_SAP.inl \ - IPC_SAP.h \ - IPC_SAP.inl \ - If_Then_Else.h \ - Init_ACE.h \ - Intrusive_Auto_Ptr.cpp \ - Intrusive_Auto_Ptr.h \ - Intrusive_Auto_Ptr.inl \ - Intrusive_List.cpp \ - Intrusive_List.h \ - Intrusive_List.inl \ - Intrusive_List_Node.cpp \ - Intrusive_List_Node.h \ - Intrusive_List_Node.inl \ - LOCK_SOCK_Acceptor.cpp \ - LOCK_SOCK_Acceptor.h \ - LSOCK.h \ - LSOCK.inl \ - LSOCK_Acceptor.h \ - LSOCK_CODgram.h \ - LSOCK_CODgram.inl \ - LSOCK_Connector.h \ - LSOCK_Connector.inl \ - LSOCK_Dgram.h \ - LSOCK_Dgram.inl \ - LSOCK_Stream.h \ - LSOCK_Stream.inl \ - Lib_Find.h \ - Local_Memory_Pool.h \ - Local_Name_Space.h \ - Local_Name_Space_T.cpp \ - Local_Name_Space_T.h \ - Local_Tokens.h \ - Local_Tokens.inl \ - Lock.h \ - Lock.inl \ - Lock_Adapter_T.cpp \ - Lock_Adapter_T.h \ - Lock_Adapter_T.inl \ - Log_Msg.h \ - Log_Msg.inl \ - Log_Msg_Backend.h \ - Log_Msg_Callback.h \ - Log_Msg_IPC.h \ - Log_Msg_NT_Event_Log.h \ - Log_Msg_UNIX_Syslog.h \ - Log_Priority.h \ - Log_Record.h \ - Log_Record.inl \ - Logging_Strategy.h \ - MEM_Acceptor.h \ - MEM_Acceptor.inl \ - MEM_Addr.h \ - MEM_Addr.inl \ - MEM_Connector.h \ - MEM_Connector.inl \ - MEM_IO.h \ - MEM_IO.inl \ - MEM_SAP.h \ - MEM_SAP.inl \ - MEM_Stream.h \ - MEM_Stream.inl \ - MMAP_Memory_Pool.h \ - MMAP_Memory_Pool.inl \ - Malloc.h \ - Malloc.inl \ - Malloc_Allocator.h \ - Malloc_Allocator.inl \ - Malloc_Base.h \ - Malloc_T.cpp \ - Malloc_T.h \ - Malloc_T.inl \ - Managed_Object.cpp \ - Managed_Object.h \ - Managed_Object.inl \ - Manual_Event.h \ - Manual_Event.inl \ - Map_Manager.cpp \ - Map_Manager.h \ - Map_Manager.inl \ - Map_T.cpp \ - Map_T.h \ - Map_T.inl \ - Mem_Map.h \ - Mem_Map.inl \ - Memory_Pool.h \ - Message_Block.h \ - Message_Block.inl \ - Message_Block_T.cpp \ - Message_Block_T.h \ - Message_Block_T.inl \ - Message_Queue.h \ - Message_Queue.inl \ - Message_Queue_NT.h \ - Message_Queue_NT.inl \ - Message_Queue_T.cpp \ - Message_Queue_T.h \ - Message_Queue_Vx.h \ - Message_Queue_Vx.inl \ - Method_Object.h \ - Method_Request.h \ - Min_Max.h \ - Module.cpp \ - Module.h \ - Module.inl \ - Monitor_Admin.h \ - Monitor_Admin_Manager.h \ - Monitor_Base.h \ - Monitor_Base.inl \ - Monitor_Control_Action.h \ - Monitor_Control_Types.h \ - Monitor_Point_Registry.h \ - Monitor_Size.h \ - Msg_WFMO_Reactor.h \ - Msg_WFMO_Reactor.inl \ - Multihomed_INET_Addr.h \ - Multihomed_INET_Addr.inl \ - Mutex.h \ - Mutex.inl \ - NT_Service.h \ - NT_Service.inl \ - Name_Proxy.h \ - Name_Request_Reply.h \ - Name_Space.h \ - Naming_Context.h \ - Naming_Context.inl \ - Netlink_Addr.h \ - Netlink_Addr.inl \ - Node.cpp \ - Node.h \ - Notification_Queue.h \ - Notification_Queue.inl \ - Notification_Strategy.h \ - Notification_Strategy.inl \ - Null_Barrier.h \ - Null_Condition.h \ - Null_Mutex.h \ - Null_Semaphore.h \ - Numeric_Limits.h \ - OS.h \ - OS.inl \ - OS_Dirent.h \ - OS_Errno.h \ - OS_Errno.inl \ - OS_Log_Msg_Attributes.h \ - OS_Log_Msg_Attributes.inl \ - OS_Memory.h \ - OS_NS_Thread.h \ - OS_NS_Thread.inl \ - OS_NS_arpa_inet.h \ - OS_NS_arpa_inet.inl \ - OS_NS_ctype.h \ - OS_NS_ctype.inl \ - OS_NS_dirent.h \ - OS_NS_dirent.inl \ - OS_NS_dlfcn.h \ - OS_NS_dlfcn.inl \ - OS_NS_errno.h \ - OS_NS_errno.inl \ - OS_NS_fcntl.h \ - OS_NS_fcntl.inl \ - OS_NS_macros.h \ - OS_NS_math.h \ - OS_NS_math.inl \ - OS_NS_netdb.h \ - OS_NS_netdb.inl \ - OS_NS_poll.h \ - OS_NS_poll.inl \ - OS_NS_pwd.h \ - OS_NS_pwd.inl \ - OS_NS_regex.h \ - OS_NS_regex.inl \ - OS_NS_signal.h \ - OS_NS_signal.inl \ - OS_NS_stdio.h \ - OS_NS_stdio.inl \ - OS_NS_stdlib.h \ - OS_NS_stdlib.inl \ - OS_NS_string.h \ - OS_NS_string.inl \ - OS_NS_strings.h \ - OS_NS_strings.inl \ - OS_NS_stropts.h \ - OS_NS_stropts.inl \ - OS_NS_sys_mman.h \ - OS_NS_sys_mman.inl \ - OS_NS_sys_msg.h \ - OS_NS_sys_msg.inl \ - OS_NS_sys_resource.h \ - OS_NS_sys_resource.inl \ - OS_NS_sys_select.h \ - OS_NS_sys_select.inl \ - OS_NS_sys_sendfile.h \ - OS_NS_sys_sendfile.inl \ - OS_NS_sys_shm.h \ - OS_NS_sys_shm.inl \ - OS_NS_sys_socket.h \ - OS_NS_sys_socket.inl \ - OS_NS_sys_stat.h \ - OS_NS_sys_stat.inl \ - OS_NS_sys_time.h \ - OS_NS_sys_time.inl \ - OS_NS_sys_uio.h \ - OS_NS_sys_uio.inl \ - OS_NS_sys_utsname.h \ - OS_NS_sys_wait.h \ - OS_NS_sys_wait.inl \ - OS_NS_time.h \ - OS_NS_time.inl \ - OS_NS_unistd.h \ - OS_NS_unistd.inl \ - OS_NS_wchar.h \ - OS_NS_wctype.h \ - OS_NS_wctype.inl \ - OS_NS_wchar.inl \ - OS_QoS.h \ - OS_String.h \ - OS_TLI.h \ - OS_TLI.inl \ - OS_Thread_Adapter.h \ - OS_main.h \ - Obchunk.h \ - Obchunk.inl \ - Object_Manager.h \ - Object_Manager.inl \ - Object_Manager_Base.h \ - Obstack_T.cpp \ - Obstack_T.h \ - Obstack_T.inl \ - PI_Malloc.h \ - PI_Malloc.inl \ - POSIX_Asynch_IO.h \ - POSIX_CB_Proactor.h \ - POSIX_Proactor.h \ - POSIX_Proactor.inl \ - Pagefile_Memory_Pool.h \ - Pagefile_Memory_Pool.inl \ - Pair.h \ - Pair_T.cpp \ - Pair_T.h \ - Pair_T.inl \ - Parse_Node.h \ - Ping_Socket.h \ - Ping_Socket.inl \ - Pipe.h \ - Pipe.inl \ - Priority_Reactor.h \ - Proactor.h \ - Proactor.inl \ - Proactor_Impl.h \ - Process.h \ - Process.inl \ - Process_Manager.h \ - Process_Manager.inl \ - Process_Mutex.h \ - Process_Mutex.inl \ - Process_Semaphore.h \ - Process_Semaphore.inl \ - Profile_Timer.h \ - Profile_Timer.inl \ - RB_Tree.cpp \ - RB_Tree.h \ - RB_Tree.inl \ - RW_Mutex.h \ - RW_Mutex.inl \ - RW_Process_Mutex.h \ - RW_Process_Mutex.inl \ - RW_Thread_Mutex.h \ - RW_Thread_Mutex.inl \ - Reactor.h \ - Reactor.inl \ - Reactor_Impl.h \ - Reactor_Notification_Strategy.h \ - Reactor_Notification_Strategy.inl \ - Reactor_Timer_Interface.h \ - Reactor_Token_T.cpp \ - Reactor_Token_T.h \ - Read_Buffer.h \ - Read_Buffer.inl \ - Recursive_Thread_Mutex.h \ - Recursive_Thread_Mutex.inl \ - Recyclable.h \ - Recyclable.inl \ - Refcountable.h \ - Refcountable_T.cpp \ - Refcountable_T.h \ - Refcountable_T.inl \ - Refcounted_Auto_Ptr.cpp \ - Refcounted_Auto_Ptr.h \ - Refcounted_Auto_Ptr.inl \ - Registry.h \ - Registry_Name_Space.h \ - Remote_Name_Space.h \ - Remote_Tokens.h \ - Remote_Tokens.inl \ - Reverse_Lock_T.cpp \ - Reverse_Lock_T.h \ - Reverse_Lock_T.inl \ - SOCK.h \ - SOCK.inl \ - SOCK_Acceptor.h \ - SOCK_Acceptor.inl \ - SOCK_CODgram.h \ - SOCK_CODgram.inl \ - SOCK_Connector.h \ - SOCK_Connector.inl \ - SOCK_Dgram.h \ - SOCK_Dgram.inl \ - SOCK_Dgram_Bcast.h \ - SOCK_Dgram_Bcast.inl \ - SOCK_Dgram_Mcast.h \ - SOCK_Dgram_Mcast.inl \ - SOCK_IO.h \ - SOCK_IO.inl \ - SOCK_Netlink.h \ - SOCK_Netlink.inl \ - SOCK_SEQPACK_Acceptor.h \ - SOCK_SEQPACK_Acceptor.inl \ - SOCK_SEQPACK_Association.h \ - SOCK_SEQPACK_Association.inl \ - SOCK_SEQPACK_Connector.h \ - SOCK_SEQPACK_Connector.inl \ - SOCK_Stream.h \ - SOCK_Stream.inl \ - SPIPE.h \ - SPIPE.inl \ - SPIPE_Acceptor.h \ - SPIPE_Addr.h \ - SPIPE_Addr.inl \ - SPIPE_Connector.h \ - SPIPE_Connector.inl \ - SPIPE_Stream.h \ - SPIPE_Stream.inl \ - SString.h \ - SString.inl \ - SStringfwd.h \ - Stack_Trace.h \ - SUN_Proactor.h \ - SV_Message.h \ - SV_Message.inl \ - SV_Message_Queue.h \ - SV_Message_Queue.inl \ - SV_Semaphore_Complex.h \ - SV_Semaphore_Complex.inl \ - SV_Semaphore_Simple.h \ - SV_Semaphore_Simple.inl \ - SV_Shared_Memory.h \ - SV_Shared_Memory.inl \ - Sample_History.h \ - Sample_History.inl \ - Sbrk_Memory_Pool.h \ - Sched_Params.h \ - Sched_Params.inl \ - Select_Reactor.h \ - Select_Reactor_Base.h \ - Select_Reactor_Base.inl \ - Select_Reactor_T.cpp \ - Select_Reactor_T.h \ - Select_Reactor_T.inl \ - Semaphore.h \ - Semaphore.inl \ - Service_Config.h \ - Service_Config.inl \ - Service_Gestalt.h \ - Service_Gestalt.inl \ - Service_Manager.h \ - Service_Object.h \ - Service_Object.inl \ - Service_Repository.h \ - Service_Repository.inl \ - Service_Types.h \ - Service_Types.inl \ - Shared_Memory.h \ - Shared_Memory_MM.h \ - Shared_Memory_MM.inl \ - Shared_Memory_Pool.h \ - Shared_Memory_SV.h \ - Shared_Memory_SV.inl \ - Shared_Object.h \ - Shared_Object.inl \ - Sig_Adapter.h \ - Sig_Handler.h \ - Sig_Handler.inl \ - Signal.h \ - Signal.inl \ - Singleton.cpp \ - Singleton.h \ - Singleton.inl \ - Sock_Connect.h \ - Static_Object_Lock.h \ - Stats.h \ - Stats.inl \ - Strategies.h \ - Strategies_T.cpp \ - Strategies_T.h \ - Strategies_T.inl \ - Stream.cpp \ - Stream.h \ - Stream.inl \ - Stream_Modules.cpp \ - Stream_Modules.h \ - String_Base.cpp \ - String_Base.h \ - String_Base.inl \ - String_Base_Const.h \ - Svc_Conf.h \ - Svc_Conf_Lexer.h \ - Svc_Conf_Tokens.h \ - Svc_Conf_Token_Table.h \ - Svc_Handler.cpp \ - Svc_Handler.h \ - Synch.h \ - Synch_Options.h \ - Synch_T.cpp \ - Synch_T.h \ - Synch_Traits.h \ - System_Time.h \ - TLI.h \ - TLI.inl \ - TLI_Acceptor.h \ - TLI_Connector.h \ - TLI_Connector.inl \ - TLI_Stream.h \ - TLI_Stream.inl \ - TP_Reactor.h \ - TP_Reactor.inl \ - TSS_Adapter.h \ - TSS_T.cpp \ - TSS_T.h \ - TSS_T.inl \ - TTY_IO.h \ - Task.h \ - Task.inl \ - Task_Ex_T.cpp \ - Task_Ex_T.h \ - Task_Ex_T.inl \ - Task_T.cpp \ - Task_T.h \ - Task_T.inl \ - Test_and_Set.cpp \ - Test_and_Set.h \ - Thread.h \ - Thread.inl \ - Thread_Adapter.h \ - Thread_Adapter.inl \ - Thread_Control.h \ - Thread_Control.inl \ - Thread_Exit.h \ - Thread_Hook.h \ - Thread_Manager.h \ - Thread_Manager.inl \ - Thread_Mutex.h \ - Thread_Mutex.inl \ - Thread_Semaphore.h \ - Thread_Semaphore.inl \ - Throughput_Stats.h \ - Time_Value.h \ - Time_Value.inl \ - Timeprobe.h \ - Timeprobe.inl \ - Timeprobe_T.cpp \ - Timeprobe_T.h \ - Timer_Hash_T.cpp \ - Timer_Hash_T.h \ - Timer_Heap_T.cpp \ - Timer_Heap_T.h \ - Timer_List_T.cpp \ - Timer_List_T.h \ - Timer_Queue_Adapters.cpp \ - Timer_Queue_Adapters.h \ - Timer_Queue_Adapters.inl \ - Timer_Queue_T.cpp \ - Timer_Queue_T.h \ - Timer_Queue_T.inl \ - Timer_Wheel_T.cpp \ - Timer_Wheel_T.h \ - Tokenizer_T.cpp \ - Tokenizer_T.h \ - Timer_Hash.h \ - Timer_Heap.h \ - Timer_List.h \ - Timer_Queue.h \ - Timer_Queuefwd.h \ - Timer_Wheel.h \ - Token.h \ - Token.inl \ - Token_Collection.h \ - Token_Collection.inl \ - Token_Invariants.h \ - Token_Manager.h \ - Token_Manager.inl \ - Token_Request_Reply.h \ - Token_Request_Reply.inl \ - Trace.h \ - Truncate.h \ - Typed_SV_Message.cpp \ - Typed_SV_Message.h \ - Typed_SV_Message.inl \ - Typed_SV_Message_Queue.cpp \ - Typed_SV_Message_Queue.h \ - Typed_SV_Message_Queue.inl \ - UNIX_Addr.h \ - UNIX_Addr.inl \ - UPIPE_Acceptor.h \ - UPIPE_Acceptor.inl \ - UPIPE_Addr.h \ - UPIPE_Connector.h \ - UPIPE_Connector.inl \ - UPIPE_Stream.h \ - UPIPE_Stream.inl \ - UTF16_Encoding_Converter.h \ - UTF16_Encoding_Converter.inl \ - UTF32_Encoding_Converter.h \ - UTF8_Encoding_Converter.h \ - UUID.h \ - UUID.inl \ - Unbounded_Queue.cpp \ - Unbounded_Queue.h \ - Unbounded_Queue.inl \ - Unbounded_Set.cpp \ - Unbounded_Set.h \ - Unbounded_Set.inl \ - Unbounded_Set_Ex.cpp \ - Unbounded_Set_Ex.h \ - Unbounded_Set_Ex.inl \ - Value_Ptr.h \ - Vector_T.cpp \ - Vector_T.h \ - Vector_T.inl \ - Version.h \ - Versioned_Namespace.h \ - WFMO_Reactor.h \ - WFMO_Reactor.inl \ - WIN32_Asynch_IO.h \ - WIN32_Proactor.h \ - XML_Svc_Conf.h \ - XTI_ATM_Mcast.h \ - XTI_ATM_Mcast.inl \ - ace_wchar.h \ - ace_wchar.inl \ - checked_iterator.h \ - config-WinCE.h \ - config-all.h \ - config-lite.h \ - config-macros.h \ - config-minimal.h \ - config-win32-borland.h \ - config-win32-common.h \ - config-win32-ghs.h \ - config-win32-msvc-7.h \ - config-win32-msvc-8.h \ - config-win32-msvc.h \ - config-win32.h \ - config.h \ - iosfwd.h \ - os_include/arpa/os_inet.h \ - os_include/net/os_if.h \ - os_include/netinet/os_in.h \ - os_include/netinet/os_tcp.h \ - os_include/os_aio.h \ - os_include/os_assert.h \ - os_include/os_byteswap.h \ - os_include/os_complex.h \ - os_include/os_cpio.h \ - os_include/os_ctype.h \ - os_include/os_dirent.h \ - os_include/os_dlfcn.h \ - os_include/os_errno.h \ - os_include/os_fcntl.h \ - os_include/os_fenv.h \ - os_include/os_float.h \ - os_include/os_fmtmsg.h \ - os_include/os_fnmatch.h \ - os_include/os_ftw.h \ - os_include/os_glob.h \ - os_include/os_grp.h \ - os_include/os_iconv.h \ - os_include/os_intrin.h \ - os_include/os_inttypes.h \ - os_include/os_iso646.h \ - os_include/os_kstat.h \ - os_include/os_langinfo.h \ - os_include/os_libgen.h \ - os_include/os_limits.h \ - os_include/os_local.h \ - os_include/os_math.h \ - os_include/os_monetary.h \ - os_include/os_mqueue.h \ - os_include/os_ndbm.h \ - os_include/os_netdb.h \ - os_include/os_nl_types.h \ - os_include/os_pdh.h \ - os_include/os_pdhmsg.h \ - os_include/os_poll.h \ - os_include/os_pthread.h \ - os_include/os_pwd.h \ - os_include/os_regex.h \ - os_include/os_sched.h \ - os_include/os_search.h \ - os_include/os_semaphore.h \ - os_include/os_setjmp.h \ - os_include/os_signal.h \ - os_include/os_spawn.h \ - os_include/os_stdarg.h \ - os_include/os_stdbool.h \ - os_include/os_stddef.h \ - os_include/os_stdint.h \ - os_include/os_stdio.h \ - os_include/os_stdlib.h \ - os_include/os_string.h \ - os_include/os_strings.h \ - os_include/os_stropts.h \ - os_include/os_syslog.h \ - os_include/os_tar.h \ - os_include/os_termios.h \ - os_include/os_tgmath.h \ - os_include/os_time.h \ - os_include/os_trace.h \ - os_include/os_typeinfo.h \ - os_include/os_ucontext.h \ - os_include/os_ulimit.h \ - os_include/os_unistd.h \ - os_include/os_utime.h \ - os_include/os_utmpx.h \ - os_include/os_wchar.h \ - os_include/os_wctype.h \ - os_include/os_wordexp.h \ - os_include/sys/os_ipc.h \ - os_include/sys/os_loadavg.h \ - os_include/sys/os_mman.h \ - os_include/sys/os_msg.h \ - os_include/sys/os_pstat.h \ - os_include/sys/os_resource.h \ - os_include/sys/os_select.h \ - os_include/sys/os_sem.h \ - os_include/sys/os_shm.h \ - os_include/sys/os_socket.h \ - os_include/sys/os_stat.h \ - os_include/sys/os_statvfs.h \ - os_include/sys/os_sysctl.h \ - os_include/sys/os_sysinfo.h \ - os_include/sys/os_time.h \ - os_include/sys/os_timeb.h \ - os_include/sys/os_times.h \ - os_include/sys/os_types.h \ - os_include/sys/os_uio.h \ - os_include/sys/os_un.h \ - os_include/sys/os_utsname.h \ - os_include/sys/os_wait.h \ - post.h \ - pre.h \ - streams.h \ - svc_export.h - -pkgconfig_DATA += \ - ACE.pc - -CLEANFILES += \ - ACE.pc - -ACE.pc: ${top_builddir}/config.status ${srcdir}/ACE.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACE.pc.in - -endif !BUILD_ACE_FOR_TAO - -EXTRA_DIST = \ - ACE.pc.in \ - ace.rc - - -## Makefile.ACE_FlReactor.am - -if BUILD_FL -if BUILD_GL -if BUILD_X11 - -lib_LTLIBRARIES += libACE_FlReactor.la - -libACE_FlReactor_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - $(ACE_FLTK_CPPFLAGS) \ - -DACE_FLREACTOR_BUILD_DLL - -libACE_FlReactor_la_SOURCES = \ - FlReactor/FlReactor.cpp - -libACE_FlReactor_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ $(ACE_FLTK_LDFLAGS) - -libACE_FlReactor_la_LIBADD = \ - libACE.la \ - $(ACE_FLTK_LIBS) - -nobase_include_HEADERS += \ - FlReactor/ACE_FlReactor_export.h \ - FlReactor/FlReactor.h - -pkgconfig_DATA += \ - ACE_FlReactor.pc - -CLEANFILES += \ - ACE_FlReactor.pc - -ACE_FlReactor.pc: ${top_builddir}/config.status ${srcdir}/FlReactor/ACE_FlReactor.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/FlReactor/ACE_FlReactor.pc.in - -endif BUILD_X11 -endif BUILD_GL -endif BUILD_FL - -EXTRA_DIST += \ - FlReactor/ACE_FlReactor.pc.in - - -## Makefile.ACE_QtReactor.am - -if BUILD_QT - -BUILT_SOURCES = \ - QtReactor/QtReactor_moc.cpp - -CLEANFILES += \ - QtReactor/QtReactor_moc.cpp - -QtReactor/QtReactor_moc.cpp: $(srcdir)/QtReactor/QtReactor.h - $(QTDIR)/bin/moc $(srcdir)/QtReactor/QtReactor.h -o QtReactor/QtReactor_moc.cpp - -lib_LTLIBRARIES += libACE_QtReactor.la - -libACE_QtReactor_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - $(ACE_QT_CPPFLAGS) \ - -DACE_QTREACTOR_BUILD_DLL - -libACE_QtReactor_la_SOURCES = \ - QtReactor/QtReactor.cpp \ - QtReactor/QtReactor_moc.cpp - -libACE_QtReactor_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ $(ACE_QT_LDFLAGS) - -libACE_QtReactor_la_LIBADD = \ - libACE.la \ - $(ACE_QT_LIBS) - -nobase_include_HEADERS += \ - QtReactor/ACE_QtReactor_export.h \ - QtReactor/QtReactor.h - -pkgconfig_DATA += \ - ACE_QtReactor.pc - -CLEANFILES += \ - ACE_QtReactor.pc - -ACE_QtReactor.pc: ${top_builddir}/config.status ${srcdir}/QtReactor/ACE_QtReactor.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/QtReactor/ACE_QtReactor.pc.in - -endif BUILD_QT - -EXTRA_DIST += \ - QtReactor/ACE_QtReactor.pc.in - - -## Makefile.ACE_TkReactor.am - -if BUILD_TK - -lib_LTLIBRARIES += libACE_TkReactor.la - -libACE_TkReactor_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - $(ACE_TK_CPPFLAGS) \ - $(ACE_TCL_CPPFLAGS) \ - -DACE_TKREACTOR_BUILD_DLL - -libACE_TkReactor_la_SOURCES = \ - TkReactor/TkReactor.cpp - -libACE_TkReactor_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS) - -libACE_TkReactor_la_LIBADD = \ - libACE.la \ - $(ACE_TK_LIBS) \ - $(ACE_TCL_LIBS) - -nobase_include_HEADERS += \ - TkReactor/ACE_TkReactor_export.h \ - TkReactor/TkReactor.h - -pkgconfig_DATA += \ - ACE_TkReactor.pc - -CLEANFILES += \ - ACE_TkReactor.pc - -ACE_TkReactor.pc: ${top_builddir}/config.status ${srcdir}/TkReactor/ACE_TkReactor.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TkReactor/ACE_TkReactor.pc.in - -endif BUILD_TK - -EXTRA_DIST += \ - TkReactor/ACE_TkReactor.pc.in - - -## Makefile.ACE_XtReactor.am - -if BUILD_X11 -if BUILD_XT - -lib_LTLIBRARIES += libACE_XtReactor.la - -libACE_XtReactor_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - $(ACE_X11_CPPFLAGS) \ - $(ACE_XT_CPPFLAGS) \ - -DACE_XTREACTOR_BUILD_DLL - -libACE_XtReactor_la_SOURCES = \ - XtReactor/XtReactor.cpp - -libACE_XtReactor_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS) - -libACE_XtReactor_la_LIBADD = \ - libACE.la \ - $(ACE_XT_LIBS) \ - $(ACE_X11_LIBS) - -nobase_include_HEADERS += \ - XtReactor/ACE_XtReactor_export.h \ - XtReactor/XtReactor.h - -pkgconfig_DATA += \ - ACE_XtReactor.pc - -CLEANFILES += \ - ACE_XtReactor.pc - -ACE_XtReactor.pc: ${top_builddir}/config.status ${srcdir}/XtReactor/ACE_XtReactor.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/XtReactor/ACE_XtReactor.pc.in - -endif BUILD_XT -endif BUILD_X11 - -EXTRA_DIST += \ - XtReactor/ACE_XtReactor.pc.in - - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/externals/ace/Makefile.in b/externals/ace/Makefile.in index 7523b688745..946522f08af 100644 --- a/externals/ace/Makefile.in +++ b/externals/ace/Makefile.in @@ -1963,7 +1963,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ diff --git a/externals/ace/Malloc_Base.h b/externals/ace/Malloc_Base.h index d800c7fe544..6a13d020ad6 100644 --- a/externals/ace/Malloc_Base.h +++ b/externals/ace/Malloc_Base.h @@ -4,7 +4,7 @@ /** * @file Malloc_Base.h * - * $Id: Malloc_Base.h 91058 2010-07-12 08:20:09Z johnnyw $ + * $Id: Malloc_Base.h 80826 2008-03-04 14:51:23Z wotte $ * * @author Doug Schmidt and Irfan Pyarali */ @@ -73,7 +73,7 @@ public: size_type elem_size, char initial_value = '\0') = 0; - /// Free @a ptr (must have been allocated by ACE_Allocator::malloc()). + /// Free <ptr> (must have been allocated by <ACE_Allocator::malloc>). virtual void free (void *ptr) = 0; /// Remove any resources associated with this memory manager. diff --git a/externals/ace/Manual_Event.h b/externals/ace/Manual_Event.h index 5242ef17c96..4686e35d39d 100644 --- a/externals/ace/Manual_Event.h +++ b/externals/ace/Manual_Event.h @@ -4,7 +4,7 @@ /** * @file Manual_Event.h * - * $Id: Manual_Event.h 91066 2010-07-12 11:05:04Z johnnyw $ + * $Id: Manual_Event.h 80826 2008-03-04 14:51:23Z wotte $ * * Moved from Synch.h. * @@ -39,14 +39,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Manual_Event : public ACE_Event { public: - /// Constructor which will create manual event + /// constructor which will create manual event ACE_Manual_Event (int initial_state = 0, int type = USYNC_THREAD, const char *name = 0, void *arg = 0); #if defined (ACE_HAS_WCHAR) - /// Constructor which will create manual event (wchar_t version) + /// constructor which will create manual event (wchar_t version) ACE_Manual_Event (int initial_state, int type, const wchar_t *name, diff --git a/externals/ace/Map_Manager.h b/externals/ace/Map_Manager.h index 23fd343c2fd..4e361216f29 100644 --- a/externals/ace/Map_Manager.h +++ b/externals/ace/Map_Manager.h @@ -4,7 +4,7 @@ /** * @file Map_Manager.h * - * $Id: Map_Manager.h 91066 2010-07-12 11:05:04Z johnnyw $ + * $Id: Map_Manager.h 80826 2008-03-04 14:51:23Z wotte $ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ @@ -111,11 +111,10 @@ class ACE_Map_Reverse_Iterator; /** * @class ACE_Map_Manager * - * @brief - * Define a map abstraction that associates EXT_IDs with - * INT_IDs. + * @brief Define a map abstraction that associates <EXT_ID>s with + * <INT_ID>s. * - * The EXT_ID must support @c operator==. This constraint can + * The <EXT_ID> must support <operator==>. This constraint can * be alleviated via template specialization, as shown in the * $ACE_ROOT/tests/Conn_Test.cpp test. * This class uses an ACE_Allocator to allocate memory. The @@ -123,7 +122,7 @@ class ACE_Map_Reverse_Iterator; * ACE_Allocator with a persistable memory pool. * This implementation of a map uses an array, which is searched * linearly. For more efficient searching you should use the - * ACE_Hash_Map_Manager. + * <ACE_Hash_Map_Manager>. */ template <class EXT_ID, class INT_ID, class ACE_LOCK> class ACE_Map_Manager @@ -196,7 +195,7 @@ public: /** * Reassociate @a ext_id with @a int_id. If @a ext_id is not in the - * map then behaves just like bind(). Otherwise, store the old + * map then behaves just like <bind>. Otherwise, store the old * values of @a int_id into the "out" parameter and rebind the new * parameters. * @retval 0 If a new entry is bound successfully. @@ -262,12 +261,12 @@ public: size_t total_size (void) const; /** - * Returns a reference to the underlying ACE_LOCK. This makes it + * Returns a reference to the underlying <ACE_LOCK>. This makes it * possible to acquire the lock explicitly, which can be useful in * some cases if you instantiate the ACE_Atomic_Op with an * ACE_Recursive_Mutex or ACE_Process_Mutex, or if you need to * guard the state of an iterator. - * @note The right name would be lock, but HP/C++ will choke on that! + * @note The right name would be <lock>, but HP/C++ will choke on that! */ ACE_LOCK &mutex (void); diff --git a/externals/ace/Mem_Map.h b/externals/ace/Mem_Map.h index bda59bd18ed..14410cbf3f0 100644 --- a/externals/ace/Mem_Map.h +++ b/externals/ace/Mem_Map.h @@ -4,7 +4,7 @@ /** * @file Mem_Map.h * - * $Id: Mem_Map.h 91066 2010-07-12 11:05:04Z johnnyw $ + * $Id: Mem_Map.h 80826 2008-03-04 14:51:23Z wotte $ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ @@ -22,7 +22,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Global_Macros.h" -#include "ace/Copy_Disabled.h" #include "ace/os_include/sys/os_mman.h" #include "ace/os_include/os_limits.h" #include "ace/os_include/os_fcntl.h" @@ -38,7 +37,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * This class works with both the mmap(2) UNIX system and the * Win32 family of memory mapping system calls. */ -class ACE_Export ACE_Mem_Map : private ACE_Copy_Disabled +class ACE_Export ACE_Mem_Map { public: // = Initialization and termination methods. @@ -129,38 +128,38 @@ public: /// file. size_t size (void) const; - /// Unmap the region starting at base_addr_. + /// Unmap the region starting at <base_addr_>. int unmap (ssize_t len = -1); - /// Unmap the region starting at addr_. + /// Unmap the region starting at <addr_>. int unmap (void *addr, ssize_t len); /** * Sync @a len bytes of the memory region to the backing store - * starting at base_addr_. If @a len == -1 then sync the whole + * starting at <base_addr_>. If @a len == -1 then sync the whole * region. */ int sync (size_t len, int flags = MS_SYNC); /** * Sync the whole memory region to the backing store - * starting at base_addr_. + * starting at <base_addr_>. */ int sync (int flags = MS_SYNC); /// Sync @a len bytes of the memory region to the backing store - /// starting at addr_. + /// starting at <addr_>. int sync (void *addr, size_t len, int flags = MS_SYNC); /** * Change the protection of the pages of the mapped region to @a prot - * starting at base_addr_ up to @a len bytes. + * starting at <base_addr_> up to @a len bytes. */ int protect (size_t len, int prot = PROT_RDWR); /** * Change the protection of all the pages of the mapped region to @a prot - * starting at base_addr_. + * starting at <base_addr_>. */ int protect (int prot = PROT_RDWR); @@ -198,6 +197,10 @@ private: ACE_OFF_T offset = 0, LPSECURITY_ATTRIBUTES sa = 0); + // = Disallow copying and assignment. + ACE_Mem_Map (const ACE_Mem_Map &); + void operator = (const ACE_Mem_Map &); + private: /// Base address of the memory-mapped file. diff --git a/externals/ace/Message_Block.h b/externals/ace/Message_Block.h index 0e8c4bfd643..cd4545a42e6 100644 --- a/externals/ace/Message_Block.h +++ b/externals/ace/Message_Block.h @@ -4,7 +4,7 @@ /** * @file Message_Block.h * - * $Id: Message_Block.h 91066 2010-07-12 11:05:04Z johnnyw $ + * $Id: Message_Block.h 86825 2009-09-28 17:45:23Z johnnyw $ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ @@ -241,8 +241,8 @@ public: /** * Delete all the resources held in the message. * - * @note Note that release() is designed to release the continuation - * chain; the destructor is not. See release() for details. + * Note that <release()> is designed to release the continuation + * chain; the destructor is not. See <release()> for details. */ virtual ~ACE_Message_Block (void); diff --git a/externals/ace/Message_Queue_T.cpp b/externals/ace/Message_Queue_T.cpp index a33bac23e71..6c677c1d555 100644 --- a/externals/ace/Message_Queue_T.cpp +++ b/externals/ace/Message_Queue_T.cpp @@ -1,4 +1,4 @@ -// $Id: Message_Queue_T.cpp 91016 2010-07-06 11:29:50Z johnnyw $ +// $Id: Message_Queue_T.cpp 88560 2010-01-15 05:02:05Z schmidt $ #ifndef ACE_MESSAGE_QUEUE_T_CPP #define ACE_MESSAGE_QUEUE_T_CPP @@ -60,13 +60,13 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::message_length (size_t ne } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::ACE_Message_Queue_Ex (size_t high_water_mark, - size_t low_water_mark, +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::ACE_Message_Queue_Ex (size_t hwm, + size_t lwm, ACE_Notification_Strategy *ns) { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::ACE_Message_Queue_Ex"); - if (this->queue_.open (high_water_mark, low_water_mark, ns) == -1) + if (this->queue_.open (hwm, lwm, ns) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Message_Queue_Ex"))); } diff --git a/externals/ace/OS_Log_Msg_Attributes.h b/externals/ace/OS_Log_Msg_Attributes.h index 65c11ab61bf..6a1688260ba 100644 --- a/externals/ace/OS_Log_Msg_Attributes.h +++ b/externals/ace/OS_Log_Msg_Attributes.h @@ -4,7 +4,7 @@ /** * @file OS_Log_Msg_Attributes.h * - * $Id: OS_Log_Msg_Attributes.h 91066 2010-07-12 11:05:04Z johnnyw $ + * $Id: OS_Log_Msg_Attributes.h 83729 2008-11-13 15:32:36Z mitza $ * * @author Carlos O'Ryan */ @@ -23,7 +23,6 @@ #include /**/ "ace/ACE_export.h" #include "ace/os_include/os_stdio.h" #include "ace/iosfwd.h" -#include "ace/Copy_Disabled.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -40,7 +39,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * The contents of the class must be made available to the OS layer, * because they are part of the thread descriptor. */ -class ACE_Export ACE_OS_Log_Msg_Attributes : private ACE_Copy_Disabled +class ACE_Export ACE_OS_Log_Msg_Attributes { public: /// Constructor @@ -66,11 +65,16 @@ protected: /// Depth of the nesting for printing traces. int trace_depth_; -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) /// Structured exception handling Callbacks, only used under Win32 ACE_SEH_EXCEPT_HANDLER seh_except_selector_; ACE_SEH_EXCEPT_HANDLER seh_except_handler_; -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ + +private: + // Prevent copying + ACE_OS_Log_Msg_Attributes (const ACE_OS_Log_Msg_Attributes &); + ACE_OS_Log_Msg_Attributes &operator= (const ACE_OS_Log_Msg_Attributes &); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/externals/ace/OS_NS_Thread.h b/externals/ace/OS_NS_Thread.h index d386fa038a0..468b4f60b09 100644 --- a/externals/ace/OS_NS_Thread.h +++ b/externals/ace/OS_NS_Thread.h @@ -4,7 +4,7 @@ /** * @file OS_NS_Thread.h * - * $Id: OS_NS_Thread.h 91210 2010-07-26 20:31:30Z shuston $ + * $Id: OS_NS_Thread.h 85547 2009-06-07 17:57:11Z johnnyw $ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> * @author Jesper S. M|ller<stophph@diku.dk> @@ -1604,7 +1604,7 @@ namespace ACE_OS { * defined, this is the thread-id. For linux-threads, when * ACE_HAS_SCHED_SETAFFINITY defined, it expects a process-id. Since for * linux-threads a thread is seen as a process, it does the job. - * @param cpu_set_size The size of the cpu_mask, in bytes. + * @param cpu_set_size The size of the cpu_mask * @param cpu_mask Is a bitmask of CPUs to bind to, e.g value 1 binds the * thread to the "CPU 0", etc */ @@ -1621,7 +1621,7 @@ namespace ACE_OS { * defined, this is the thread-id. For linux-threads, when * ACE_HAS_SCHED_SETAFFINITY defined, it expects a process-id. Since for * linux-threads a thread is seen as a process, it does the job. - * @param cpu_set_size The size of the cpu_mask, in bytes. + * @param cpu_set_size The size of the cpu_mask * @param cpu_mask Is a bitmask of CPUs to bind to, e.g value 1 binds the * thread to the "CPU 0", etc */ diff --git a/externals/ace/OS_NS_unistd.h b/externals/ace/OS_NS_unistd.h index 489dc8e43e7..2b770e62ef6 100644 --- a/externals/ace/OS_NS_unistd.h +++ b/externals/ace/OS_NS_unistd.h @@ -4,7 +4,7 @@ /** * @file OS_NS_unistd.h * - * $Id: OS_NS_unistd.h 91066 2010-07-12 11:05:04Z johnnyw $ + * $Id: OS_NS_unistd.h 84918 2009-03-20 08:07:01Z johnnyw $ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> * @author Jesper S. M|ller<stophph@diku.dk> @@ -189,12 +189,12 @@ namespace ACE_OS // should call gethostname() ACE_NAMESPACE_INLINE_FUNCTION - int hostname (char name[], + int hostname (char *name, size_t maxnamelen); #if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION - int hostname (wchar_t name[], + int hostname (wchar_t *name, size_t maxnamelen); #endif /* ACE_HAS_WCHAR */ diff --git a/externals/ace/Object_Manager.h b/externals/ace/Object_Manager.h index 5e177ee6bfe..94b755e1081 100644 --- a/externals/ace/Object_Manager.h +++ b/externals/ace/Object_Manager.h @@ -4,7 +4,7 @@ /** * @file Object_Manager.h * - * $Id: Object_Manager.h 91066 2010-07-12 11:05:04Z johnnyw $ + * $Id: Object_Manager.h 84163 2009-01-15 07:57:27Z johnnyw $ * * @author David L. Levine <levine@cs.wustl.edu> * @author Matthias Kerkhoff @@ -272,7 +272,7 @@ public: static int remove_at_exit (void *object); #if 0 /* not implemented yet */ - /// Similar to at_exit(), except that the cleanup_hook is called + /// Similar to <at_exit>, except that the cleanup_hook is called /// when the current thread exits instead of when the program terminates. static int at_thread_exit (void *object, ACE_CLEANUP_FUNC cleanup_hook, @@ -327,8 +327,7 @@ public: }; /** - * @deprecated - * Accesses a default signal set used, for example, + * @deprecated Accesses a default signal set used, for example, * in ACE_Sig_Guard methods. * Deprecated: use ACE_Object_Manager::default_mask () instead. */ @@ -412,10 +411,10 @@ public: static void *preallocated_array[ACE_PREALLOCATED_ARRAYS]; public: - /// Application code should not use these explicitly, so they're - /// hidden here. They're public so that the ACE_Object_Manager can - /// be constructed/destructed in <main> with - /// ACE_HAS_NONSTATIC_OBJECT_MANAGER. + // Application code should not use these explicitly, so they're + // hidden here. They're public so that the ACE_Object_Manager can + // be constructed/destructed in <main> with + // ACE_HAS_NONSTATIC_OBJECT_MANAGER. ACE_Object_Manager (void); ~ACE_Object_Manager (void); @@ -436,7 +435,7 @@ private: #endif /* ACE_MT_SAFE */ #if defined (ACE_HAS_TSS_EMULATION) - /// Main thread's thread-specific storage array. + // Main thread's thread-specific storage array. void *ts_storage_[ACE_TSS_Emulation::ACE_TSS_THREAD_KEYS_MAX]; bool ts_storage_initialized_; #endif /* ACE_HAS_TSS_EMULATION */ @@ -445,7 +444,7 @@ private: friend class ACE_Object_Manager_Manager; #endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */ - /// Disallow copying by not implementing the following . . . + // Disallow copying by not implementing the following . . . ACE_Object_Manager (const ACE_Object_Manager &); ACE_Object_Manager &operator= (const ACE_Object_Manager &); }; diff --git a/externals/ace/Process.h b/externals/ace/Process.h index 4a95b53e867..16325b9308e 100644 --- a/externals/ace/Process.h +++ b/externals/ace/Process.h @@ -4,7 +4,7 @@ /** * @file Process.h * - * $Id: Process.h 91233 2010-07-29 14:47:16Z shuston $ + * $Id: Process.h 87826 2009-11-30 14:02:40Z johnnyw $ * * @author Tim Harrison <harrison@cs.wustl.edu> */ @@ -94,14 +94,8 @@ public: /** * Set the standard handles of the new process to the respective * handles. If you want to affect a subset of the handles, make - * sure to set the others to ACE_INVALID_HANDLE. - * - * @note Any handle passed as ACE_INVALID_HANDLE will be changed to - * a duplicate of the current associated handle. For example, passing - * ACE_INVALID_HANDLE for @a std_in will cause ACE_STDIN to be - * duplicated and set in this object. - * - * @return 0 on success, -1 on failure. + * sure to set the others to ACE_INVALID_HANDLE. Returns 0 on + * success, -1 on failure. */ int set_handles (ACE_HANDLE std_in, ACE_HANDLE std_out = ACE_INVALID_HANDLE, diff --git a/externals/ace/README b/externals/ace/README deleted file mode 100644 index c1e90bb5c44..00000000000 --- a/externals/ace/README +++ /dev/null @@ -1,1787 +0,0 @@ -// $Id: README 88535 2010-01-13 21:22:15Z olli $ - -ACE Portability Macros ----------------------- - -The following describes the meaning of the C++ compiler macros that -can be set in the config*.h file. When you port ACE to a new platform -and/or C++ compiler, make sure that you check to see which of these -need to be defined. It's helpful to check the various config*.h files -in this directory to see what's already been defined. If you need to -add new macros, please send them to me and I'll add them to this file. - -Eventually, most of this information should be auto-discovered via GNU -autoconf, which is currently available in the ACE distribution. - -Macro Description ------ ----------- - -ACE_HAS_DUMP Used to enable the dump() - method bodies. If not - defined, the bodies are ifdef - out in order to reduce - footprint. By default, it is - not defined. -ACE_CAST_CONST Used to work around broken - SunCC ANSI casts that require - an extra const. -ACE_DEFINES_DEFAULT_WIN32_SECURITY_ATTRIBUTES - Win32 only. Users want to use - a predefined security - attributes defined in - ACE_OS::default_win32_security_attributes - as the default security - object. -ACE_DISABLE_DEBUG_DLL_CHECK Define this if you don't want - debug version ACE search for - debug version DLLs first - before looking for the DLL - names specified. -ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER - Application will allocate its - own object manager. This - implicitly defines - ACE_HAS_NONSTATIC_OBJECT_MANAGER. - Usually used with MFC - applications. -ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO Platform does not initialize - sockaddr_in::sin_zero field in - calls to getpeername() and - getsockname(). As a result, - memcmp()-based equality - comparison can fail despite - the fact two sockaddr_in - instances refer to the same - addr characteristics. -ACE_MAIN Renames "main (int, char *[])", - for platforms such as g++/VxWorks - that don't allow "main". Requires - the use of - ACE_HAS_NONSTATIC_OBJECT_MANAGER. -ACE_MKDIR_LACKS_MODE This platform has a mkdir function with - a mode argument -ACE_MT_SAFE Compile using multi-thread libraries -ACE_NDEBUG Turns off debugging features -ACE_NEW_THROWS_EXCEPTIONS Compiler's 'new' throws exception on - failure (ANSI C++ behavior). -ACE_NLOGGING Turns off the LM_DEBUG and - LM_ERROR logging macros... -ACE_NTRACE Turns off the tracing feature when = 1. -ACE_HAS_TRACE Defined when ACE_NTRACE=0 to - help support tracing. Can - also be defined by users who - implement their own tracing - macros based on - ACE_TRACE_IMPL. Not defining - it helps reduce footprint by - not requiring applications to - link in Trace.o. -ACE_PAGE_SIZE Defines the page size of the - system (not used on Win32 or - with ACE_HAS_GETPAGESIZE). -ACE_REDEFINES_XTI_FUNCTIONS Platform redefines the t_... names (UnixWare) -ACE_TEMPLATES_REQUIRE_PRAGMA Compiler's template mechanism - must use a pragma This is used - for AIX's C++ compiler. -ACE_TEMPLATES_REQUIRE_SOURCE Compiler's template mechanim - must see source code (i.e., - .cpp files). This is used for - GNU G++. -ACE_TIMEPROBE_ASSERTS_FIXED_SIZE If enabled then ACE_Timeprobe_Ex<>::timeprobe() - will assert if the end of the - buffer is reached. If disabled, the - counter wraps around to start - at the beginning of the buffer. -ACE_TIMER_SKEW If a timed ::select () can return - early, then ACE_TIMER_SKEW is the - maximum adjustment, in microseconds, - that ACE_Timer_Queue uses to - compensate for the early return. -ACE_TLI_TCP_DEVICE Device the platform uses for TCP on - TLI. Only needed if not /dev/tcp. -ACE_USE_POLL The OS platform supports the - poll() event demultiplexor -ACE_USES_ASM_SYMBOL_IN_DLSYM Platform uses assembly symbols - instead of C symbols in - dlsym() -ACE_USES_STATIC_MFC When linking MFC as a static library is desired -ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB Platform has its standard c++ - library in the namespace std. -ACE_USES_EXPLICIT_STD_NAMESPACE Set this when ::fclose doesn't - work and you have to - explicitly specify the std - namespace. This is needed - with the Borland 6 and earlier - compilers. -ACE_USES_GPROF ACE calls getitimer before spawning - a new thread and setitimer - after spawning the thread in - order to overcome the problems - of gprof with multithreaded - applications. It uses the idea from - http://sam.zoy.org/writings/programming/gprof.html -ACE_USES_FIFO_SEM Directs ACE to use FIFO based semaphores on - platforms that support this (not having full - POSIX semaphore support, supporting mkfifo, select - and fcntl). -ACE_WSOCK_VERSION A parameter list indicating - the version of WinSock (e.g., - "1, 1" is version 1.1). -ACE_HAS_AIO_CALLS Platform supports POSIX aio* calls. - Corresponds to _POSIX_ASYNCHRONOUS_IO - constant in <unistd.h>. -ACE_HAS_ALT_CUSERID Use ACE's alternate cuserid() - implementation since a system - cuserid() may not exist, or it - is not desirable to use it. - The implementation requires - ACE_LACKS_PWD_FUNCTIONS to be - undefined and that the - geteuid() system call exists. -ACE_HAS_DINKUM_STL Using the Dinkum STL library -ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE - Non-C++ Complient compilers that automatically - provide storeage for class static const int - when their declaration is seen. I.e. they object - to explicit definitions being seen in the .cpp - file. -ACE_DEFAULT_THREAD_KEYS Number of TSS keys, with - ACE_HAS_TSS_EMULATION _only_. - Defaults to 64. -ACE_DEFAULT_THREAD_STACKSIZE Default stack size specified for the - ACE thread spawning methods. Defaults - to 0, which defers to OS defaults. -ACE_DEFAULT_LD_SEARCH_PATH Specify the platform default search - paths. This macro should only be - defined on platforms that don't - support environment variables at all - (i.e., Windows CE.) -ACE_THREADS_DONT_INHERIT_LOG_MSG Specify this if you don't want - threads to inherit parent - thread's ACE_Log_Msg - properties. -ACE_THREAD_MANAGER_USES_SAFE_SPAWN Disable the "check before lock" feature - in ACE_Thread_Manager. Defining this - macro avoids a potential race condition - on platforms with aggressive read/write - reordering. -ACE_HAS_CPU_SET_T Platform delivers cpu_set_t. -ACE_HAS_PRIOCNTL OS has priocntl (2). -ACE_HAS_RECURSIVE_MUTEXES Mutexes are inherently recursive - (e.g., Win32) -ACE_HAS_NONRECURSIVE_MUTEXES In addition to recursive mutexes, - platform has non-recursive ones also. -ACE_HAS_RECV_TIMEDWAIT Platform has the MIT pthreads - APIs for -ACE_HAS_RECVFROM_TIMEDWAIT timed send/recv operations -ACE_HAS_RECVMSG_TIMEDWAIT -ACE_HAS_RLIMIT_RESOURCE_ENUM Platform has enum instead of - int for first argument to - ::{get,set}rlimit (). The - value of this macro is the - enum definition, e.g., enum - __rlimit_resource, for Linux - glibc 2.0. -ACE_HAS_RUSAGE_WHO_ENUM Platform has enum instead of - int for first argument to - ::getrusage (). The value of - this macro is the enum - definition, e.g., enum - __rusage_who, for Linux glibc - 2.0. -ACE_HAS_SCANDIR Platform has a native scandir() - function. Without any other scandir- - related settings, it's assumed that - the selector and comparator functions - accept const ACE_DIRENT pointers. -ACE_SCANDIR_CMP_USES_VOIDPTR The OS's scandir() comparator function - is int (*compare)(void*, void*). -ACE_SCANDIR_CMP_USES_CONST_VOIDPTR The OS's scandir() comparator function - is int (*compare)(const void*, - const void*). -ACE_SCANDIR_SEL_LACKS_CONST The OS's scandir() selector function - is int (*selector)(ACE_DIRENT*) -ACE_HAS_SEND_TIMEDWAIT -ACE_HAS_SENDTO_TIMEDWAIT -ACE_HAS_SENDMSG_TIMEDWAIT -ACE_HAS_STDARG_THR_DEST Platform has void (*)(...) - prototype for - pthread_key_create() - destructor (e.g., LynxOS). -ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS Platform/compiler supports - Win32 structural exceptions -ACE_HAS_READ_TIMEDWAIT -ACE_HAS_READV_TIMEDWAIT -ACE_HAS_WRITE_TIMEDWAIT -ACE_HAS_WRITEV_TIMEDWAIT -ACE_HAS_4_4BSD_SENDMSG_RECVMSG Platform has BSD 4.4 - sendmsg()/recvmsg() APIs. -ACE_HAS_P_READ_WRITE Platform has pread() and - pwrite() support -ACE_HAS_AIX_BROKEN_SOCKET_HEADER Platform, such as AIX4, needs - to wrap #include of - sys/socket.h with - #undef/#define of - __cplusplus. -ACE_HAS_AIX_HI_RES_TIMER Platform has AIX4 - ::read_real_time () -ACE_HAS_ALLOCA Compiler/platform supports - alloca() -ACE_HAS_ALLOCA_H Compiler/platform has - <alloca.h> -ACE_HAS_ALPHA_TIMER CPU is an Alpha, with the rpcc - instruction to read the tick timer. - Limited to 32 bits, so not recommended. -ACE_HAS_AUTOMATIC_INIT_FINI Compiler/platform correctly - calls init()/fini() for shared - libraries -ACE_HAS_BIG_FD_SET Compiler/platform has typedef - u_long fdmask (e.g., Linux and - SCO). -ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR - Compiler handles explicit calling of - template destructor correctly. See - "ace/OS.h" for details. -ACE_HAS_BROKEN_ACCEPT_ADDR Platform can't correctly deal - with a NULL addr to accept() - (e.g, VxWorks). -ACE_HAS_BROKEN_DGRAM_SENDV Platform sendv() does not work - properly with datagrams, - i.e. it fails when the iovec - size is IOV_MAX. -ACE_HAS_BROKEN_MAP_FAILED Platform doesn't cast MAP_FAILED - to a void *. -ACE_HAS_BROKEN_MSG_H Platform headers don't support - <msg.h> prototypes -ACE_HAS_BROKEN_MMAP_H HP/UX does not wrap the - mmap(2) header files with - extern "C". -ACE_HAS_BROKEN_NESTED_TEMPLATES MSVC has trouble with defining - STL containers for nested - structs and classes -ACE_HAS_BROKEN_POSIX_TIME Platform defines struct - timespec in <sys/timers.h> -ACE_HAS_BROKEN_RANDR OS/compiler's header files are - inconsistent with libC - definition of rand_r(). -ACE_HAS_BROKEN_T_ERROR Compiler/platform has the wrong - prototype for t_error(), i.e., - t_error(char *) rather than - t_error(const char *). -ACE_HAS_BSTRING Platform has <bstring.h> - (which contains bzero() - prototype) -ACE_HAS_BYTESEX_H Platform has <bytesex.h>. -ACE_HAS_CANCEL_IO Platform supports the Win32 - CancelIO() function (WinNT 4.0 - and beyond). -ACE_HAS_CHARPTR_DL OS/platform uses char * for - dlopen/dlsym args, rather than - const char *. -ACE_HAS_CHARPTR_SOCKOPT OS/platform uses char * for - sockopt, rather than const - char * -ACE_HAS_CLOCK_GETTIME Platform supports POSIX.1b - clock_gettime () at least for clock-id CLOCK_REALTIME -ACE_HAS_CLOCK_GETTIME_MONOTONIC Platform supports POSIX.1b - clock_gettime () with the clock-id CLOCK_MONOTONIC -ACE_HAS_CLOCK_SETTIME Platform supports POSIX.1b - clock_settime () -ACE_HAS_CONFLICTING_XTI_MACROS OS's XTI header file defines some - TCP-related macros that netinet/tcp.h - also defines, but they conflict - (only seen on HP-UX 11). -ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES Prototypes for both signal() - and struct sigaction are - consistent. -ACE_HAS_CPLUSPLUS_HEADERS Compiler/platform has - correctly prototyped header - files -ACE_HAS_DIRENT Compiler/platform has Dirent - iterator functions -ACE_HAS_DLL Build ACE using the frigging - PC DLL nonsense... -ACE_HAS_EBCDIC Compile in the ACE code set classes - that support EBCDIC. -ACE_HAS_EXCEPTIONS Compiler supports C++ - exception handling -ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT When a base-class is a - specialization of a class template - then this class template must be - explicitly exported -ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION For the GCC compiler - on AIX, HPUX and VxWorks we have to - explicitly instantiate static template - members else we get multiple instances - of the same static. -ACE_HAS_GETPAGESIZE Platform supports - getpagesize() call (otherwise, - ACE_PAGE_SIZE must be defined, - except on Win32) -ACE_HAS_GETRUSAGE Platform supports the - getrusage() system call. -ACE_HAS_GETRUSAGE_PROTOTYPE Platform has a getrusage () - prototype in sys/resource.h - that differs from the one in - ace/OS.i. -ACE_HAS_GPERF The GPERF utility is compiled - for this platform -ACE_HAS_GETIFADDRS This platform has ifaddrs.h and - the getifaddrs() function. This - is used in preference to - the SIOCGIFCONF ioctl call, since - it is much simpler and supports - IPv6 and non-IP interfaces better. -ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT Optimize - ACE_Handle_Set::count_bits for - select() operations (common - case) -ACE_HAS_LLSEEK Platform supports llseek. -ACE_HAS_HI_RES_TIMER Compiler/platform supports - SunOS high resolution timers -ACE_HAS_IDTYPE_T Compiler/platform supports - idtype_t. -ACE_HAS_INLINED_OSCALLS Inline all the static class OS - methods to remove call - overhead -ACE_HAS_IP_MULTICAST Platform supports IP multicast -ACE_HAS_IPV6 Platform supports IPv6. -ACE_HAS_BROKEN_GETHOSTBYADDR_V4MAPPED gethostbyaddr does not handle - IPv6-mapped-IPv4 addresses -ACE_USES_IPV4_IPV6_MIGRATION Enable IPv6 support in ACE on - platforms that don't have IPv6 - turned on by default. -ACE_HAS_IPV6_V6ONLY Platform supports the IPPROTO_IPV6 - level IPV6_V6ONLY socket option. -ACE_HAS_IRIX62_THREADS Platform supports the very odd - IRIX 6.2 threads... -ACE_HAS_NONSTATIC_OBJECT_MANAGER Causes the ACE_Object_Manager - instance to be created in main - (int, char *[]), instead of as - a static (global) instance. -ACE_HAS_THR_KEYDELETE Platform supports - thr_keydelete (e.g,. UNIXWARE) -ACE_HAS_THR_MINSTACK Platform calls thr_minstack() - rather than thr_min_stack() - (e.g., Tandem). -ACE_HAS_LIMITED_RUSAGE_T The rusage_t structure has - only two fields. -ACE_HAS_LIMITED_SELECT The select is unable to deal with - large file descriptors. -ACE_HAS_LINUX_NPTL Linux platform (with kernel >= 2.6.x) - with GLibc including new NPTL (Native - POSIX Thread Library). - This triggers extended POSIX checks - since the NPTL library is (almost) fully - POSIX compliant. -ACE_HAS_LOG_MSG_NT_EVENT_LOG Platform supports Windows NT event - log so we can create an - ACE_Log_Msg_Backend to log to it. -ACE_HAS_LONG_MAP_FAILED Platform defines MAP_FAILED as - a long constant. -ACE_HAS_MALLOC_STATS Enabled malloc statistics - collection. -ACE_HAS_MEMCHR Use native implementation of memchr. -ACE_HAS_MINIMAL_ACE_OS Disables some #includes in ace/OS.*. -ACE_HAS_MFC Platform supports Microsoft - Foundation Classes -ACE_HAS_MSG Platform supports recvmsg and - sendmsg -ACE_HAS_MT_SAFE_MKTIME Platform supports MT safe - mktime() call (do any of - them?) -ACE_HAS_MUTEX_TIMEOUTS Compiler supports timed mutex - acquisitions - (e.g. pthread_mutex_timedlock()). -ACE_HAS_NEW_NOTHROW Compiler offers new (nothrow). -ACE_HAS_NONCONST_CHDIR Platform uses non-const char * - in call to chdir -ACE_HAS_NONCONST_CLOCK_SETTIME Platform uses non-const - struct timespec * in call to - clock_settime -ACE_HAS_NONCONST_OPENDIR Platform uses non-const char * - in call to opendir -ACE_HAS_NONCONST_UNLINK Platform uses non-const char * - in call to unlink -ACE_HAS_NONCONST_GETBY Platform uses non-const char * - in calls to gethostbyaddr, - gethostbyname, getservbyname -ACE_HAS_NONCONST_MSGSND Platform has a non-const - parameter to msgsend() (e.g., - SCO). -ACE_HAS_NONCONST_READV Platform omits const qualifier from - iovec parameter in readv() prototype. -ACE_HAS_NONCONST_SELECT_TIMEVAL Platform's select() uses - non-const timeval* (only found - on Linux right now) -ACE_HAS_NONCONST_SENDMSG Platform omits const qualifier - from msghdr parameter in sendmsg() - prototype. -ACE_HAS_NONCONST_SETRLIMIT Platform omits const qualifier - from rlimit parameter in setrlimit() - prototype. -ACE_HAS_NONCONST_STAT Platform's stat function has non const - name argument -ACE_HAS_NONCONST_SWAB Platform's swab function has non - const src argument -ACE_HAS_NONCONST_WRITEV Platform omits const qualifier from - iovec parameter in writev() prototype. -ACE_HAS_OLD_MALLOC Compiler/platform uses old - malloc()/free() prototypes - (ugh) -ACE_HAS_ONLY_SCHED_FIFO Platform, e.g., HP NonStop OSS, - only supports SCHED_FIFO - POSIX scheduling policy. -ACE_HAS_ONLY_SCHED_OTHER Platform, e.g., Solaris 2.5, - only supports SCHED_OTHER - POSIX scheduling policy. -ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R Uses ctime_r & asctime_r with - only two parameters - vs. three. -ACE_HAS_OSF_TIMOD_H Platform supports the OSF TLI - timod STREAMS module -ACE_HAS_3_PARAM_WCSTOK Platform has 3-parameter version - of wcstok(), which was added in - 1994 in the ISO C standard Normative - Addendum 1. Other standards like XPG4 - define a 2 parameter wcstok(). -ACE_HAS_PENTIUM Platform is an Intel Pentium - microprocessor. -ACE_HAS_POLL Platform contains <poll.h> -ACE_HAS_POSITION_INDEPENDENT_POINTERS Platform supports - "position-independent" features - provided by ACE_Based_Pointer<>. -ACE_HAS_POSIX_MESSAGE_PASSING Platform supports POSIX message queues. - Corresponds to _POSIX_MESSAGE_PASSING - constant in <unistd.h>. -ACE_HAS_POSIX_NONBLOCK Platform supports POSIX - O_NONBLOCK semantics -ACE_HAS_POSIX_REALTIME_SIGNALS Platform supports POSIX RT signals. - Corresponds to _POSIX_REALTIME_SIGNALS - constant in <unistd.h>. -ACE_HAS_POSIX_SEM Platform supports POSIX - real-time semaphores (e.g., - VxWorks and Solaris). Corresponds - to _POSIX_SEMAPHORES constant - in <unistd.h> -ACE_HAS_POSIX_SEM_TIMEOUT Platform supports timed wait operation - on POSIX realtime semaphores. -ACE_HAS_POSIX_TIME Platform supports the POSIX - struct timespec type -ACE_HAS_PROC_FS Platform supports the /proc - file system and defines tid_t - in <sys/procfs.h> -ACE_HAS_POWERPC_TIMER Platform supports PowerPC - time-base register. -ACE_HAS_PRUSAGE_T Platform supports the - prusage_t struct -ACE_HAS_PTHREADS Platform supports POSIX - Pthreads, of one form or - another. This macro says the - platform has a pthreads - variety - should also define - one of the below to say which - one. Also may need some - ACE_HAS_... thing for - extensions. -ACE_HAS_PTHREADS_DRAFT4 Platform's 'Pthreads' is .4a draft 4 -ACE_HAS_PTHREADS_DRAFT6 Platform's 'Pthreads' is .4a draft 6 -ACE_HAS_PTHREADS_DRAFT7 Platform's 'Pthreads' is .1c draft 7 -ACE_HAS_PTHREADS_STD Platform supports POSIX.1c-1995 threads - (This is the final standard - Pthreads). -ACE_HAS_PTHREADS_UNIX98_EXT Platform has the UNIX98 extensions to - Pthreads (rwlocks) -ACE_HAS_PTHREAD_ATTR_SETCREATESUSPEND_NP Platform has - pthread_attr_setcreatesuspend_np(). -ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP Platform has pthread_condattr_setkind_np(). -ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP Platform has - pthread_mutexattr_setkind_np(). -ACE_HAS_PTHREAD_GETCONCURRENCY Platform has pthread_getconcurrency(). -ACE_HAS_PTHREAD_SETCONCURRENCY Platform has pthread_setconcurrency(). -ACE_HAS_PTHREAD_PROCESS_ENUM pthread.h declares an enum with - PTHREAD_PROCESS_PRIVATE and - PTHREAD_PROCESS_SHARED values. -ACE_HAS_PTHREAD_SETSTACK Platform has pthread_attr_setstack(). -ACE_HAS_PTHREAD_NP_H Platform has <pthread_np.h> FreeBSD - declares non-portable (*_np) pthread - functions in this header. -ACE_HAS_PURIFY Purify'ing. Set by wrapper_macros.GNU. -ACE_HAS_QUANTIFY Quantify'ing. Set by wrapper_macros.GNU. -ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS Platform will recurse - infinitely on thread exits - from TSS cleanup routines - (e.g., AIX). -ACE_HAS_REENTRANT_FUNCTIONS Platform supports reentrant - functions (i.e., all the POSIX - *_r functions). -ACE_HAS_XPG4_MULTIBYTE_CHAR Platform has support for - multi-byte character support - compliant with the XPG4 - Worldwide Portability - Interface wide-character - classification. -ACE_HAS_REGEX Platform supports the POSIX - regular expression library -ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE For OpenBSD: The dlsym call - segfaults when passed an invalid - handle. Other platforms handle - this more gracefully. -ACE_HAS_SELECT_H Platform has special header for select(). -ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL For Win32: Use Select_Reactor - as default implementation of - Reactor instead of - WFMO_Reactor. -ACE_HAS_SEMUN Compiler/platform defines a - union semun for SysV shared - memory -ACE_HAS_SET_T_ERRNO Platform has a function to set - t_errno (e.g., Tandem). -ACE_HAS_SIGACTION_CONSTP2 Platform's sigaction() function takes - const sigaction* as 2nd parameter. -ACE_HAS_SIGINFO_T Platform supports SVR4 - extended signals -ACE_HAS_SIGSUSPEND Platform supports sigsuspend() -ACE_HAS_SIGISMEMBER_BUG Platform has bug with - sigismember() (HP/UX 11). -ACE_HAS_SIGNAL_OBJECT_AND_WAIT Platform supports the Win32 - SignalObjectAndWait() function - (WinNT 4.0 and beyond). -ACE_HAS_SIGWAIT Platform/compiler has the - sigwait(2) prototype -ACE_HAS_SIG_ATOMIC_T Compiler/platform defines the - sig_atomic_t typedef -ACE_HAS_SIG_C_FUNC Compiler requires extern "C" - functions for signals. -ACE_HAS_SIZET_SOCKET_LEN OS/compiler uses size_t * - rather than int * for socket - lengths -ACE_HAS_SOCKADDR_IN_SIN_LEN Platform has sin_len member in struct - sockaddr_in. -ACE_HAS_SOCKADDR_IN6_SIN_LEN Platform has sin6_len member in struct - sockaddr_in6. -ACE_HAS_SOCKADDR_MSG_NAME Platform requires (struct - sockaddr *) for msg_name field - of struct msghdr. -ACE_HAS_SOCKLEN_T Platform provides socklen_t - type, such as Linux with - glibc2. -ACE_HAS_SOCK_BUF_SIZE_MAX Platform limits the maximum socket - message size. -ACE_HAS_SPARCWORKS_401_SIGNALS Compiler has brain-damaged - SPARCwork SunOS 4.x signal - prototype... -ACE_HAS_SSIZE_T Compiler supports the ssize_t - typedef -ACE_HAS_STHREADS Platform supports Solaris - threads -ACE_HAS_STANDARD_CPP_LIBRARY Platform/compiler supports - Standard C++ Library -ACE_HAS_STDCPP_STL_INCLUDES Standard C++ headers can be - included in the standard way. - e.g. #include <vector> -ACE_HAS_STRBUF_T Compiler/platform supports - struct strbuf -ACE_HAS_STRDUP_EMULATION Use ACE's strdup() emulation (even - if platform has a native strdup()). - This is useful if you need control - over what memory allocator is used. -ACE_HAS_WCSDUP_EMULATION Use ACE's wcsdup() emulation (even - if platform has a native wcsdup()). - This is useful if you need control - over what memory allocator is used. -ACE_HAS_STRNLEN Platform supports strnlen(3). -ACE_HAS_STREAMS Platform supports STREAMS -ACE_HAS_STREAM_PIPES Platform supports STREAM pipes -ACE_HAS_STRICT Use the STRICT compilation mode on Win32. -ACE_HAS_STRING_CLASS Platform/Compiler supports a - String class (e.g., GNU or - Win32). -ACE_HAS_STRUCT_NETDB_DATA Compiler/platform has strange - hostent API for socket *_r() - calls -ACE_HAS_SUNOS4_SIGNAL_T Compiler has horrible SunOS - 4.x signal handlers... -ACE_HAS_SVR4_DYNAMIC_LINKING Compiler/platform supports - SVR4 dynamic linking semantics -ACE_HAS_SVR4_GETTIMEOFDAY Compiler/platform supports - SVR4 gettimeofday() prototype -ACE_HAS_SVR4_SIGNAL_T Compiler/platform supports - SVR4 signal typedef -ACE_HAS_SVR4_TLI Compiler/platform supports - SVR4 TLI; that is, TLI with extensions - like t_getname(). This is sometimes - used as a pseudonym for TLI on SunOS4. - This is a modifier to ACE_HAS_TLI and - isn't used if ACE_HAS_XTI is set. -ACE_HAS_SYSCALL_GETRUSAGE HP/UX has an undefined syscall - for GETRUSAGE... -ACE_HAS_SYSENT_H Platform provides <sysent.h> - header -ACE_HAS_SYSV_SYSINFO Platform supports system - configuration information -ACE_HAS_SYSV_IPC Platform supports System V IPC - (most versions of UNIX, but - not Win32) -ACE_HAS_SYS_FILIO_H Platform provides - <sys/filio.h> header -ACE_HAS_SYS_LOADAVG_H Compiler/platform contains the - <sys/loadavg.h> file. -ACE_HAS_SYS_PSTAT_H Compiler/platform contains the - <sys/pstat.h> file. -ACE_HAS_SYS_SOCKIO_H Compiler/platform provides the - sockio.h file -ACE_HAS_SYS_SYSCALL_H Compiler/platform contains the - <sys/syscall.h> file. -ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA Compiler's template - instantiation mechanism - supports the use of "#pragma - instantiate". Edison Design - Group compilers, e.g., SGI C++ - and Green Hills 1.8.8 and - later, support this. -ACE_HAS_TEMPLATE_TYPEDEFS Compiler implements templates - that support typedefs inside - of classes used as formal - arguments to a template - class. -ACE_HAS_TERMIO Platform has terminal ioctl - flags like TCGETS and TCSETS and - termio struct. -ACE_HAS_TERMIOS Platform has POSIX terminal - interface and termios struct. -ACE_HAS_LAZY_MAP_MANAGER ACE supports lazy Map Managers - that allow deletion of entries - during active iteration. -ACE_HAS_THREADS Platform supports threads -ACE_HAS_THREAD_SAFE_ACCEPT Platform allows multiple - threads to call accept() on - the same port (e.g., WinNT). -ACE_HAS_THREAD_SELF Platform has thread_self() - rather than pthread_self() - (e.g., DCETHREADS and AIX) -ACE_HAS_THREAD_SPECIFIC_STORAGE Compiler/platform has - thread-specific storage -ACE_HAS_THR_C_DEST The pthread_keycreate() - routine *must* take extern C - functions. -ACE_HAS_THR_C_FUNC The pthread_create() routine - *must* take extern C - functions. -ACE_HAS_TIMEZONE Platform/compiler supports - global "timezone" variable. -ACE_HAS_TIMEZONE_GETTIMEOFDAY Platform/compiler supports - timezone * as second parameter - to gettimeofday() -ACE_HAS_TIMOD_H Platform supports TLI timod - STREAMS module -ACE_HAS_TIUSER_H Platform provides TLI tiuser.h - header file. -ACE_HAS_TLI Platform supports TLI. Also - see ACE_TLI_TCP_DEVICE. If the - platform supports XTI, set ACE_HAS_XTI - instead of this. -ACE_HAS_TLI_PROTOTYPES Platform provides TLI function - prototypes -ACE_HAS_TR24731_2005_CRT The platform provides an implementation - of C99 draft TR24731 (October 2005), - C run-time with more secure parameters. -ACE_HAS_TSS_EMULATION ACE provides TSS emulation. - See also - ACE_DEFAULT_THREAD_KEYS. -ACE_HAS_UALARM Platform supports ualarm() -ACE_HAS_UCONTEXT_T Platform supports ucontext_t - (which is used in the extended - signal API). -ACE_HAS_UNION_WAIT The wait() system call takes a - (union wait *) rather than int - * -ACE_HAS_UNIXWARE_SVR4_SIGNAL_T Has inconsistent SVR4 signal - stuff, but not the same as the - other platforms -ACE_HAS_VALGRIND Running with valgrind -ACE_HAS_VERBOSE_NOTSUP Prints out console message in - ACE_NOTSUP. Useful for - tracking down origin of - ACE_NOTSUP. -ACE_HAS_VERSIONED_NAMESPACE Wrap all library code within a - "versioned namespace" to - prevent symbol conflicts with - other versions of ACE shared - libraries in third party - libraries. Default namespace - name may be overridden by - defining preprocessor symbol - ACE_VERSIONED_NAMESPACE_NAME - to desired name. -ACE_LACKS_INTMAX_T Platform lacks the intmax_t type -ACE_LACKS_UINTMAX_T Platform lacks the uintmax_t type. -ACE_LACKS_INTPTR_T Platform lacks the intptr_t type -ACE_LACKS_UINTPTR_T Platform lacks the uintptr_t type. - -ACE_HAS_INT8_T Platform provides the int8_t type. -ACE_HAS_INT16_T Platform provides the int16_t type. -ACE_HAS_INT32_T Platform provides the int32_t type. -ACE_HAS_INT64_T Platform provides the int64_t type. -ACE_HAS_UINT8_T Platform provides the uint8_t type. -ACE_HAS_UINT16_T Platform provides the uint16_t type. -ACE_HAS_UINT32_T Platform provides the uint32_t type. -ACE_HAS_UINT64_T Platform provides the uint64_t type. - -ACE_INT8_TYPE Specific type to use for ACE_INT8. - If not defined, ACE will attempt to - determine the correct type. -ACE_INT16_TYPE Specific type to use for ACE_INT16. - If not defined, ACE will attempt to - determine the correct type. -ACE_INT32_TYPE Specific type to use for ACE_INT32. - If not defined, ACE will attempt to - determine the correct type. -ACE_INT64_TYPE Specific type to use for ACE_INT64. - If not defined, ACE will attempt to - determine the correct type. -ACE_UINT8_TYPE Specific type to use for ACE_UINT8. - If not defined, ACE will attempt to - determine the correct type. -ACE_UINT16_TYPE Specific type to use for ACE_UINT16. - If not defined, ACE will attempt to - determine the correct type. -ACE_UINT32_TYPE Specific type to use for ACE_UINT32. - If not defined, ACE will attempt to - determine the correct type. -ACE_UINT64_TYPE Specific type to use for ACE_UINT64. - If not defined, ACE will attempt to - determine the correct type. - -ACE_INT8_FORMAT_SPECIFIER String literal containing *printf - format specifier (including the '%') - to be used for ACE_INT8 values. If - not defined, ACE will attempt to - determine the correct setting. -ACE_INT16_FORMAT_SPECIFIER String literal containing *printf - format specifier (including the '%') - to be used for ACE_INT16 values. If - not defined, ACE will attempt to - determine the correct setting. -ACE_INT32_FORMAT_SPECIFIER String literal containing *printf - format specifier (including the '%') - to be used for ACE_INT32 values. If - not defined, ACE will attempt to - determine the correct setting. -ACE_INT64_FORMAT_SPECIFIER String literal containing *printf - format specifier (including the '%') - to be used for ACE_INT64 values. If - not defined, ACE will attempt to - determine the correct setting. -ACE_UINT8_FORMAT_SPECIFIER String literal containing *printf - format specifier (including the '%') - to be used for ACE_UINT8 values. If - not defined, ACE will attempt to - determine the correct setting. -ACE_UINT16_FORMAT_SPECIFIER String literal containing *printf - format specifier (including the '%') - to be used for ACE_UINT16 values. If - not defined, ACE will attempt to - determine the correct setting. -ACE_UINT32_FORMAT_SPECIFIER String literal containing *printf - format specifier (including the '%') - to be used for ACE_UINT32 values. If - not defined, ACE will attempt to - determine the correct setting. -ACE_UINT64_FORMAT_SPECIFIER String literal containing *printf - format specifier (including the '%') - to be used for ACE_UINT64 values. If - not defined, ACE will attempt to - determine the correct setting. - -ACE_HAS_VOIDPTR_GETTIMEOFDAY Platform/compiler supports - void * as second parameter - to gettimeofday -ACE_HAS_VOIDPTR_MMAP Platform requires void * for - mmap(). -ACE_HAS_VOIDPTR_SOCKOPT OS/compiler uses void * arg 4 - setsockopt() rather than const - char * -ACE_HAS_WCSNLEN Platform supports wcsnlen(3). -ACE_HAS_WIN32_OVERLAPPED_IO Platform has Windows overlapped I/O; - requires I/O completion ports. -ACE_HAS_WIN32_TRYLOCK The Win32 platform support - TryEnterCriticalSection() - (WinNT 4.0 and beyond) -ACE_HAS_WINSOCK2 The Win32 platform supports - WinSock 2.0 -ACE_HAS_XLI Platform has the XLI version - of TLI -ACE_HAS_XTI Platform has XTI - (X/Open-standardized superset - of TLI). Implies ACE_HAS_TLI - but uses a different header - file. -ACE_INITIALIZE_MEMORY_BEFORE_USE Memory is explicitly initialized before - use. Useful when using a profiler like - purify or valgrind -ACE_HRTIME_T_IS_BASIC_TYPE ACE_hrtime_t is a basic type that - doesn't require ACE_U64_TO_U32 - conversion -ACE_LACKS_ACCESS Platform lacks access() (e.g., - VxWorks and Chorus) -ACE_LACKS_ACE_IOSTREAM Platform can not build - ace/IOStream{,_T}.cpp. This - does not necessarily mean that - the platform does not support - iostreams. -ACE_LACKS_AUTO_MMAP_REPLACEMENT No system support for replacing any - previous mappings. -ACE_LACKS_BSEARCH Compiler/platform lacks the - standard C library bsearch() - function -ACE_LACKS_CLEARERR Platform lacks the clearerr system - call. -ACE_LACKS_CLOSEDIR Platform lacks closedir and the closedir - emulation must be used -ACE_LACKS_OPENDIR Platform lacks opendir and the opendir - emulation must be used -ACE_LACKS_READDIR Platform lacks readdir and the readdir - emulation must be used -ACE_LACKS_COND_TIMEDWAIT_RESET pthread_cond_timedwait does - *not* reset the time argument - when the lock is acquired. -ACE_LACKS_CONST_STRBUF_PTR Platform uses struct strbuf * - rather than const struct - strbuf * (e.g., HP/UX 10.x) -ACE_LACKS_CONST_TIMESPEC_PTR Platform forgot const in - cond_timewait (e.g., HP/UX). -ACE_LACKS_COND_T Platform lacks condition - variables (e.g., Win32 and - VxWorks) -ACE_LACKS_CONDATTR_PSHARED Platform has no implementation - of - pthread_condattr_setpshared(), - even though it supports - pthreads! -ACE_LACKS_DIFFTIME Platform lacks difftime() implementation -ACE_LACKS_DUP2 Platform lacks dup2(). -ACE_LACKS_FCNTL Platform lacks POSIX-style fcntl (). -ACE_LACKS_FSYNC Platform lacks fsync(). -ACE_LACKS_INLINE_FUNCTIONS Platform can't handle "inline" - keyword correctly. -ACE_LACKS_EXEC Platform lacks the exec() - family of system calls (e.g., - Win32, VxWorks, Chorus) -ACE_LACKS_FILELOCKS Platform lacks file locking - mechanism -ACE_LACKS_FLOATING_POINT Platform does not support - floating point operations - (e.g., certain Chorus hardware - platforms) -ACE_LACKS_FORK Platform lacks the fork() - system call (e.g., Win32, - VxWorks, Chorus) -ACE_LACKS_GETOPT_PROTOTYPE Platform lacks the getopt() - prototype (e.g., LynxOS) -ACE_LACKS_GETPGID Platform lacks getpgid() call - (e.g., Win32, Chorus, and - FreeBSD). -ACE_LACKS_GETSERVBYNAME Platforms lacks - getservbyname() (e.g., VxWorks - and Chorus). -ACE_LACKS_GETIPNODEBYADDR Platform lacks getipnodebyaddr(). -ACE_LACKS_GETIPNODEBYNAME Platform lacks getipnodebyname(). -ACE_LACKS_INET_ATON Platform lacks the inet_aton() - function. -ACE_LACKS_INET_ATON_PROTOTYPE Platform/compiler lacks the - inet_aton() prototype (e.g., - LynxOS) -ACE_LACKS_IOSTREAMS_TOTALLY Iostreams are not supported - adequately on the given platform. -ACE_LACKS_IOSTREAM_FX iostream header does not - declare ipfx (), opfx (), - etc. -ACE_LACKS_KEY_T Platform lacks key_t (e.g., - Chorus, VxWorks, Win32) -ACE_LACKS_LINEBUFFERED_STREAMBUF Platform lacks streambuf - "linebuffered ()". -ACE_LACKS_LONGLONG_T Compiler/platform does not - support the signed or unsigned long - long datatype. -ACE_LACKS_LSTAT Platform lacks the lstat() function. -ACE_LACKS_MADVISE Platform lacks madvise() - (e.g., Linux) -ACE_LACKS_MALLOC_H Platform lacks malloc.h -ACE_LACKS_MEMORY_H Platform lacks memory.h (e.g., - VxWorks and Chorus) -ACE_LACKS_MKFIFO Platform lacks mkfifo() e.g., - VxWorks, Chorus, pSoS, and WinNT. -ACE_LACKS_MKTEMP Platform lacks the mktemp() function. -ACE_LACKS_MKTEMP_PROTOTYPE Platform/compiler lacks the - mktemp() prototype (e.g., - LynxOS) -ACE_LACKS_MKSTEMP Platform lacks the mkstemp() function. -ACE_LACKS_MKSTEMP_PROTOTYPE Platform/compiler lacks the - mkstemp() prototype (e.g., - LynxOS) -ACE_LACKS_MMAP The platform doesn't have - mmap(2) (e.g., SCO UNIX). -ACE_LACKS_MODE_MASKS Platform/compiler doesn't have - open() mode masks. -ACE_LACKS_MPROTECT The platform doesn't have - mprotect(2) (e.g., EPLX real - time OS from CDC (based on - LYNX)) -ACE_LACKS_MSG_ACCRIGHTS Platform defines ACE_HAS_MSG, - but lacks msg_accrights{,len}. -ACE_LACKS_MSG_WFMO Platform lacks - MsgWaitForMultipleObjects - (only needs to be defined when - ACE_WIN32 is also defined). -ACE_LACKS_MSYNC Platform lacks msync() (e.g., - Linux) -ACE_LACKS_MUTEXATTR_PSHARED Platform lacks - pthread_mutexattr_setpshared(). -ACE_LACKS_NAMED_POSIX_SEM Platform lacks named POSIX - semaphores (e.g., Chorus) -ACE_LACKS_NETDB_REENTRANT_FUNCTIONS Platform does not support - reentrant netdb functions - (getprotobyname_r, - getprotobynumber_r, - gethostbyaddr_r, - gethostbyname_r, - getservbyname_r). -ACE_LACKS_NEW_H OS doesn't have, or we don't want to - use, new.h. -ACE_LACKS_NULL_PTHREAD_STATUS OS requires non-null status pointer - for ::pthread_join (). -ACE_LACKS_NUMERIC_LIMITS Platform lacks std::numeric_limits<>. -ACE_LACKS_PERFECT_MULTICAST_FILTERING Platform lacks IGMPv3 "perfect" filtering - of multicast dgrams at the socket level. - If == 1, ACE_SOCK_Dgram_Mcast will bind - the first joined multicast group to the - socket, and all future joins on that - socket will fail with an error. -ACE_LACKS_PRAGMA_ONCE Compiler complains about #pragma once -ACE_LACKS_PRI_T Platform lacks pri_t (e.g., - Tandem NonStop UNIX). -ACE_LACKS_PTHREAD_CANCEL Platform lacks - pthread_cancel(). -ACE_LACKS_PTHREAD_SIGMASK Platform lacks pthread_sigmask (). -ACE_LACKS_PTHREAD_THR_SIGSETMASK Platform lacks - pthread_thr_sigsetmask (e.g., - MVS, HP/UX, and OSF/1 3.2) -ACE_LACKS_PUTENV_PROTOTYPE Platform/compiler lacks the - putenv() prototype (e.g., - LynxOS) -ACE_LACKS_PWD_REENTRANT_FUNCTIONS Platform lacks getpwnam_r() - methods (e.g., SGI 6.2). -ACE_LACKS_QSORT Compiler/platform lacks the - standard C library qsort() - function -ACE_LACKS_RAND_REENTRANT_FUNCTIONS Platform lacks rand_r() -ACE_LACKS_READLINK Platform lacks the readlink() function. -ACE_LACKS_READV Platform doesn't define readv, - so use our own -ACE_LACKS_RENAME Platform lacks rename(). -ACE_LACKS_RLIMIT Platform/compiler lacks - {get,set}rlimit() function - (e.g., VxWorks, Chorus, and - SCO UNIX) -ACE_LACKS_RLIMIT_PROTOTYPE Platform/compiler lacks - {get,set}rlimit() prototypes - (e.g., Tandem) -ACE_LACKS_READDIR_R Platform uses ACE_HAS_DIRENT - but does not have readdir_r - (). -ACE_LACKS_REALPATH Platform/compiler lacks - realpath () function (e.g., - LynxOS) -ACE_LACKS_RECVMSG Platform lacks recvmsg() - (e.g., Linux) -ACE_LACKS_RWLOCK_T Platform lacks readers/writer - locks. -ACE_LACKS_RWLOCKATTR_PSHARED Platform lacks - pthread_rwlockattr_setpshared(). -ACE_LACKS_SBRK Platform lacks a working - sbrk() (e.g., Win32 and - VxWorks) -ACE_LACKS_SCANDIR_PROTOTYPE Platform/compiler lacks - scandir() prototype - (e.g., LynxOS) -ACE_LACKS_SEEKDIR Platform uses ACE_HAS_DIRENT - but does not have seekdir (). -ACE_LACKS_SEMBUF_T Platform lacks struct sembuf - (e.g., Win32 and VxWorks) -ACE_LACKS_SETDETACH Platform lacks - pthread_attr_setdetachstate() - (e.g., HP/UX 10.x) -ACE_LACKS_SETSCHED Platform lacks - pthread_attr_setsched() - (e.g. MVS) -ACE_LACKS_SIGACTION Platform lacks struct - sigaction (e.g., Win32 and - Chorus) -ACE_LACKS_SIGNED_CHAR Platform lacks "signed char" - type (broken!) -ACE_LACKS_SIGSET Platform lacks signal sets - (e.g., Chorus and Win32) -ACE_LACKS_STRPTIME Platform/compiler lacks the strptime() - function. -ACE_LACKS_WCSCHR Platform/compiler lacks wcschr() -ACE_LACKS_STRDUP Platform/compiler lacks strdup() -ACE_LACKS_WCSDUP Platform/compiler lacks wcsdup() -ACE_LACKS_STRRCHR Platform/compiler lacks strrchr() -ACE_LACKS_WCSRCHR Platform/compiler lacks wcsrchr() -ACE_LACKS_SWAB Platform/compiler lacks - swab () function. -ACE_LACKS_SYS_MSG_H Platform lacks sys/msg.h - (e.g., Chorus and VxWorks) -ACE_LACKS_SYS_PARAM_H Platform lacks <sys/param.h> - (e.g., MVS) -ACE_LACKS_SENDMSG Platform lacks sendmsg() - (e.g., Linux) -ACE_LACKS_SI_ADDR Platform lacks the si_addr - field of siginfo_t (e.g., - VxWorks and HP/UX 10.x) -ACE_LACKS_SYMLINKS Platform lacks symbolic links -ACE_LACKS_SYSV_SHMEM Platform lacks System V shared - memory (e.g., Win32 and - VxWorks) -ACE_LACKS_SIGINFO_H Platform lacks the siginfo.h - include file (e.g., MVS) -ACE_LACKS_SOCKET_BUFSIZ Platform doesn't support - SO_SNDBUF/SO_RCVBUF -ACE_LACKS_SOCKETPAIR Platform lacks the - socketpair() call (e.g., SCO - UNIX) -ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES Compiler doesn't support - static data member templates -ACE_LACKS_STRCASECMP Compiler/platform lacks - strcasecmp() (e.g., DG/UX, - UNIXWARE, VXWORKS) -ACE_LACKS_STRCASECMP_PROTOTYPE Platform/compiler lacks the - strcasecmp() prototype (e.g., - LynxOS) -ACE_LACKS_STRNCASECMP_PROTOTYPE Platform/compiler lacks the - strncasecmp() prototype (e.g., - LynxOS) -ACE_LACKS_STRRECVFD Platform doesn't define struct - strrecvfd. -ACE_LACKS_SYSCALL Platform doesn't have - syscall() prototype -ACE_LACKS_T_ERRNO Header files lack t_errno for - TLI -ACE_LACKS_TCP_NODELAY OS does not support TCP_NODELAY. -ACE_LACKS_TELLDIR Platform uses ACE_HAS_DIRENT - but does not have telldir (). -ACE_LACKS_THREAD_STACK_SIZE Platform lacks - pthread_attr_setstacksize() - (e.g., Linux pthreads) -ACE_LACKS_THR_CONCURRENCY_FUNCS (ONLY APPLIES TO SOLARIS) - Platform does not support - thr_getconcurrency/thr_setconcurrency - functions, or their implementation - is effectively a "no-op". This - notably applies for Solaris >= 5.9. - Note that if you build on Solaris 8 - and run on Solaris 9+, you can - encounter thread creation errors - unless you rebuild on the target - platform. -ACE_LACKS_TIMEDWAIT_PROTOTYPES MIT pthreads platform lacks - the timedwait prototypes -ACE_LACKS_TIMESPEC_T Platform does not define - timepec_t as a typedef for - struct timespec. -ACE_LACKS_TRUNCATE Platform doesn't have truncate() - (e.g., vxworks) -ACE_LACKS_U_LONGLONG_T Platform does not have - u_longlong_t typedef, and - "sun" is defined. -ACE_LACKS_UALARM_PROTOTYPE Platform/compiler lacks the - ualarm() prototype (e.g., - Solaris) -ACE_LACKS_CHAR_RIGHT_SHIFTS Compiler does not have any istream - operator>> for chars, u_chars, or - signed chars. -ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS Compiler does not have - operator>> (istream &, u_char *) or - operator>> (istream &, signed char *) -ACE_LACKS_UCONTEXT_H Platform lacks the ucontext.h - file -ACE_LACKS_UMASK Platform lacks umask function -ACE_LACKS_UNBUFFERED_STREAMBUF Platform lacks streambuf - "unbuffered ()". -ACE_LACKS_UNISTD_H Platform lacks the unistd.h - file (e.g., VxWorks and Win32) -ACE_LACKS_UNIX_DOMAIN_SOCKETS ACE platform has no UNIX - domain sockets -ACE_LACKS_UNIX_SIGNALS Platform lacks full signal - support (e.g., Win32 and - Chorus). -ACE_LACKS_UNSIGNEDLONGLONG_T Compiler/platform does not - support the unsigned long - long datatype. -ACE_LACKS_UTSNAME_T Platform lacks struct utsname - (e.g., Win32 and VxWorks) -ACE_LACKS_UNAME Platform lacks uname calls -ACE_LACKS_WAIT The platform lacks wait -ACE_LACKS_WIN32_GETPROCESSTIMES The Windows platform doesn't have - GetProcessTimes(). -ACE_LACKS_WIN32_MOVEFILEEX The Windows platform doesn't have - MoveFileEx(). -ACE_LACKS_WIN32_SECURITY_DESCRIPTORS The Windows platform doesn't have - security descriptor support. -ACE_LACKS_WRITEV Platform doesn't define - writev, so use our own - -ACE_LEGACY_MODE When defined, it will enable - some code that is used to - provide some support for - backwards compatibility. - -ACE_NEEDS_DEV_IO_CONVERSION Necessary with some compilers - to pass ACE_TTY_IO as - parameter to DEV_Connector. -ACE_NEEDS_FUNC_DEFINITIONS Compiler requires a definition - for a "hidden" function, e.g., - a private, unimplemented copy - constructor or assignment - operator. The SGI C++ - compiler needs this, in - template classes, with - ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA. -ACE_NEEDS_HUGE_THREAD_STACKSIZE Required by platforms with - small default stacks. -ACE_NEEDS_LWP_PRIO_SET OS has LWPs, and when the - priority of a bound thread is - set, then the LWP priority - must be set also. -ACE_NEEDS_SCHED_H Platform needs to #include - <sched.h> - to get thread scheduling - defs. - -ACE_NO_WIN32_LEAN_AND_MEAN If this is set, then ACE does not - define WIN32_LEAN_AND_MEAN before - including <windows.h>. Needed for - code that uses non-lean Win32 - facilities such as COM. - -ACE_ONLY_LATEST_AND_GREATEST A macro that indicates that - the "latest and greatest" - features of ACE/TAO should be - turned on. It has been - replaced by ACE_LEGACY_MODE, - which has the opposite meaning - but serves the same purpose. - -ACE_SHM_OPEN_REQUIRES_ONE_SLASH The path specified on shm_open() must - have a leading, single slash and not - have any other slashes. - -ACE_WSTRING_HAS_USHORT_SUPPORT If a platform has wchar_t as a - separate type, then - ACE_WString doesn't have a - constructor that understands - an ACE_USHORT16 string. So - this macro enables - one. (mostly used my ACE Name - Space). - -ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK - Under QNX/RTP the objects preallocated - in ACE_OS_Object_Manager cannot be - destroyed after a fork() call. - Since these objects are only destroyed - at application shutdown we take the - simpler approach of not destroying - them at all. - Both QNX/RTP and LynxOS suffer from - this problem. - -ACE_LACKS_MEMBER_TEMPLATES Compiler does not support - member template feature. - -ACE_LACKS_DEPRECATED_MACROS When this define is set, macros which - are deprecated are not defined. Usefull - to check whether deprecated macros are - not used anymore. - -ACE_DONT_INIT_WINSOCK This definition defines whether or not - to explicitly initialize Winsock during - ACE::init() (i.e., whether WSAStartup() - is called). Some Win32 platforms have - dependent characteristics between - ACE initialization and - network initialization. - ----------------------------------------- - -The following macros determine the svc.conf file format ACE uses. - -Macro Description ------ ----------- -ACE_HAS_CLASSIC_SVC_CONF This macro forces ACE to use - the classic svc.conf format. - -ACE_HAS_XML_SVC_CONF This macro forces ACE to use the XML - svc.conf format. - -ACE_USES_CLASSIC_SVC_CONF This macro should be defined - as 0 or 1, depending on the - preferred svc.conf file - format. Defining this macro - to 0 means ACE will use XML - svc.conf file format. - Defining it to 1 will force - ACE to use the classic - svc.conf format. - ** This macro takes precedence - ** over previous two macros. - ----------------------------------------- -The following is a partial list of where some of these macros are used -in the code. This list was originally compiled by Jam Hamidi -(jh1@core01.osi.com). It is now hopelessly out of date. Hopefully, -someone will come along and update it.... - -ACE_HAS_ALLOCA: ---------------- - - Used in: - libsrc/IPC_SAP/SOCK_SAP/SOCK_Connect.C - for allocation of iovp -A - libsrc/IPC_SAP/SPIPE_SAP/SPIPE_Msg.C - for alocation of iovp - - In solaris: - alloca() allocates size bytes of space in the stack frame of - the caller, and returns a pointer to the allocated block. - This temporary space is automatically freed when the caller - returns. Note: if the allocated block is beyond the current - stack limit, the resulting behavior is undefined. - - In HPUX: - no equivalent. - - Notes: - in HPUX it has to do new and delete. Affects performance. - - -ACE_HAS_AUTOMATIC_INIT_FINI: ----------------------------- - - Used in: - libsrc/Service_Configurator/Service_Repository.i - libsrc/Service_Configurator/Parse_Node.i - include/Parse_Node.i - include/Service_Repository.i - - In solaris: - _init() initializes a loadable module. It is called before - any other routine in a loadable module. - _info() returns information about a loadable module. - _fini() should return the return value from mod_remove(9F). - This flag if set, doesn't do anything. If not set, forces - _init() and _fini() to be executed as is: - dlsym ((char *) handle, "_fini"). - - In HPUX: - don't set. - Maybe have to look into shl_load( ), shl_definesym( ), - shl_findsym( ), shl_gethandle( ), shl_getsymbols( ), - shl_unload( ), shl_get( )(3X) - explicit load of shared libraries - Means Service Configurator won't be available. - TBA. - - -ACE_HAS_CPLUSPLUS_HEADERS: --------------------------- - - Used In: - ace/OS.h - - HPUX: - set it. - - Notes: - If this is not defined, libc.h and osfcn.h get included. - Only needed for older compiler/OS platforms that don't - provide standard C++ header files in /usr/include. - -ACE_HAS_HI_RES_TIMER: ---------------------- - - Used In: - libsrc/Misc/High_Res_Timer.h - libsrc/Misc/High_Res_Timer.C - include/High_Res_Timer.h - - In Solaris, - C++ wrapper around gethrtime(), which returns a long long. - gethrtime() returns the current high-resolution real time. - Time is expressed as nanoseconds since some arbitrary time - in the past; it is not correlated in any way to the time of - day, and thus is not subject to resetting, drifting, etc. - - In HPUX - look into: getclock(), reltimer(), getitimer() - maybe even vtimes structure vm_utime, vm_stime ? - - Notes: - TBA - - -ACE_LACKS_T_ERRNO: -------------------- - - Used In: - ace/OS.h - - HPUX: - set it. - - Notes: - if set, adds: - extern int t_errno; - - -ACE_HAS_POSIX_NONBLOCK: ------------------------ - - Used in: - ace/OS.h - - HPUX: - set it. - - Notes: - if defined, sets ACE_NONBLOCK and O_NONBLOCK - O_NONBLOCK is used in libsrc/Misc/misc.C to do a - fcntl (fd, F_SETFL, opt) - ACE_NONBLOCK is used in libsrc/IPC_SAP/FIFO_SAP/FIFO_Recv.C in the - disable member function and options passed to the open function - in libsrc/IPC_SAP/FIFO_SAP/FIFO.C - - -ACE_HAS_PROC_FS: ----------------- - - Used in: - ace/OS.h - libsrc/Misc/Profile_Timer.i - - Notes: - if set, includes <sys/procfs.h> - the PIOCUSAGE define is used in Profile_Timer. - - Solaris: - procfs.h defines things for the prpsinfo structure (basically to - do a "ps" from inside a program). - - HPUX: - don't set: obviously a different mechanism. - Look into /usr/include/sys/proc.h. The structure is proc. The - pointer to the kernel's proc table may be obtained by - extern struct proc *proc, *procNPROC; - extern int nproc; - - -ACE_HAS_PRUSAGE_T: ------------------- - - Used in: - libsrc/Misc/Profile_Timer.h - libsrc/Misc/Profile_Timer.C - - Notes: - If defined, declares the Profile_Timer class that does start(), - stop() and basically gets real_time, user_time, system_time for - an interval. - This stuff is highly non-portable. - - HPUX: - don't set - - -ACE_HAS_SEMUN: --------------- - - Used in: - libsrc/Semaphores/Semaphore_Simple.h - - Notes: - if not defined, defines semun as: - union semun { - int val; /* value for SETVAL */ - struct semid_ds *buf; /* buffer for IPC_STAT & IPC_SET */ - ushort *array; /* array for GETALL & SETALL */ - }; - - HPUX: - don't set. - in /usr/include/sem.h: - /* The fourth argument to semctl() varies depending on the value of - its first argument. If desired, "union semun" can be declared - by the user, but this is not necessary since the individual - member can just be passed as the argument. */ - - -ACE_HAS_SIG_ATOMIC_T: ---------------------- - - Used in: - ace/OS.h - - Notes: - if not defined, does a: - typedef int sig_atomic_t; - This is used in the Reactor and service configurator. - - HPUX: - set it. - in /usr/include/sys/signal.h: - typedef unsigned int sig_atomic_t; - - -ACE_HAS_SSIZE_T: ----------------- - - Used in: - ace/OS.h - - Notes: - if not defined, does a - typedef int ssize_t; - used mostly in IPC_SAP. (don't confuse with size_t). - - HPUX: - set it. - in /usr/include/sys/types.h - - -ACE_HAS_STRBUF_T: ------------------ - - Used in: - include/Str_Buf.h - - Notes: - if not defined, declares the strbuf structure as: - struct strbuf - { - int maxlen; /* no. of bytes in buffer */ - int len; /* no. of bytes returned */ - void *buf; /* pointer to data */ - }; - - Solaris: - defined in /usr/include/sys/stropts.h - Sys V.4 Streams. - uses strbuf as parameter to putmsg, putpmsg: - int putmsg(int fildes, const struct strbuf *ctlptr, - const struct strbuf *dataptr, int flags); - - HPUX: - don't set. - no SYS V.4 streams. - - -ACE_HAS_STREAMS: ----------------- - - Used In: - ace/OS.h - libsrc/IPC_SAP/SOCK_SAP/LSOCK.C - - Notes: - if defined, includes <stropts.h> - - HPUX: - don't set. - no SYS V.4 streams. - - -ACE_HAS_STREAM_PIPES: ---------------------- - - Used in: - libsrc/IPC_SAP/SPIPE_SAP/SPIPE_Msg.h - libsrc/IPC_SAP/SPIPE_SAP/SPIPE_Msg.C - libsrc/IPC_SAP/SPIPE_SAP/SPIPE_Listener.h - libsrc/IPC_SAP/SPIPE_SAP/SPIPE_Listener.C - libsrc/IPC_SAP/SPIPE_SAP/SPIPE.h - libsrc/IPC_SAP/SPIPE_SAP/SPIPE.C - libsrc/IPC_SAP/FIFO_SAP/FIFO_Send_Msg.h - libsrc/IPC_SAP/FIFO_SAP/FIFO_Send_Msg.C - libsrc/IPC_SAP/FIFO_SAP/FIFO_Send_Msg.i - libsrc/IPC_SAP/FIFO_SAP/FIFO_Recv_Msg.h - libsrc/IPC_SAP/FIFO_SAP/FIFO_Recv_Msg.C - libsrc/IPC_SAP/FIFO_SAP/FIFO_Recv_Msg.i - - Notes: - if not set, won't be able to use the SPIPE class (IPC_SAP) with - rendezvous handles. - - HPUX: - don't set. - No sysV.4 streams. - - -ACE_HAS_SVR4_DYNAMIC_LINKING: ------------------------------ - - Used in: - ace/OS.h - tests/Service_Configurator/CCM_App.C - - Notes: - if defined, includes <dlfcn.h> - with dlopen(), dlsym(), etc.. - - HPUX: - don't set. - has its own: - shl_findsym( ), shl_gethandle( ), shl_getsymbols( ), - shl_unload( ), shl_get( )(3X) - explicit load of shared libraries - - -ACE_HAS_SVR4_GETTIMEOFDAY: --------------------------- - - Used in: - ace/OS.h - libsrc/Reactor/Timer_Queue.i - - Notes: - has to do with gettimeofday (). - - Solaris: - gettimeofday (struct timeval *tp) - - HPUX: - don't set. - it has gettimeofday (struct timeval *tp, struct timezone *tzp); - most calls do a: - #if defined (ACE_HAS_SVR4_GETTIMEOFDAY) - ::gettimeofday (&cur_time); - #else - ::gettimeofday (&cur_time, 0); - #endif /* ACE_HAS_SVR4_GETTIMEOFDAY */ - - -ACE_HAS_POLL: ------------- - Used in: - ace/OS.h - - Notes: - #if defined (ACE_HAS_POLL) - #include /**/ <poll.h> - #endif /* ACE_HAS_POLL */ - -ACE_USE_POLL_IMPLEMENTATION: ------------------- - - Used in: - ace/OS.h - - Notes: - Use the poll() event demultiplexor rather than select(). - - HPUX: - set it. - - -ACE_HAS_SVR4_SIGNAL_T: ----------------------- - - Used in: - ace/OS.h - - Notes: - #if defined (ACE_HAS_SVR4_SIGNAL_T) - typedef void (*SignalHandler)(int); - typedef void (*SignalHandlerV)(void); - #elif defined (ACE_HAS_SIGNALHANDLERV_INT_ARG) - typedef void (*SignalHandler)(int); - typedef void (*SignalHandlerV)(int); - #else - #define SignalHandler SIG_PF - typedef void (*SignalHandlerV)(...); - #endif /* ACE_HAS_SVR4_SIGNAL_T */ - - HPUX: - set it. - - -ACE_HAS_SVR4_TLI: ------------------ - - Used in: - libsrc/IPC_SAP/TLI_SAP/TLI.C - libsrc/IPC_SAP/TLI_SAP/TLI.h - libsrc/IPC_SAP/TLI_SAP/TLI_Stream.C - - Notes: - TLI is the transport layer calls as in: t_bind(), t_open(), t_unbind(), - t_optmgmt(), ... in SunOS and Solaris. - - HPUX: - don't set. - Not supported. - - -ACE_HAS_SYS_FILIO_H: --------------------- - - Used in: - ace/OS.h - - Notes: - if not defined, includes <sys/filio.h>. - didn't find any reference to anything in this file in the ACE code. - - Solaris: - filio.h defines FIOCLEX, FIOASYNC, ... as _IO('f', 1), .. - for FIOLFS,.. solaris has this to say: - /* - * ioctl's for Online: DiskSuite. - * WARNING - the support for these ioctls may be withdrawn - * in the future OS releases. - */ - - HPUX: - <sys/ioctl.h> defines FIOASYNC and some other ones, - <sgtty.h> defines some like FIOCLEX. - some are never defined. - use #ifdef HP-UX to modify sysincludes.h - - -ACE_HAS_TEMPLATE_TYPEDEFS: --------------------------- - - Used in: - libsrc/ASX/*.[Chi] - - Notes: - cfront-based C++ compilers don't implement templates that support - classes with typedefs of other types as formal arguments. This - typedef uses the C++ preprocessor to work around this problem. - -ACE_HAS_THREADS: ----------------- - - Used in: - libsrc/Service_Configurator/Svc_Conf.y.C - libsrc/Service_Configurator/Thread_Spawn.i - libsrc/Threads/Synch.C - libsrc/Threads/Synch.i - libsrc/Threads/Thr_Manager.i - libsrc/ASX/STREAM.C - libsrc/ASX/Queue.C - libsrc/ASX/Module.C - libsrc/ASX/Stream_Modules.C - libsrc/ASX/Multiplexor.C - libsrc/ASX/Message_List.C - include/Message_List.h - include/Module.h - include/Multiplexor.h - include/Queue.h - include/STREAM.h - include/Stream_Modules.h - include/Service_Types.h - include/Thread_Spawn.h - include/Synch.h - include/Thr_Manager.h - - Notes: - We use Message_List.h even in a non-threaded environment. - our XOMessageList.h does this by #ifdefs around Threaded things. - - HPUX: - not until 10.0. - - -ACE_HAS_TIMOD_H: ----------------- - - Used in: - ace/OS.h - - Notes: - if defined, include <sys/timod.h> - - Solaris: - timod is a STREAMS module for use with the Transport Inter- - face (TI) functions of the Network Services library. The - timod module converts a set of ioctl(2) calls into STREAMS - messages that may be consumed by a transport protocol pro- - vider that supports the Transport Interface. This allows a - user to initiate certain TI functions as atomic operations. - - HPUX: - don't set. - - -ACE_HAS_TIUSER_H: ------------------ - - Used in: - ace/OS.h - - Notes: - if set, includes <tiuser.h> - - Solaris: - in conjunction with t_bind, t_accept, etc.. transport layer. - - HPUX: - don't set. - - -ACE_USE_POLL_IMPLEMENTATION: ----------------------------- - - Used in: - libsrc/Reactor/Reactor.i - include/Event_Handler.h - ace/OS.h - include/Reactor.h - - Notes: - in the reactor, use poll instead of select. In general, - good thing to have set. - -ACE_USES_GPROF: ----------------------------- - Used in: - ace/Base_Thread_Adapter.h - ace/Base_Thread_Adapter.inl - ace/Base_Thread_Adapter.cpp - - Notes: - When using gprof mainly on Linux, #define ACE_USES_GPROF - will add calls to getitimer/setitimer in order to initialize profile - timer and overcome the problem of gprof with multithreaded applications. - -ACE_QTREACTOR_CLEAR_PENDING_EVENTS: ----------------------------- - Used in: - ace/QtReactor.cpp: - QtReactor by default does not clear qt events pending for - activated socket. Clearing costs much, at least 2 hash accesses - in ACE, and 2 another in Qt. It is also better to not clear - pending events as some side effects are unknown. However, - when events are not clear, then some user applications may be - confused by handle_input/output/exception called without any - data eg. in ACE_Acceptor::make_svc_handler. This swithc is - intended to quickly fix user application which does not - follow some reactor rules. - Linux: - It seems linux::qt does not queue pending events. Do not define - this switch. - Windows: - Windows::qt queues pending events. If user application has handle_* - methods which cannot be called without data, then turn on this switch - to quickly fix the bug. However, one should seriously fix the - application then. diff --git a/externals/ace/Recursive_Thread_Mutex.h b/externals/ace/Recursive_Thread_Mutex.h index 93a25a7bd11..5b7809afe58 100644 --- a/externals/ace/Recursive_Thread_Mutex.h +++ b/externals/ace/Recursive_Thread_Mutex.h @@ -4,7 +4,7 @@ /** * @file Recursive_Thread_Mutex.h * - * $Id: Recursive_Thread_Mutex.h 91066 2010-07-12 11:05:04Z johnnyw $ + * $Id: Recursive_Thread_Mutex.h 89121 2010-02-22 14:48:31Z schmidt $ * * Moved from Synch.h. * @@ -90,14 +90,14 @@ public: /** * Acquire mutex ownership. This calls <acquire> and is only - * here to make the ACE_Recusive_Thread_Mutex interface consistent + * here to make the <ACE_Recusive_Thread_Mutex> interface consistent * with the other synchronization APIs. */ int acquire_read (void); /** * Acquire mutex ownership. This calls <acquire> and is only - * here to make the ACE_Recusive_Thread_Mutex interface consistent + * here to make the <ACE_Recusive_Thread_Mutex> interface consistent * with the other synchronization APIs. */ int acquire_write (void); @@ -105,7 +105,7 @@ public: /** * Conditionally acquire mutex (i.e., won't block). This calls * <tryacquire> and is only here to make the - * ACE_Recusive_Thread_Mutex interface consistent with the other + * <ACE_Recusive_Thread_Mutex> interface consistent with the other * synchronization APIs. Returns -1 on failure. If we "failed" * because someone else already had the lock, @c errno is set to * @c EBUSY. @@ -115,7 +115,7 @@ public: /** * Conditionally acquire mutex (i.e., won't block). This calls * <tryacquire> and is only here to make the - * ACE_Recusive_Thread_Mutex interface consistent with the other + * <ACE_Recusive_Thread_Mutex> interface consistent with the other * synchronization APIs. Returns -1 on failure. If we "failed" * because someone else already had the lock, @c errno is set to * @c EBUSY. diff --git a/externals/ace/SSL/SSL_Asynch_Stream.cpp b/externals/ace/SSL/SSL_Asynch_Stream.cpp index 15c648d18fe..ab8ec7fbbf9 100644 --- a/externals/ace/SSL/SSL_Asynch_Stream.cpp +++ b/externals/ace/SSL/SSL_Asynch_Stream.cpp @@ -2,7 +2,7 @@ ACE_RCSID (ACE_SSL, SSL_Asynch_Stream, - "$Id: SSL_Asynch_Stream.cpp 84181 2009-01-16 22:37:49Z shuston $") + "$Id: SSL_Asynch_Stream.cpp 82574 2008-08-08 19:35:06Z parsons $") // This only works on platforms with Asynchronous IO support. #if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) @@ -17,10 +17,6 @@ ACE_RCSID (ACE_SSL, #include "ace/Proactor.h" #include "ace/Truncate.h" -#if !defined(__ACE_INLINE__) -#include "SSL_Asynch_Stream.inl" -#endif /* __ACE_INLINE__ */ - #include <openssl/err.h> ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -97,13 +93,13 @@ ACE_SSL_Asynch_Stream::ACE_SSL_Asynch_Stream ( ACE_SSL_Asynch_Stream::Stream_Type s_type, ACE_SSL_Context * context) : type_ (s_type), + handle_ (ACE_INVALID_HANDLE), proactor_ (0), ext_handler_ (0), ext_read_result_ (0), ext_write_result_(0), flags_ (0), ssl_ (0), - handshake_complete_(false), bio_ (0), bio_istream_ (), bio_inp_msg_ (), @@ -264,7 +260,7 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler, // Get a proactor for/from the user. this->proactor_ = this->get_proactor (proactor, handler); this->ext_handler_ = & handler; - this->handle (handle); + this->handle_ = handle; // Open internal input stream if (this->bio_istream_.open (*this, // real callbacks to this @@ -346,7 +342,7 @@ ACE_SSL_Asynch_Stream::read (ACE_Message_Block & message_block, ACE_NEW_RETURN (this->ext_read_result_, ACE_SSL_Asynch_Read_Stream_Result ( *this->ext_handler_, - this->handle (), + this->handle_, message_block, bytes_to_read, act, @@ -389,7 +385,7 @@ ACE_SSL_Asynch_Stream::write (ACE_Message_Block & message_block, ACE_NEW_RETURN (this->ext_write_result_, ACE_SSL_Asynch_Write_Stream_Result ( *this->ext_handler_, - this->handle (), + this->handle_, message_block, bytes_to_write, act, @@ -495,18 +491,7 @@ int ACE_SSL_Asynch_Stream::do_SSL_handshake (void) { if (SSL_is_init_finished (this->ssl_)) - { - if (!handshake_complete_) - { - handshake_complete_ = true; - - if (!post_handshake_check ()) - { - return -1; - } - } - return 1; - } + return 1; if (this->flags_ & SF_REQ_SHUTDOWN) return -1; @@ -556,13 +541,6 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void) return 1; } - -bool -ACE_SSL_Asynch_Stream::post_handshake_check (void) -{ - return true; -} - // ************************************************************ // Perform SSL_read call if necessary and notify user // ************************************************************ @@ -790,7 +768,7 @@ ACE_SSL_Asynch_Stream::print_error (int err_ssl, const ACE_TCHAR * pText) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("SSL-error:%d %s\n"), + "SSL-error:%d %s\n" , err_ssl, pText)); @@ -803,7 +781,7 @@ ACE_SSL_Asynch_Stream::print_error (int err_ssl, { ERR_error_string_n (lerr, buf, sizeof buf); - ACE_DEBUG ((LM_DEBUG, "%C\n", buf)); + ACE_DEBUG ((LM_DEBUG, "%s\n", buf)); } #endif /* OPENSSL_VERSION_NUMBER */ } diff --git a/externals/ace/SSL/SSL_Asynch_Stream.h b/externals/ace/SSL/SSL_Asynch_Stream.h index af82300a428..faae6112cdb 100644 --- a/externals/ace/SSL/SSL_Asynch_Stream.h +++ b/externals/ace/SSL/SSL_Asynch_Stream.h @@ -4,7 +4,7 @@ /** * @file SSL_Asynch_Stream.h * - * $Id: SSL_Asynch_Stream.h 84181 2009-01-16 22:37:49Z shuston $ + * $Id: SSL_Asynch_Stream.h 80826 2008-03-04 14:51:23Z wotte $ * * @author Alexander Libman <alibman@baltimore.com> */ @@ -185,9 +185,6 @@ public: int close (void); - /// Return a pointer to the underlying SSL structure. - SSL *ssl (void) const; - /** * Initializes the factory with information which will be used with * each asynchronous call. @@ -298,40 +295,6 @@ protected: virtual void handle_wakeup (void); /** - * This method will be called after a successful SSL handshake indicating - * that the peer's certificate chain (if any) has been verified and the key - * exchange has completed. When a peer certificate is required, this - * method must be used to perform additional checks beyond the verification - * performed by OpenSSL. - * - * Check 1: - * - * SSL clients that require a peer certificate must specify SSL_VERIFY_PEER - * via ACE_SSL_Context::default_verify_mode. If the peer sends an invalid - * certificate, the SSL handshake will fail; however, if the peer does not - * send a certificate, the SSL handshake will complete successfully which - * may not be acceptable. In this case, you must override this method in a - * subclass and return false if the call to SSL_get_peer_certificate returns - * null. - * - * Check 2: - * - * An additional post handshake check that you should perform is to verify - * the certificate's FQDN against the host address you intended to connect - * to. This check will prevent an attacker from using a certificate signed - * by your CA to usurp your session. For further info on this check, see - * the post_connection_check method in Example 5-8 of 'Network Security with - * OpenSSL' by Viega, et. al. - * - * Return: - * - * false - Terminate the connection. Outstanding IO complete with ERR_CANCELED. - * - * true - Proceed with connection. The default implementation returns true. - */ - virtual bool post_handshake_check (void); - - /** * @name SSL State Machine */ //@{ @@ -379,6 +342,9 @@ protected: /// Stream Type ST_CLIENT/ST_SERVER Stream_Type type_; + /// The real file/socket handle + ACE_HANDLE handle_; + /// The proactor ACE_Proactor * proactor_; @@ -411,9 +377,6 @@ protected: /// The SSL session. SSL * ssl_; - /// Flag ensures that post_connection_check() is called at most one time. - bool handshake_complete_; - /// The BIO implementation BIO * bio_; @@ -454,10 +417,6 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined(__ACE_INLINE__) -#include "SSL_Asynch_Stream.inl" -#endif /* __ACE_INLINE__ */ - #endif /* OPENSSL_VERSION_NUMBER > 0x0090581fL && (ACE_WIN32 || ACE_HAS_AIO_CALLS) */ diff --git a/externals/ace/SSL/SSL_Asynch_Stream.inl b/externals/ace/SSL/SSL_Asynch_Stream.inl deleted file mode 100644 index d9d0db95596..00000000000 --- a/externals/ace/SSL/SSL_Asynch_Stream.inl +++ /dev/null @@ -1,13 +0,0 @@ -// -*- C++ -*- -// -// $Id: SSL_Asynch_Stream.inl 83916 2008-11-28 16:32:21Z johnnyw $ - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE SSL * -ACE_SSL_Asynch_Stream::ssl (void) const -{ - return this->ssl_; -} - -ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/externals/ace/SSL/SSL_Context.cpp b/externals/ace/SSL/SSL_Context.cpp index c7915797c37..72f02e3dc70 100644 --- a/externals/ace/SSL/SSL_Context.cpp +++ b/externals/ace/SSL/SSL_Context.cpp @@ -28,7 +28,7 @@ ACE_RCSID (ACE_SSL, SSL_Context, - "$Id: SSL_Context.cpp 85202 2009-04-28 18:52:57Z johnnyw $") + "$Id: SSL_Context.cpp 82574 2008-08-08 19:35:06Z parsons $") namespace @@ -112,7 +112,6 @@ ACE_SSL_Context::ACE_SSL_Context (void) : context_ (0), mode_ (-1), default_verify_mode_ (SSL_VERIFY_NONE), - default_verify_callback_ (0), have_ca_ (0) { ACE_SSL_Context::ssl_library_init (); @@ -132,7 +131,7 @@ ACE_SSL_Context::~ACE_SSL_Context (void) ACE_SSL_Context * ACE_SSL_Context::instance (void) { - return ACE_Unmanaged_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX>::instance (); + return ACE_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX>::instance (); } void @@ -182,15 +181,15 @@ ACE_SSL_Context::ssl_library_init (void) (void) this->egd_file (egd_socket_file); #endif /* OPENSSL_VERSION_NUMBER */ - const char *rand_file = ACE_OS::getenv (ACE_SSL_RAND_FILE_ENV); + const char *rand_file = + ACE_OS::getenv (ACE_SSL_RAND_FILE_ENV); if (rand_file != 0) - { - (void) this->seed_file (rand_file); - } + (void) this->seed_file (rand_file); // Initialize the mutexes that will be used by the SSL and // crypto library. + } ++ssl_library_init_count; @@ -206,9 +205,6 @@ ACE_SSL_Context::ssl_library_fini (void) --ssl_library_init_count; if (ssl_library_init_count == 0) { - // Explicitly close the singleton - ACE_Unmanaged_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX>::close(); - ::ERR_free_strings (); ::EVP_cleanup (); @@ -236,11 +232,7 @@ ACE_SSL_Context::set_mode (int mode) if (this->context_ != 0) return -1; -#if OPENSSL_VERSION_NUMBER >= 0x10000002 - const SSL_METHOD *method = 0; -#else SSL_METHOD *method = 0; -#endif switch (mode) { @@ -313,20 +305,16 @@ ACE_SSL_Context::load_trusted_ca (const char* ca_file, { // Use the default environment settings. ca_file = ACE_OS::getenv (ACE_SSL_CERT_FILE_ENV); -#ifdef ACE_DEFAULT_SSL_CERT_FILE if (ca_file == 0) ca_file = ACE_DEFAULT_SSL_CERT_FILE; -#endif } if (ca_dir == 0 && use_env_defaults) { // Use the default environment settings. ca_dir = ACE_OS::getenv (ACE_SSL_CERT_DIR_ENV); -#ifdef ACE_DEFAULT_SSL_CERT_DIR if (ca_dir == 0) ca_dir = ACE_DEFAULT_SSL_CERT_DIR; -#endif } // NOTE: SSL_CTX_load_verify_locations() returns 0 on error. @@ -578,12 +566,7 @@ ACE_SSL_Context::report_error (unsigned long error_code) char error_string[256]; -// OpenSSL < 0.9.6a doesn't have ERR_error_string_n() function. -#if OPENSSL_VERSION_NUMBER >= 0x0090601fL - (void) ::ERR_error_string_n (error_code, error_string, sizeof error_string); -#else /* OPENSSL_VERSION_NUMBER >= 0x0090601fL */ (void) ::ERR_error_string (error_code, error_string); -#endif /* OPENSSL_VERSION_NUMBER >= 0x0090601fL */ ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_SSL (%P|%t) error code: %u - %C\n"), diff --git a/externals/ace/SSL/SSL_Context.h b/externals/ace/SSL/SSL_Context.h index 003d6042c5b..bc3cb329042 100644 --- a/externals/ace/SSL/SSL_Context.h +++ b/externals/ace/SSL/SSL_Context.h @@ -4,7 +4,7 @@ /** * @file SSL_Context.h * - * $Id: SSL_Context.h 83916 2008-11-28 16:32:21Z johnnyw $ + * $Id: SSL_Context.h 80826 2008-03-04 14:51:23Z wotte $ * * @author Carlos O'Ryan <coryan@ece.uci.edu> * @author Ossama Othman <ossama@dre.vanderbilt.edu> @@ -264,6 +264,7 @@ public: */ void set_verify_peer (int strict = 0, int once = 1, int depth = 0); + /// TODO: a implementation that will lookup the CTX table for the list /// of files and paths etc. /// Query the location of trusted certification authority @@ -280,14 +281,6 @@ public: int default_verify_mode (void) const; /** - * Set and query the default verify callback for this context, it is - * inherited by all the ACE_SSL objects created using the context. - * It can be overriden on a per-ACE_SSL object. - */ - void default_verify_callback (int (*callback) (int, X509_STORE_CTX *)); - int (*default_verify_callback(void) const) (int,X509_STORE_CTX *); - - /** * @name OpenSSL Random Number Generator Seed Related Methods * * These are methods that can be used to seed OpenSSL's @@ -361,7 +354,7 @@ private: /// Cache the mode so we can answer fast int mode_; - /// The private key, certificate, and Diffie-Hellman parameters files + /// The private key, certificate, and Diffie-Hellman paramters files ACE_SSL_Data_File private_key_; ACE_SSL_Data_File certificate_; ACE_SSL_Data_File dh_params_; @@ -369,9 +362,6 @@ private: /// The default verify mode. int default_verify_mode_; - /// The default verify callback. - int (*default_verify_callback_)(int, X509_STORE_CTX *); - /// count of successful CA load attempts int have_ca_; diff --git a/externals/ace/SSL/SSL_Context.inl b/externals/ace/SSL/SSL_Context.inl index 7ecb3e0627e..990eab38293 100644 --- a/externals/ace/SSL/SSL_Context.inl +++ b/externals/ace/SSL/SSL_Context.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: SSL_Context.inl 83916 2008-11-28 16:32:21Z johnnyw $ +// $Id: SSL_Context.inl 80826 2008-03-04 14:51:23Z wotte $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -40,8 +40,7 @@ ACE_SSL_Context::check_context (void) this->set_mode (); } - ::SSL_CTX_set_verify (this->context_, this->default_verify_mode (), - this->default_verify_callback ()); + ::SSL_CTX_set_verify (this->context_, this->default_verify_mode (), 0); } ACE_INLINE SSL_CTX * @@ -99,17 +98,6 @@ ACE_SSL_Context::default_verify_mode (void) const return this->default_verify_mode_; } -ACE_INLINE void -ACE_SSL_Context::default_verify_callback (int (*callback) (int, X509_STORE_CTX*)) -{ - this->default_verify_callback_ = callback; -} - -ACE_INLINE int (*ACE_SSL_Context::default_verify_callback(void) const)(int,X509_STORE_CTX *) -{ - return this->default_verify_callback_; -} - ACE_INLINE int ACE_SSL_Context::get_mode (void) const { diff --git a/externals/ace/SSL/SSL_Export.h b/externals/ace/SSL/SSL_Export.h index 9e0028a9d50..59bd892e7fd 100644 --- a/externals/ace/SSL/SSL_Export.h +++ b/externals/ace/SSL/SSL_Export.h @@ -6,6 +6,7 @@ // ------------------------------ #if !defined (ACE_SSL_EXPORT_H) #define ACE_SSL_EXPORT_H +#define ACE_SSL_BUILD_DLL #include /**/ "ace/config-all.h" diff --git a/externals/ace/SSL/SSL_SOCK_Acceptor.cpp b/externals/ace/SSL/SSL_SOCK_Acceptor.cpp index e94c988a392..2ee8aa419b6 100644 --- a/externals/ace/SSL/SSL_SOCK_Acceptor.cpp +++ b/externals/ace/SSL/SSL_SOCK_Acceptor.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: SSL_SOCK_Acceptor.cpp 82723 2008-09-16 09:35:44Z johnnyw $ +// $Id: SSL_SOCK_Acceptor.cpp 82577 2008-08-09 17:43:11Z mitza $ #include "SSL_SOCK_Acceptor.h" @@ -19,7 +19,7 @@ ACE_RCSID (ACE_SSL, SSL_SOCK_Acceptor, - "$Id: SSL_SOCK_Acceptor.cpp 82723 2008-09-16 09:35:44Z johnnyw $") + "$Id: SSL_SOCK_Acceptor.cpp 82577 2008-08-09 17:43:11Z mitza $") ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -176,8 +176,8 @@ int ACE_SSL_SOCK_Acceptor::accept (ACE_SSL_SOCK_Stream &new_stream, ACE_Addr *remote_addr, ACE_Time_Value *timeout, - bool restart, - bool reset_new_handle) const + int restart, + int 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, - bool restart, - bool reset_new_handle) const + int restart, + int reset_new_handle) const { ACE_TRACE ("ACE_SSL_SOCK_Acceptor::accept"); diff --git a/externals/ace/SSL/SSL_SOCK_Acceptor.h b/externals/ace/SSL/SSL_SOCK_Acceptor.h index 11f00651a73..997378bf329 100644 --- a/externals/ace/SSL/SSL_SOCK_Acceptor.h +++ b/externals/ace/SSL/SSL_SOCK_Acceptor.h @@ -4,7 +4,7 @@ /** * @file SSL_SOCK_Acceptor.h * - * $Id: SSL_SOCK_Acceptor.h 82723 2008-09-16 09:35:44Z johnnyw $ + * $Id: SSL_SOCK_Acceptor.h 81826 2008-06-02 15:29:53Z schmidt $ * * @author John Heitmann * @author Chris Zimman @@ -138,8 +138,8 @@ public: int accept (ACE_SSL_SOCK_Stream &new_stream, ACE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, - bool restart = true, - bool reset_new_handle = false) const; + int restart = 1, + int reset_new_handle = 0) 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, - bool restart = true, - bool reset_new_handle = false) const; + int restart = 1, + int reset_new_handle = 0) const; //@} /// Meta-type info diff --git a/externals/ace/SSL/SSL_SOCK_Acceptor.inl b/externals/ace/SSL/SSL_SOCK_Acceptor.inl index d0833a309fc..318d66d5c25 100644 --- a/externals/ace/SSL/SSL_SOCK_Acceptor.inl +++ b/externals/ace/SSL/SSL_SOCK_Acceptor.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: SSL_SOCK_Acceptor.inl 84619 2009-02-26 12:26:16Z johnnyw $ +// $Id: SSL_SOCK_Acceptor.inl 80826 2008-03-04 14:51:23Z wotte $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -76,7 +76,7 @@ ACE_SSL_SOCK_Acceptor::close (void) { ACE_TRACE ("ACE_SSL_SOCK_Acceptor::close ()"); - int const result = this->acceptor_.close (); + int result = this->acceptor_.close (); this->set_handle (ACE_INVALID_HANDLE); return result; diff --git a/externals/ace/SSL/SSL_SOCK_Connector.h b/externals/ace/SSL/SSL_SOCK_Connector.h index 2641bb6f703..f1708bf127d 100644 --- a/externals/ace/SSL/SSL_SOCK_Connector.h +++ b/externals/ace/SSL/SSL_SOCK_Connector.h @@ -4,7 +4,7 @@ /** * @file SSL_SOCK_Connector.h * - * $Id: SSL_SOCK_Connector.h 84816 2009-03-13 08:16:32Z johnnyw $ + * $Id: SSL_SOCK_Connector.h 80826 2008-03-04 14:51:23Z wotte $ * * @author Ossama Othman <ossama@uci.edu> * @author Carlos O'Ryan <coryan@uci.edu> @@ -86,7 +86,7 @@ public: * amount of time passes before the connection is made, * this method returns -1 and errno == ETIME. Note * the difference between this case and when a blocking - * connect is attempted that TCP times out - in the latter + * connect is attmpted that TCP times out - in the latter * case, errno will be ETIMEDOUT. * @param local_sap (optional) The local address to bind to. If it's * the default value of @c ACE_Addr::sap_any then the @@ -137,7 +137,7 @@ public: * amount of time passes before the connection is made, * this method returns -1 and errno == ETIME. Note * the difference between this case and when a blocking - * connect is attempted that TCP times out - in the latter + * connect is attmpted that TCP times out - in the latter * case, errno will be ETIMEDOUT. * @param local_sap (optional) The local address to bind to. If it's * the default value of @c ACE_Addr::sap_any then the @@ -191,7 +191,7 @@ public: * amount of time passes before the connection is made, * this method returns -1 and errno == ETIME. Note * the difference between this case and when a blocking - * connect is attempted that TCP times out - in the latter + * connect is attmpted that TCP times out - in the latter * case, errno will be ETIMEDOUT. * @param local_sap (optional) The local address to bind to. If it's * the default value of @c ACE_Addr::sap_any then the @@ -242,7 +242,7 @@ public: * amount of time passes before the connection is made, * this method returns -1 and errno == ETIME. Note * the difference between this case and when a blocking - * connect is attempted that TCP times out - in the latter + * connect is attmpted that TCP times out - in the latter * case, errno will be ETIMEDOUT. * @param local_sap (optional) The local address to bind to. If it's * the default value of @c ACE_Addr::sap_any then the @@ -279,7 +279,7 @@ public: const ACE_Time_Value *timeout = 0); /// Resets any event associations on this handle - bool reset_new_handle (ACE_HANDLE handle); + int reset_new_handle (ACE_HANDLE handle); /// Meta-type info //@{ diff --git a/externals/ace/SSL/SSL_SOCK_Connector.inl b/externals/ace/SSL/SSL_SOCK_Connector.inl index b2be51dd13a..58978966dcf 100644 --- a/externals/ace/SSL/SSL_SOCK_Connector.inl +++ b/externals/ace/SSL/SSL_SOCK_Connector.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: SSL_SOCK_Connector.inl 82728 2008-09-16 10:22:28Z johnnyw $ +// $Id: SSL_SOCK_Connector.inl 80826 2008-03-04 14:51:23Z wotte $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -11,7 +11,7 @@ ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector (void) ACE_TRACE ("ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector"); } -ACE_INLINE bool +ACE_INLINE int ACE_SSL_SOCK_Connector::reset_new_handle (ACE_HANDLE handle) { ACE_TRACE ("ACE_SSL_SOCK_Connector::reset_new_handle"); diff --git a/externals/ace/SSL/SSL_SOCK_Stream.h b/externals/ace/SSL/SSL_SOCK_Stream.h index 15c5297414b..be78b924299 100644 --- a/externals/ace/SSL/SSL_SOCK_Stream.h +++ b/externals/ace/SSL/SSL_SOCK_Stream.h @@ -4,7 +4,7 @@ /** * @file SSL_SOCK_Stream.h * - * $Id: SSL_SOCK_Stream.h 91103 2010-07-15 12:36:57Z mcorino $ + * $Id: SSL_SOCK_Stream.h 80826 2008-03-04 14:51:23Z wotte $ * * @author Ossama Othman <ossama@uci.edu> * @author Carlos O'Ryan <coryan@uci.edu> @@ -207,18 +207,6 @@ public: size_t *bytes_transferred = 0) const; /** - * Try to send exactly len bytes into buf (uses the send() call). - * If send() blocks for longer than timeout the number of bytes - * actually sent is returned with errno == ETIME. If a timeout does - * not occur, send_n() return len (i.e., the number of bytes - * requested to be sent). - */ - ssize_t send_n (const void *buf, - size_t len, - const ACE_Time_Value *timeout, - size_t *bytes_transferred = 0) const; - - /** * Try to receive exactly len bytes into buf (uses the recv() call). * The ACE_Time_Value indicates how long to blocking trying to * receive. If timeout == 0, the caller will block until action is @@ -233,21 +221,6 @@ public: int flags, const ACE_Time_Value *timeout, size_t *bytes_transferred = 0) const; - - /** - * Try to receive exactly len bytes into buf (uses the recv() call). - * The ACE_Time_Value indicates how long to blocking trying to - * receive. If timeout == 0, the caller will block until action is - * possible, else will wait until the relative time specified in - * timeout elapses). If recv() blocks for longer than timeout the - * number of bytes actually read is returned with errno == ETIME. - * If a timeout does not occur, recv_n return len (i.e., the number - * of bytes requested to be read). - */ - ssize_t recv_n (void *buf, - size_t len, - const ACE_Time_Value *timeout, - size_t *bytes_transferred = 0) const; //@} /** diff --git a/externals/ace/SSL/SSL_SOCK_Stream.inl b/externals/ace/SSL/SSL_SOCK_Stream.inl index 9f071cf4102..71661308f61 100644 --- a/externals/ace/SSL/SSL_SOCK_Stream.inl +++ b/externals/ace/SSL/SSL_SOCK_Stream.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: SSL_SOCK_Stream.inl 91103 2010-07-15 12:36:57Z mcorino $ +// $Id: SSL_SOCK_Stream.inl 82579 2008-08-10 23:03:06Z mitza $ #include "ace/OS_NS_errno.h" #include "ace/Truncate.h" @@ -252,32 +252,12 @@ ACE_SSL_SOCK_Stream::recv_n (void *buf, int buf_size) const } ACE_INLINE ssize_t -ACE_SSL_SOCK_Stream::recv_n (void *buf, - size_t len, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::recv_n"); - return this->recv_n (buf, len, 0, timeout, bytes_transferred); -} - -ACE_INLINE ssize_t ACE_SSL_SOCK_Stream::send_n (const void *buf, int len) const { ACE_TRACE ("ACE_SSL_SOCK_Stream::send_n"); return this->send_n (buf, len, 0); } -ACE_INLINE ssize_t -ACE_SSL_SOCK_Stream::send_n (const void *buf, - size_t len, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) const -{ - ACE_TRACE ("ACE_SSL_SOCK_Stream::send_n"); - return this->send_n (buf, len, 0, timeout, bytes_transferred); -} - ACE_INLINE int ACE_SSL_SOCK_Stream::close_reader (void) { diff --git a/externals/ace/SSL/sslconf.h b/externals/ace/SSL/sslconf.h index 4da812cbc7d..c4ba34797c4 100644 --- a/externals/ace/SSL/sslconf.h +++ b/externals/ace/SSL/sslconf.h @@ -4,7 +4,7 @@ /** * @file sslconf.h * - * $Id: sslconf.h 83879 2008-11-26 10:46:30Z smcqueen $ + * $Id: sslconf.h 80826 2008-03-04 14:51:23Z wotte $ * * @author Carlos O'Ryan <coryan@ece.uci.edu> */ @@ -19,21 +19,19 @@ #include /**/ "ace/config-all.h" #if !defined (ACE_DEFAULT_SSL_CERT_FILE) -// Define a default CA certificate filename here if required e.g.: -// # ifdef WIN32 -// # define ACE_DEFAULT_SSL_CERT_FILE "cert.pem" -// # else -// # define ACE_DEFAULT_SSL_CERT_FILE "/etc/ssl/cert.pem" -// # endif /* WIN32 */ +# ifdef WIN32 +# define ACE_DEFAULT_SSL_CERT_FILE "cert.pem" +# else +# define ACE_DEFAULT_SSL_CERT_FILE "/etc/ssl/cert.pem" +# endif /* WIN32 */ #endif /* ACE_DEFAULT_SSL_CERT_FILE */ #if !defined (ACE_DEFAULT_SSL_CERT_DIR) -// Define a default CA certificate files directory here if required. e.g.: -// # ifdef WIN32 -// # define ACE_DEFAULT_SSL_CERT_DIR "certs" -// # else -// # define ACE_DEFAULT_SSL_CERT_DIR "/etc/ssl/certs" -// # endif /* WIN32 */ +# ifdef WIN32 +# define ACE_DEFAULT_SSL_CERT_DIR "certs" +# else +# define ACE_DEFAULT_SSL_CERT_DIR "/etc/ssl/certs" +# endif /* WIN32 */ #endif /* ACE_DEFAULT_SSL_CERT_DIR */ #if !defined (ACE_SSL_CERT_FILE_ENV) diff --git a/externals/ace/SString.h b/externals/ace/SString.h index e7ff8ea7872..3efe80af203 100644 --- a/externals/ace/SString.h +++ b/externals/ace/SString.h @@ -4,7 +4,7 @@ /** * @file SString.h * - * $Id: SString.h 91058 2010-07-12 08:20:09Z johnnyw $ + * $Id: SString.h 86289 2009-07-30 03:40:46Z hillj $ * * @author Douglas C. Schmidt (schmidt@cs.wustl.edu) */ @@ -145,7 +145,7 @@ public: /// Constructor that copies @a s into dynamically allocated memory. ACE_SString (const char *s, ACE_Allocator *alloc = 0); - /// Constructor that copies @a len chars of @a s into dynamically + /// Constructor that copies @a len chars of @s into dynamically /// allocated memory (will NUL terminate the result). ACE_SString (const char *s, size_type len, ACE_Allocator *alloc = 0); @@ -195,7 +195,7 @@ public: /// Get the underlying pointer. const char *fast_rep (void) const; - /// Same as STL String's c_str() and fast_rep(). + /// Same as STL String's <c_str> and <fast_rep>. const char *c_str (void) const; /// Comparison operator that will match substrings. Returns the @@ -230,7 +230,7 @@ public: /// Inequality comparison operator. bool operator != (const ACE_SString &s) const; - /// Performs a strcmp()-style comparison. + /// Performs a <strcmp>-style comparison. int compare (const ACE_SString &s) const; /// Dump the state of an object. @@ -243,7 +243,7 @@ private: /// Pointer to a memory allocator. ACE_Allocator *allocator_; - /// Length of the ACE_SString (not counting the trailing '\\0'). + /// Length of the ACE_SString (not counting the trailing '\0'). size_type len_; /// Pointer to data. diff --git a/externals/ace/Select_Reactor_Base.cpp b/externals/ace/Select_Reactor_Base.cpp index 5ffb8a53247..225c9f7f9f1 100644 --- a/externals/ace/Select_Reactor_Base.cpp +++ b/externals/ace/Select_Reactor_Base.cpp @@ -1,4 +1,4 @@ -// $Id: Select_Reactor_Base.cpp 90989 2010-07-05 11:22:50Z johnnyw $ +// $Id: Select_Reactor_Base.cpp 88832 2010-02-04 09:57:42Z johnnyw $ #include "ace/Select_Reactor_Base.h" #include "ace/Reactor.h" @@ -20,7 +20,7 @@ ACE_RCSID (ace, Select_Reactor_Base, - "$Id: Select_Reactor_Base.cpp 90989 2010-07-05 11:22:50Z johnnyw $") + "$Id: Select_Reactor_Base.cpp 88832 2010-02-04 09:57:42Z johnnyw $") ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -83,7 +83,7 @@ ACE_Select_Reactor_Handler_Repository::handle_in_range (ACE_HANDLE handle) } int -ACE_Select_Reactor_Handler_Repository::open (size_type size) +ACE_Select_Reactor_Handler_Repository::open (size_t size) { ACE_TRACE ("ACE_Select_Reactor_Handler_Repository::open"); diff --git a/externals/ace/Service_Gestalt.cpp b/externals/ace/Service_Gestalt.cpp index 47ea3d1e81b..8b3f8b8ed3c 100644 --- a/externals/ace/Service_Gestalt.cpp +++ b/externals/ace/Service_Gestalt.cpp @@ -1,4 +1,4 @@ -// $Id: Service_Gestalt.cpp 91158 2010-07-21 15:54:12Z mesnier_p $ +// $Id: Service_Gestalt.cpp 89501 2010-03-17 08:59:56Z vzykov $ #include "ace/Svc_Conf.h" #include "ace/Get_Opt.h" @@ -31,7 +31,7 @@ ACE_RCSID (ace, Service_Gestalt, - "$Id: Service_Gestalt.cpp 91158 2010-07-21 15:54:12Z mesnier_p $") + "$Id: Service_Gestalt.cpp 89501 2010-03-17 08:59:56Z vzykov $") ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -259,6 +259,32 @@ ACE_Service_Gestalt::init_i (void) if (init_svc_conf_file_queue () == -1) return -1; + if ( svc_conf_file_queue_->is_empty ()) + { + // Check if the default file exists before attempting to queue it + // for processing + FILE *fp = ACE_OS::fopen (ACE_DEFAULT_SVC_CONF, + ACE_TEXT ("r")); + bool skip_static_svcs = (fp == 0); + if (fp != 0) + ACE_OS::fclose (fp); + + if (!skip_static_svcs) { + // Load the default "svc.conf" entry here if there weren't + // overriding -f arguments in <parse_args>. + if (svc_conf_file_queue_->enqueue_tail + (ACE_TString (ACE_DEFAULT_SVC_CONF)) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("%p\n"), + ACE_TEXT ("enqueuing ") + ACE_DEFAULT_SVC_CONF + ACE_TEXT(" file")), + -1); + } + } + } + return 0; } @@ -1060,62 +1086,19 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR program_name[], ACE_Log_Msg::disable_debug_messages (); } - if (!ignore_default_svc_conf_file) - { - bool add_default = true; - bool has_files = this->svc_conf_file_queue_ && - !this->svc_conf_file_queue_->is_empty (); - bool has_cmdline = this->svc_queue_ && !this->svc_queue_->is_empty (); - if (has_files || has_cmdline) - { - // check if default file is already listed - ACE_TString *sptr = 0; - ACE_TString default_svc_conf (ACE_DEFAULT_SVC_CONF); - - for (ACE_SVC_QUEUE_ITERATOR iter (*this->svc_conf_file_queue_); - iter.next (sptr) != 0 && add_default; - iter.advance ()) - { - add_default = (*sptr != default_svc_conf); - } - - if (add_default) - { - FILE *fp = ACE_OS::fopen (ACE_DEFAULT_SVC_CONF, ACE_TEXT ("r")); - if (fp != 0) - ACE_OS::fclose(fp); - else - add_default = false; - - } - } - - // Load the default "svc.conf" entry. here if there weren't - // overriding -f arguments in <parse_args>. - if (add_default && svc_conf_file_queue_->enqueue_head - (ACE_TString (ACE_DEFAULT_SVC_CONF)) == -1) - { - errno = ENOENT; - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("enqueuing ") - ACE_DEFAULT_SVC_CONF - ACE_TEXT(" file")), - -1); - } - } - // See if we need to load the static services. if (this->no_static_svcs_ == 0 && this->load_static_svcs () == -1) result = -1; else { - result = this->process_directives (); - if (result != -1 || errno == ENOENT) + if (this->process_directives (ignore_default_svc_conf_file) == -1) + result = -1; + else result = this->process_commandline_directives (); } + // Reset debugging back to the way it was when we came into // into <open_i>. { @@ -1247,16 +1230,17 @@ ACE_Service_Gestalt::parse_args_i (int argc, // Process service configuration directives from the files queued for // processing int -ACE_Service_Gestalt::process_directives (bool ) +ACE_Service_Gestalt::process_directives (bool ignore_default_svc_conf_file) { ACE_TRACE ("ACE_Service_Gestalt::process_directives"); + if (this->svc_conf_file_queue_ == 0 - || this->svc_conf_file_queue_->is_empty ()) - { - return 0; - } + || this->svc_conf_file_queue_->is_empty ()) + return 0; ACE_TString *sptr = 0; + ACE_TString default_svc_conf (ACE_DEFAULT_SVC_CONF); + int failed = 0; // Iterate through all the svc.conf files. @@ -1264,6 +1248,9 @@ ACE_Service_Gestalt::process_directives (bool ) iter.next (sptr) != 0; iter.advance ()) { + if (*sptr == default_svc_conf && ignore_default_svc_conf_file) + continue; + int result = this->process_file (sptr->fast_rep ()); if (result < 0) return result; diff --git a/externals/ace/Service_Gestalt.h b/externals/ace/Service_Gestalt.h index 68a2ce7e7cc..a4bbbcbcda9 100644 --- a/externals/ace/Service_Gestalt.h +++ b/externals/ace/Service_Gestalt.h @@ -4,7 +4,7 @@ /** * @file Service_Gestalt.h * - * $Id: Service_Gestalt.h 91158 2010-07-21 15:54:12Z mesnier_p $ + * $Id: Service_Gestalt.h 89501 2010-03-17 08:59:56Z vzykov $ * * @author Iliyan Jeliazkov <iliyan@ociweb.com> */ @@ -154,19 +154,11 @@ public: * specifies service directives without the need for a configuration * file. Can be specified multiple times. * - * Note: Options '-f' and '-S' complement each other. Directives - * from files and from '-S' option are processed together in the - * following order. First, the default file "./svc.conf" is - * evaluated if not ignored, then all files are processed in the - * order they are specified in '-f' @a argv parameter. Finally, all - * '-S' directive strings are executed in the order the directives - * appear in @a argv parameter. - * - * If no files or directives are added via the '-f' and '-S' - * arguments, and the default file is not ignored, it will be - * evaluated whether it exists or not, possibly causing a failure - * return. If any other directives are added then the default file - * will be evaluated only if it exists. + * Note: Options '-f' and '-S' complement each other. Directives from files + * and from '-S' option are processed together in the following order. First, + * all files are processed in the order they are specified in @a argv + * parameter. Second, all directive strings are executed in the order the + * directives appear in @a argv parameter. * * @param argc The number of commandline arguments. * @param argv The array with commandline arguments @@ -175,16 +167,16 @@ public: * socket address. * @param ignore_static_svcs If true then static services are not loaded, * otherwise, they are loaded. - * @param ignore_default_svc_conf_file If false then the @c ./svc.conf + * @param ignore_default_svc_conf_file If false then the @c svc.conf * configuration file will be ignored. * @param ignore_debug_flag If false then the application is responsible * for setting the @c ACE_Log_Msg::priority_mask * appropriately. * - * @retval -1 A configuration file is not found or cannot + * @retval -1 The configuration file is not found or cannot * be opened (errno is set accordingly). * @retval 0 Success. - * @retval >0 The number of directive errors encountered while processing + * @retval >0 The number of errors encountered while processing * the service configuration file(s). */ int open (int argc, @@ -260,7 +252,7 @@ public: * provided in the svc.conf file(s). Returns the number of errors * that occurred. */ - int process_directives (bool defunct_option = false); + int process_directives (bool ignore_default_svc_conf_file); /// Tidy up and perform last rites when ACE_Service_Config is shut /// down. This method calls @c close_svcs. Returns 0. @@ -343,13 +335,13 @@ protected: bool& ignore_default_svc_conf_file); /** - * Performs an open without parsing command-line arguments. The @a - * logger_key indicates where to write the logging output, which is - * typically either a STREAM pipe or a socket address. If @a - * ignore_default_svc_conf_file is non-0 then the "svc.conf" file - * will not be added by default. If @a ignore_debug_flag is non-0 - * then the application is responsible for setting the @c - * ACE_Log_Msg::priority_mask() appropriately. Returns number of + * Performs an open without parsing command-line arguments. The + * @a logger_key indicates where to write the logging output, which + * is typically either a STREAM pipe or a socket address. If + * @a ignore_default_svc_conf_file is non-0 then the "svc.conf" file + * will be ignored. If @a ignore_debug_flag is non-0 then the + * application is responsible for setting the + * @c ACE_Log_Msg::priority_mask() appropriately. Returns number of * errors that occurred on failure and 0 otherwise. */ int open_i (const ACE_TCHAR program_name[], diff --git a/externals/ace/Service_Gestalt.inl b/externals/ace/Service_Gestalt.inl index 436037b71a1..696dbf18d96 100644 --- a/externals/ace/Service_Gestalt.inl +++ b/externals/ace/Service_Gestalt.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Service_Gestalt.inl 91158 2010-07-21 15:54:12Z mesnier_p $ +// $Id: Service_Gestalt.inl 83780 2008-11-17 08:37:37Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -36,8 +36,6 @@ ACE_Service_Gestalt::open (int argc, { ACE_TRACE ("ACE_Service_Gestalt::open"); - // Parsing argv may change no_static_svcs_ so set the default here, then - // parse, then pass the final value to open_i(). this->no_static_svcs_ = ignore_static_svcs; if (this->parse_args_i (argc, @@ -47,7 +45,7 @@ ACE_Service_Gestalt::open (int argc, return this->open_i (argv == 0 ? 0 : argv[0], logger_key, - this->no_static_svcs_, + ignore_static_svcs, ignore_default_svc_conf, ignore_debug_flag); } diff --git a/externals/ace/Service_Repository.h b/externals/ace/Service_Repository.h index 9d03b113381..efd80bc78dc 100644 --- a/externals/ace/Service_Repository.h +++ b/externals/ace/Service_Repository.h @@ -4,7 +4,7 @@ /** * @file Service_Repository.h * - * $Id: Service_Repository.h 91016 2010-07-06 11:29:50Z johnnyw $ + * $Id: Service_Repository.h 85007 2009-04-01 14:11:03Z johnnyw $ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ @@ -96,11 +96,11 @@ public: * Locate a named entry in the service table, optionally ignoring * suspended entries. * - * @param name The name of the service to search for. - * @param srp Optional; if not 0, it is a pointer to a location - * to receive the ACE_Service_Type pointer for the - * located service. Meaningless if this method - * returns -1. + * @param service_name The name of the service to search for. + * @param srp Optional; if not 0, it is a pointer to a location + * to receive the ACE_Service_Type pointer for the + * located service. Meaningless if this method + * returns -1. * @param ignore_suspended If true, the search ignores suspended services. * * @retval 0 Named service was located. diff --git a/externals/ace/Sock_Connect.cpp b/externals/ace/Sock_Connect.cpp index dc4362e697e..217d83c9381 100644 --- a/externals/ace/Sock_Connect.cpp +++ b/externals/ace/Sock_Connect.cpp @@ -1,4 +1,4 @@ -// $Id: Sock_Connect.cpp 90399 2010-06-03 21:35:20Z mesnier_p $ +// $Id: Sock_Connect.cpp 87160 2009-10-19 14:01:10Z olli $ #include "ace/Sock_Connect.h" #include "ace/INET_Addr.h" @@ -60,6 +60,9 @@ const struct in6_addr in6addr_linklocal_allrouters = IN6ADDR_LINKLOCAL_ALLROUTER #if defined (ACE_HAS_WINCE) #include /**/ <iphlpapi.h> # if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && (_WIN32_WCE < 0x600) && defined (ACE_HAS_IPV6) +// The following code is suggested by microsoft as a workaround to the fact +// that on Windows CE, these constants are exported as function addresses +// rather than simply values. # include /**/ <ws2tcpip.h> const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT; const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; @@ -159,7 +162,7 @@ static ACE_Auto_Array_Ptr<sockaddr> force_compiler_to_include_socket_h; ACE_RCSID (ace, Sock_Connect, - "$Id: Sock_Connect.cpp 90399 2010-06-03 21:35:20Z mesnier_p $") + "$Id: Sock_Connect.cpp 87160 2009-10-19 14:01:10Z olli $") ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/externals/ace/Stream.h b/externals/ace/Stream.h index 9172485c132..dbf496a6ee6 100644 --- a/externals/ace/Stream.h +++ b/externals/ace/Stream.h @@ -4,7 +4,7 @@ /** * @file Stream.h * - * $Id: Stream.h 91058 2010-07-12 08:20:09Z johnnyw $ + * $Id: Stream.h 84477 2009-02-16 13:30:38Z johnnyw $ * * @author Douglas C. Schmidt <schmidt@uci.edu> */ @@ -37,8 +37,8 @@ class ACE_Time_Value; * @brief This class is the primary abstraction for the ASX framework. * It is moduled after System V Stream. * - * A Stream consists of a stack of @c ACE_Modules, each of which - * contains two @c ACE_Tasks. Even though the methods in this + * A Stream consists of a stack of <ACE_Modules>, each of which + * contains two <ACE_Tasks>. Even though the methods in this * class are virtual, this class isn't really intended for * subclassing unless you know what you are doing. In * particular, the ACE_Stream destructor calls <close>, which @@ -53,7 +53,7 @@ public: enum { - /// Indicates that @c close() deletes the Tasks. Don't change this + /// Indicates that <close> deletes the Tasks. Don't change this /// value without updating the same enum in class ACE_Module... M_DELETE = 3 }; @@ -88,7 +88,7 @@ public: // = ACE_Stream plumbing operations /// Add a new module @a mod right below the Stream head. The - /// @c open() hook methods of the @c ACE_Tasks in this ACE_Module + /// <open()> hook methods of the <ACE_Tasks> in this ACE_Module /// are invoked to initialize the tasks. virtual int push (ACE_Module<ACE_SYNCH_USE> *mod); @@ -101,7 +101,7 @@ public: /// head). virtual int top (ACE_Module<ACE_SYNCH_USE> *&mod); - /// Insert a new module @a mod below the named module @a prev_name. + /// Insert a new module @a mod below the named module <prev_name>. virtual int insert (const ACE_TCHAR *prev_name, ACE_Module<ACE_SYNCH_USE> *mod); @@ -111,7 +111,7 @@ public: int flags = M_DELETE); /// Remove the named module @a mod from the stream. This bypasses the - /// strict LIFO ordering of @c push and @c pop. + /// strict LIFO ordering of <push> and <pop>. virtual int remove (const ACE_TCHAR *mod, int flags = M_DELETE); @@ -218,7 +218,7 @@ public: int advance (void); private: - /// Next ACE_Module that we haven't yet seen. + /// Next <Module> that we haven't yet seen. ACE_Module<ACE_SYNCH_USE> *next_; }; diff --git a/externals/ace/Svc_Conf.y b/externals/ace/Svc_Conf.y deleted file mode 100644 index cc46e2d2bb3..00000000000 --- a/externals/ace/Svc_Conf.y +++ /dev/null @@ -1,376 +0,0 @@ -%{ -// $Id: Svc_Conf.y 82136 2008-06-23 15:28:40Z sma $ - -#include "ace/Svc_Conf.h" - -#if (ACE_USES_CLASSIC_SVC_CONF == 1) - -#include "ace/Module.h" -#include "ace/Stream.h" -#include "ace/Service_Types.h" -#include "ace/ace_wchar.h" - -ACE_RCSID (ace, - Svc_Conf_y, - "$Id: Svc_Conf.y 82136 2008-06-23 15:28:40Z sma $") - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -// Prototypes. - -static ACE_Module_Type * - ace_get_module (ACE_Service_Type const * sr, - ACE_TCHAR const * svc_name, - int & ace_yyerrno); - -#define YYDEBUG_LEXER_TEXT (yytext[yyleng] = '\0', yytext) - -// Force the pretty debugging code to compile. -// #define YYDEBUG 1 - -// Bison 2.3 template contains switch statement with a "default:", but -// without a "case:" label. Suppressing a compiler warning for Visual -// C++. -#if defined (_MSC_VER) -# pragma warning ( disable : 4065 ) -#endif - -// Normalize the message literal's type to match yyerror() prototype -#define YY_ ACE_TEXT - -// Prevent yacc(1) from declaring a trivial YYSTYPE just because -// YYSTYPE is not a macro definition. On the other hand we want -// YYSTYPE_IS_DECLARED to be as localized as possible to avoid -// poluting the global namespace - there may be other yacc(1) parsers -// that want to play nice with ACE -#define YYSTYPE_IS_DECLARED - -ACE_END_VERSIONED_NAMESPACE_DECL - -%} - -%token ACE_DYNAMIC ACE_STATIC ACE_SUSPEND ACE_RESUME ACE_REMOVE ACE_USTREAM -%token ACE_MODULE_T ACE_STREAM_T ACE_SVC_OBJ_T ACE_ACTIVE ACE_INACTIVE -%token ACE_PATHNAME ACE_IDENT ACE_STRING - -%start svc_config_entries - -%type <ident_> ACE_IDENT ACE_STRING ACE_PATHNAME pathname parameters_opt -%type <type_> type status -%type <parse_node_> dynamic static suspend resume remove module_list stream -%type <parse_node_> stream_modules module svc_config_entry -%type <static_node_> stream_ops -%type <svc_record_> svc_location -%type <location_node_> svc_initializer - -// Generate a pure (reentrant) parser -- GNU Bison only -%pure_parser - -%% - -svc_config_entries - : svc_config_entries svc_config_entry - { - if ($2 != 0) - { - $2->apply (ACE_SVC_CONF_PARAM->config, ACE_SVC_CONF_PARAM->yyerrno); - delete $2; - } - ACE_SVC_CONF_PARAM->obstack.release (); - } - | svc_config_entries error - { - ACE_SVC_CONF_PARAM->obstack.release (); - } - | /* EMPTY */ - ; - -svc_config_entry - : dynamic - | static - | suspend - | resume - | remove - | stream - ; - -dynamic - : ACE_DYNAMIC svc_location parameters_opt - { - if ($2 != 0) - $$ = new ACE_Dynamic_Node ($2, $3); - else - $$ = 0; - } - ; - -static - : ACE_STATIC ACE_IDENT parameters_opt - { - $$ = new ACE_Static_Node ($2, $3); - } - ; - -suspend - : ACE_SUSPEND ACE_IDENT - { - $$ = new ACE_Suspend_Node ($2); - } - ; - -resume - : ACE_RESUME ACE_IDENT - { - $$ = new ACE_Resume_Node ($2); - } - ; - -remove - : ACE_REMOVE ACE_IDENT - { - $$ = new ACE_Remove_Node ($2); - } - ; - -stream - : ACE_USTREAM stream_ops stream_modules - { - $$ = new ACE_Stream_Node ($2, $3); - } - | ACE_USTREAM ACE_IDENT { $<static_node_>$ = new ACE_Static_Node ($2); } stream_modules - { - $$ = new ACE_Dummy_Node ($<static_node_>3, $4); - } - ; - -stream_ops - : dynamic - { - } - | static - { - } - ; - -stream_modules - : '{' - { - // Initialize left context... - $<static_node_>$ = $<static_node_>0; - } - module_list '}' - { - ACE_UNUSED_ARG ($2); - $$ = $3; - } - | /* EMPTY */ { $$ = 0; } - ; - -module_list - : module_list module - { - if ($2 != 0) - { - $2->link ($1); - $$ = $2; - } - } - | /* EMPTY */ { $$ = 0; } - ; - -module - : dynamic - { - } - | static - { - ACE_Static_Node *sn = $<static_node_>-1; - ACE_Module_Type *mt = ace_get_module (sn->record (ACE_SVC_CONF_PARAM->config), - $<static_node_>1->name (), - ACE_SVC_CONF_PARAM->yyerrno); - - if (((ACE_Stream_Type *) sn->record (ACE_SVC_CONF_PARAM->config)->type ())->push (mt) == -1) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Problem with static\n"))); - ACE_SVC_CONF_PARAM->yyerrno++; - } - } - | suspend - { - ACE_Static_Node *sn = $<static_node_>-1; - ACE_Module_Type *mt = ace_get_module (sn->record (ACE_SVC_CONF_PARAM->config), - sn->name (), - ACE_SVC_CONF_PARAM->yyerrno); - if (mt != 0) - mt->suspend (); - } - | resume - { - ACE_Static_Node *sn = $<static_node_>-1; - ACE_Module_Type *mt = ace_get_module (sn->record (ACE_SVC_CONF_PARAM->config), - $<static_node_>1->name (), - ACE_SVC_CONF_PARAM->yyerrno); - if (mt != 0) - mt->resume (); - } - | remove - { - ACE_Static_Node *stream = $<static_node_>-1; - ACE_Static_Node *module = $<static_node_>1; - ACE_Module_Type *mt = ace_get_module (stream->record (ACE_SVC_CONF_PARAM->config), - module->name (), - ACE_SVC_CONF_PARAM->yyerrno); - - ACE_Stream_Type *st = - dynamic_cast<ACE_Stream_Type *> (const_cast<ACE_Service_Type_Impl *> (stream->record (ACE_SVC_CONF_PARAM->config)->type ())); - if (!st || (mt != 0 && st->remove (mt) == -1)) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("cannot remove Module_Type %s from STREAM_Type %s\n"), - module->name (), - stream->name ())); - ACE_SVC_CONF_PARAM->yyerrno++; - } - } - ; - -svc_location - : ACE_IDENT type svc_initializer status - { - $$ = new ACE_Service_Type_Factory ($1, $2, $3, $4); - } - ; - -status - : ACE_ACTIVE - { - $$ = 1; - } - | ACE_INACTIVE - { - $$ = 0; - } - | /* EMPTY */ - { - $$ = 1; - } - ; - -svc_initializer - : pathname ':' ACE_IDENT - { - $$ = new ACE_Object_Node ($1, $3); - } - | pathname ':' ACE_IDENT '(' ')' - { - $$ = new ACE_Function_Node ($1, $3); - } - | ':' ACE_IDENT '(' ')' - { - $$ = new ACE_Static_Function_Node ($2); - } - ; - -type - : ACE_MODULE_T '*' - { - $$ = ACE_MODULE_T; - } - | ACE_SVC_OBJ_T '*' - { - $$ = ACE_SVC_OBJ_T; - } - | ACE_STREAM_T '*' - { - $$ = ACE_STREAM_T; - } - ; - -parameters_opt - : ACE_STRING - | /* EMPTY */ { $$ = 0; } - ; - -pathname - : ACE_PATHNAME - | ACE_IDENT - | ACE_STRING - ; - -%% - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -// Prints the error string to standard output. Cleans up the error -// messages. - -void -yyerror (int yyerrno, int yylineno, ACE_TCHAR const * s) -{ -#if defined (ACE_NLOGGING) - ACE_UNUSED_ARG (yyerrno); - ACE_UNUSED_ARG (yylineno); - ACE_UNUSED_ARG (s); -#endif /* ACE_NLOGGING */ - - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE (%P|%t) [error %d] on line %d: %C\n"), - yyerrno, - yylineno, - s)); -} - -void -yyerror (ACE_TCHAR const * s) -{ - yyerror (-1, -1, s); -} - -// Note that SRC_REC represents left context, which is the STREAM * -// record. - -static ACE_Module_Type * -ace_get_module (ACE_Service_Type const * sr, - ACE_TCHAR const * svc_name, - int & yyerrno) -{ - ACE_Service_Type_Impl const * const type = sr->type (); - ACE_Stream_Type const * const st = - (sr == 0 - ? 0 - : dynamic_cast<ACE_Stream_Type const *> (type)); - ACE_Module_Type const * const mt = (st == 0 ? 0 : st->find (svc_name)); - - if (sr == 0 || st == 0 || mt == 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("cannot locate Module_Type %s ") - ACE_TEXT ("in STREAM_Type %s\n"), - svc_name, - (sr ? sr->name () : ACE_TEXT ("(nil)")))); - ++yyerrno; - } - - return const_cast<ACE_Module_Type *> (mt); -} - -#if defined (SVC_CONF_Y_DEBUGGING) -// Main driver program. - -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - ACE_Svc_Conf_Param param (0, stdin); - - // Try to reopen any filename argument to use YYIN. - if (argc > 1 && (yyin = freopen (argv[1], "r", stdin)) == 0) - (void) ACE_OS::fprintf (stderr, ACE_TEXT ("usage: %s [file]\n"), argv[0]), ACE_OS::exit (1); - - return ::yyparse (¶m); -} -#endif /* SVC_CONF_Y_DEBUGGING */ - -ACE_END_VERSIONED_NAMESPACE_DECL - -#endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */ diff --git a/externals/ace/TSS_T.cpp b/externals/ace/TSS_T.cpp index 79603f8467c..f539de48977 100644 --- a/externals/ace/TSS_T.cpp +++ b/externals/ace/TSS_T.cpp @@ -1,4 +1,4 @@ -// $Id: TSS_T.cpp 91136 2010-07-20 08:56:37Z vzykov $ +// $Id: TSS_T.cpp 84282 2009-01-30 15:04:29Z msmit $ #ifndef ACE_TSS_T_CPP #define ACE_TSS_T_CPP @@ -26,28 +26,12 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_TSS) -#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) -# if defined (ACE_HAS_THR_C_DEST) -extern "C" void ACE_TSS_C_cleanup (void *); // defined in Synch.cpp -# endif /* ACE_HAS_THR_C_DEST */ -#endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) */ - template <class TYPE> ACE_TSS<TYPE>::~ACE_TSS (void) { #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) if (this->once_) { -# if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *tss_adapter = this->ts_value (); - this->ts_value (0); - ACE_TSS_C_cleanup (tss_adapter); -# else - TYPE *ts_obj = this->ts_value (); - this->ts_value (0); - ACE_TSS<TYPE>::cleanup (ts_obj); -# endif /* ACE_HAS_THR_C_DEST */ - ACE_OS::thr_key_detach (this->key_, this); ACE_OS::thr_keyfree (this->key_); } @@ -95,6 +79,9 @@ ACE_TSS<TYPE>::dump (void) const } #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) +#if defined (ACE_HAS_THR_C_DEST) +extern "C" void ACE_TSS_C_cleanup (void *); // defined in Synch.cpp +#endif /* ACE_HAS_THR_C_DEST */ template <class TYPE> void ACE_TSS<TYPE>::cleanup (void *ptr) @@ -171,12 +158,20 @@ ACE_TSS<TYPE>::ACE_TSS (TYPE *ts_obj) ACE_TSS<TYPE>::cleanup)); // Put the adapter in thread specific storage - if (this->ts_value (tss_adapter) == -1) + if (ACE_Thread::setspecific (this->key_, + (void *) tss_adapter) != 0) { delete tss_adapter; + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Thread::setspecific() failed!"))); } #else - this->ts_value (ts_obj); + if (ACE_Thread::setspecific (this->key_, + (void *) ts_obj) != 0) + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Thread::setspecific() failed!"))); #endif /* ACE_HAS_THR_C_DEST */ } } @@ -195,21 +190,23 @@ ACE_TSS<TYPE>::ts_get (void) const TYPE *ts_obj = 0; #if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *tss_adapter = this->ts_value (); - ACE_TSS_Adapter *fake_tss_adapter = 0; + ACE_TSS_Adapter *tss_adapter = 0; - // If tss_adapter is not 0 but its ts_obj_ is 0 then we still need to create - // a proper ts_obj. That's the intent of this member function. - if (tss_adapter != 0 && tss_adapter->ts_obj_ == 0) - { - fake_tss_adapter = tss_adapter; - tss_adapter = 0; - } + // Get the adapter from thread-specific storage + void *temp = tss_adapter; // Need this temp to keep G++ from complaining. + if (ACE_Thread::getspecific (this->key_, &temp) == -1) + return 0; // This should not happen! + tss_adapter = static_cast <ACE_TSS_Adapter *> (temp); // Check to see if this is the first time in for this thread. if (tss_adapter == 0) #else - ts_obj = this->ts_value (); + // Get the ts_obj from thread-specific storage. Note that no locks + // are required here... + void *temp = ts_obj; // Need this temp to keep G++ from complaining. + if (ACE_Thread::getspecific (this->key_, &temp) == -1) + return 0; // This should not happen! + ts_obj = static_cast <TYPE *> (temp); // Check to see if this is the first time in for this thread. if (ts_obj == 0) @@ -231,7 +228,8 @@ ACE_TSS<TYPE>::ts_get (void) const ACE_TSS<TYPE>::cleanup), 0); // Put the adapter in thread specific storage - if (this->ts_value (tss_adapter) == -1) + if (ACE_Thread::setspecific (this->key_, + (void *) tss_adapter) != 0) { delete tss_adapter; delete ts_obj; @@ -240,7 +238,8 @@ ACE_TSS<TYPE>::ts_get (void) const #else // Store the dynamically allocated pointer in thread-specific // storage. - if (this->ts_value (ts_obj) == -1) + if (ACE_Thread::setspecific (this->key_, + (void *) ts_obj) != 0) { delete ts_obj; return 0; // Major problems, this should *never* happen! @@ -249,8 +248,6 @@ ACE_TSS<TYPE>::ts_get (void) const } #if defined (ACE_HAS_THR_C_DEST) - // Delete the adapter that didn't actually have a real ts_obj. - delete fake_tss_adapter; // Return the underlying ts object. return static_cast <TYPE *> (tss_adapter->ts_obj_); #else @@ -271,15 +268,28 @@ ACE_TSS<TYPE>::ts_object (void) const TYPE *ts_obj = 0; #if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *tss_adapter = this->ts_value (); + ACE_TSS_Adapter *tss_adapter = 0; - if (tss_adapter != 0) + // Get the tss adapter from thread-specific storage + void *temp = tss_adapter; // Need this temp to keep G++ from complaining. + if (ACE_Thread::getspecific (this->key_, &temp) == -1) { - // Extract the real TS object. - ts_obj = static_cast <TYPE *> (tss_adapter->ts_obj_); + return 0; // This should not happen! + } + else + { + tss_adapter = static_cast <ACE_TSS_Adapter *> (temp); + { + if (tss_adapter != 0) + // Extract the real TS object. + ts_obj = static_cast <TYPE *> (tss_adapter->ts_obj_); + } } #else - ts_obj = this->ts_value (); + void *temp = ts_obj; // Need this temp to keep G++ from complaining. + if (ACE_Thread::getspecific (this->key_, &temp) == -1) + return 0; // This should not happen! + ts_obj = static_cast <TYPE *> (temp); #endif /* ACE_HAS_THR_C_DEST */ return ts_obj; @@ -301,33 +311,37 @@ ACE_TSS<TYPE>::ts_object (TYPE *new_ts_obj) TYPE *ts_obj = 0; #if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *tss_adapter = this->ts_value (); + ACE_TSS_Adapter *tss_adapter = 0; + + void *temp = tss_adapter; // Need this temp to keep G++ from complaining. + if (ACE_Thread::getspecific (this->key_, &temp) == -1) + return 0; // This should not happen! + tss_adapter = static_cast <ACE_TSS_Adapter *> (temp); if (tss_adapter != 0) { ts_obj = static_cast <TYPE *> (tss_adapter->ts_obj_); - // Don't delete tss_adapter yet. It can be double-deleted - // in case setspecific below fails. + delete tss_adapter; // don't need this anymore } - ACE_TSS_Adapter *new_tss_adapter = 0; - ACE_NEW_RETURN (new_tss_adapter, + ACE_NEW_RETURN (tss_adapter, ACE_TSS_Adapter ((void *) new_ts_obj, ACE_TSS<TYPE>::cleanup), 0); - if (this->ts_value (new_tss_adapter) == -1) - { - delete new_tss_adapter; - } - else + if (ACE_Thread::setspecific (this->key_, + (void *) tss_adapter) == -1) { - // Now it's fine to delete the old tss_adapter. delete tss_adapter; + return ts_obj; // This should not happen! } #else - ts_obj = this->ts_value (); - this->ts_value (new_ts_obj); + void *temp = ts_obj; // Need this temp to keep G++ from complaining. + if (ACE_Thread::getspecific (this->key_, &temp) == -1) + return 0; // This should not happen! + ts_obj = static_cast <TYPE *> (temp); + if (ACE_Thread::setspecific (this->key_, (void *) new_ts_obj) == -1) + return ts_obj; // This should not happen! #endif /* ACE_HAS_THR_C_DEST */ return ts_obj; diff --git a/externals/ace/TSS_T.h b/externals/ace/TSS_T.h index d4fa8d52974..f9ffaa92f35 100644 --- a/externals/ace/TSS_T.h +++ b/externals/ace/TSS_T.h @@ -4,7 +4,7 @@ /** * @file TSS_T.h * - * $Id: TSS_T.h 91124 2010-07-19 11:54:35Z vzykov $ + * $Id: TSS_T.h 80826 2008-03-04 14:51:23Z wotte $ * * Moved from Synch.h. * @@ -39,10 +39,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined (ACE_HAS_THR_C_DEST) -class ACE_TSS_Adapter; -#endif - /** * @class ACE_TSS * @@ -197,20 +193,6 @@ protected: /// "Destructor" that deletes internal TYPE * when thread exits. static void cleanup (void *ptr); - - /// Obtains a plain value stored in the thread-specific storage. -# if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *ts_value (void) const; -# else - TYPE *ts_value (void) const; -# endif /* ACE_HAS_THR_C_DEST */ - - /// Stores a new plain value in the thread-specific storage. -# if defined (ACE_HAS_THR_C_DEST) - int ts_value (ACE_TSS_Adapter *new_tss_adapter) const; -# else - int ts_value (TYPE *new_ts_obj) const; -# endif /* ACE_HAS_THR_C_DEST */ #endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) */ // = Disallow copying... ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS<TYPE> &)) diff --git a/externals/ace/TSS_T.inl b/externals/ace/TSS_T.inl index 16c7b5de487..9959a2edd94 100644 --- a/externals/ace/TSS_T.inl +++ b/externals/ace/TSS_T.inl @@ -1,14 +1,11 @@ // -*- C++ -*- // -// $Id: TSS_T.inl 91124 2010-07-19 11:54:35Z vzykov $ +// $Id: TSS_T.inl 80826 2008-03-04 14:51:23Z wotte $ -#include "ace/Thread.h" -#include "ace/Log_Msg.h" +#if !(defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if !(defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) - template <class TYPE> ACE_INLINE ACE_TSS<TYPE>::ACE_TSS (TYPE *type) : type_ (type) @@ -16,7 +13,7 @@ ACE_TSS<TYPE>::ACE_TSS (TYPE *type) } template <class TYPE> ACE_INLINE int -ACE_TSS<TYPE>::ts_init (void) +ACE_TSS<TYPE>::ts_init (void) { return 0; } @@ -40,64 +37,6 @@ ACE_TSS<TYPE>::ts_get (void) const return this->type_; } -#else - -# if defined (ACE_HAS_THR_C_DEST) -template <class TYPE> ACE_INLINE ACE_TSS_Adapter * -ACE_TSS<TYPE>::ts_value (void) const -{ - // Get the tss adapter from thread-specific storage - void *temp = 0; - if (ACE_Thread::getspecific (this->key_, &temp) == -1) - { - return 0; // This should not happen! - } - return static_cast <ACE_TSS_Adapter *> (temp); -} -# else -template <class TYPE> ACE_INLINE TYPE * -ACE_TSS<TYPE>::ts_value (void) const -{ - void *temp = 0; - if (ACE_Thread::getspecific (this->key_, &temp) == -1) - { - return 0; // This should not happen! - } - return static_cast <TYPE *> (temp); -} -# endif /* ACE_HAS_THR_C_DEST */ - -# if defined (ACE_HAS_THR_C_DEST) -template <class TYPE> ACE_INLINE int -ACE_TSS<TYPE>::ts_value (ACE_TSS_Adapter *new_tss_adapter) const -{ - if (ACE_Thread::setspecific (this->key_, - (void *) new_tss_adapter) != 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Thread::setspecific() failed!"))); - return -1; - } - - return 0; -} -# else -template <class TYPE> ACE_INLINE int -ACE_TSS<TYPE>::ts_value (TYPE *new_ts_obj) const -{ - if (ACE_Thread::setspecific (this->key_, (void *) new_ts_obj) != 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Thread::setspecific() failed!"))); - return -1; - } - - return 0; -} -# endif /* ACE_HAS_THR_C_DEST */ +ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ! (defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) */ - -ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/externals/ace/Task.h b/externals/ace/Task.h index 08147a6459a..f2ac03ca9e9 100644 --- a/externals/ace/Task.h +++ b/externals/ace/Task.h @@ -4,7 +4,7 @@ /** * @file Task.h * - * $Id: Task.h 91058 2010-07-12 08:20:09Z johnnyw $ + * $Id: Task.h 80826 2008-03-04 14:51:23Z wotte $ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ @@ -84,21 +84,21 @@ public: /** * Hook called from ACE_Thread_Exit when during thread exit and from - * the default implementation of @c module_closed(). In general, this + * the default implementation of <module_closed>. In general, this * method shouldn't be called directly by an application, - * particularly if the Task is running as an Active Object. - * Instead, a special message should be passed into the Task via - * the put() method defined below, and the svc() method should - * interpret this as a flag to shut down the Task. + * particularly if the <Task> is running as an Active Object. + * Instead, a special message should be passed into the <Task> via + * the <put> method defined below, and the <svc> method should + * interpret this as a flag to shut down the <Task>. */ virtual int close (u_long flags = 0); /** - * Hook called during ACE_Module::close(). The default + * Hook called during <ACE_Module::close>. The default * implementation calls forwards the call to close(1). Please - * notice the changed value of the default argument of close(). + * notice the changed value of the default argument of <close>. * This allows tasks to differ between the call has been originated - * from ACE_Thread_Exit or from module_closed(). Be aware that + * from <ACE_Thread_Exit> or from <module_closed>. Be aware that * close(0) will be also called when a thread associated with the * ACE_Task instance exits. */ @@ -111,7 +111,7 @@ public: /// A hook method that can be used to pass a message to a /// task, where it can be processed immediately or queued for subsequent - /// processing in the svc() hook method. + /// processing in the <svc> hook method. virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0); /// Run by a daemon thread to handle deferred processing. diff --git a/externals/ace/Task_T.h b/externals/ace/Task_T.h index d79a5fb0e46..b945bf37551 100644 --- a/externals/ace/Task_T.h +++ b/externals/ace/Task_T.h @@ -4,7 +4,7 @@ /** * @file Task_T.h * - * $Id: Task_T.h 91016 2010-07-06 11:29:50Z johnnyw $ + * $Id: Task_T.h 80826 2008-03-04 14:51:23Z wotte $ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ @@ -96,13 +96,13 @@ public: // Should be protected: * the stream. To do this, the message is put onto the task next in * the stream after this task's sibling. * - * @param mb Pointer to the block that is used in the reply. - * @param tv The absolute time at which the put operation used to - * send the message block to the next module in the stream - * will time out. If 0, this call blocks until it can be - * completed. + * @param ACE_Message_Block Pointer to the block that is used in the reply. + * @param timeout The absolute time at which the put operation used to + * send the message block to the next module in the stream + * will time out. If 0, this call blocks until it can be + * completed. */ - int reply (ACE_Message_Block *mb, ACE_Time_Value *tv = 0); + int reply (ACE_Message_Block *, ACE_Time_Value *timeout = 0); /** * Transfer message to the adjacent ACE_Task in a ACE_Stream. Note diff --git a/externals/ace/Time_Value.h b/externals/ace/Time_Value.h index f92c8c7f7f5..384ff7d8569 100644 --- a/externals/ace/Time_Value.h +++ b/externals/ace/Time_Value.h @@ -4,7 +4,7 @@ /** * @file Time_Value.h * - * $Id: Time_Value.h 90683 2010-06-17 22:07:42Z shuston $ + * $Id: Time_Value.h 89121 2010-02-22 14:48:31Z schmidt $ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ @@ -129,24 +129,11 @@ public: /// Converts from ACE_Time_Value format into milliseconds format. /** * @return Sum of second field (in milliseconds) and microsecond field - * (in milliseconds). - * - * @note The semantics of this method differs from the sec() and - * usec() methods. There is no analogous "millisecond" - * component in an ACE_Time_Value. - */ - ACE_UINT64 get_msec () const; - - /// Converts from ACE_Time_Value format into milliseconds format. - /** - * @return Sum of second field (in milliseconds) and microsecond field * (in milliseconds) and return them via the @param ms parameter. * * @note The semantics of this method differs from the sec() and * usec() methods. There is no analogous "millisecond" * component in an ACE_Time_Value. - * - * @deprecated Use get_msec() instead. */ void msec (ACE_UINT64 &ms) const; @@ -158,8 +145,6 @@ public: * @note The semantics of this method differs from the sec() and * usec() methods. There is no analogous "millisecond" * component in an ACE_Time_Value. - * - * @deprecated Use get_msec() instead. */ void msec (ACE_UINT64 &ms) /* const */; @@ -169,14 +154,6 @@ public: * usec() methods. There is no analogous "millisecond" * component in an ACE_Time_Value. */ - void set_msec (const ACE_UINT64 &ms); - - /// Converts from milli-seconds format into ACE_Time_Value format. - /** - * @note The semantics of this method differs from the sec() and - * usec() methods. There is no analogous "millisecond" - * component in an ACE_Time_Value. - */ void msec (long); /// Converts from milli-seconds format into ACE_Time_Value format. diff --git a/externals/ace/Time_Value.inl b/externals/ace/Time_Value.inl index 8f7bf23d837..23d6f2dca94 100644 --- a/externals/ace/Time_Value.inl +++ b/externals/ace/Time_Value.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Time_Value.inl 90689 2010-06-18 11:14:47Z shuston $ +// $Id: Time_Value.inl 88502 2010-01-12 19:53:17Z olli $ #include "ace/Truncate.h" @@ -147,21 +147,13 @@ ACE_Time_Value::msec (void) const return ACE_Utils::truncate_cast<unsigned long> (secs); } -ACE_INLINE ACE_UINT64 -ACE_Time_Value::get_msec () const -{ - // ACE_OS_TRACE ("ACE_Time_Value::get_msec"); - ACE_UINT64 ms = ACE_Utils::truncate_cast<ACE_UINT64> (this->tv_.tv_sec); - ms *= 1000; - ms += (this->tv_.tv_usec / 1000); - return ms; -} - ACE_INLINE void ACE_Time_Value::msec (ACE_UINT64 &ms) const { // ACE_OS_TRACE ("ACE_Time_Value::msec"); - ms = this->get_msec (); + ms = ACE_Utils::truncate_cast<ACE_UINT64> (this->tv_.tv_sec); + ms *= 1000; + ms += (this->tv_.tv_usec / 1000); } ACE_INLINE void @@ -172,17 +164,6 @@ ACE_Time_Value::msec (ACE_UINT64 &ms) /*const*/ tv->msec (ms); } -ACE_INLINE void -ACE_Time_Value::set_msec (const ACE_UINT64 &ms) -{ - // ACE_OS_TRACE ("ACE_Time_Value::set_msec"); - // Convert millisecond units to seconds; - ACE_UINT64 secs = ms / 1000; - this->tv_.tv_sec = static_cast<long> (secs); - // Convert remainder to microseconds; - this->tv_.tv_usec = static_cast<long>((ms - (secs * 1000)) * 1000); -} - /// Converts from milli-seconds format into Time_Value format. ACE_INLINE void ACE_Time_Value::msec (long milliseconds) diff --git a/externals/ace/Version.h b/externals/ace/Version.h index 92d70e802ec..cf8dc897ac6 100644 --- a/externals/ace/Version.h +++ b/externals/ace/Version.h @@ -1,9 +1,9 @@ // -*- C++ -*- -// $Id: Version.h 91247 2010-08-01 09:46:33Z johnnyw $ +// $Id: Version.h 90351 2010-05-31 07:06:15Z johnnyw $ // This is file was automatically generated by \$ACE_ROOT/bin/make_release. #define ACE_MAJOR_VERSION 5 -#define ACE_MINOR_VERSION 8 -#define ACE_BETA_VERSION 1 -#define ACE_VERSION "5.8.1" +#define ACE_MINOR_VERSION 7 +#define ACE_BETA_VERSION 9 +#define ACE_VERSION "5.7.9" diff --git a/externals/ace/ace_ce_dll.cfg b/externals/ace/ace_ce_dll.cfg deleted file mode 100644 index 80c479b3205..00000000000 --- a/externals/ace/ace_ce_dll.cfg +++ /dev/null @@ -1 +0,0 @@ -WCE_CFG=WCE200;
\ No newline at end of file diff --git a/externals/ace/ace_message_table.bin b/externals/ace/ace_message_table.bin Binary files differindex 6ac08e5dc69..b46b32a0ba6 100644 --- a/externals/ace/ace_message_table.bin +++ b/externals/ace/ace_message_table.bin diff --git a/externals/ace/config-doxygen.h b/externals/ace/config-doxygen.h index ddd84e88e7a..830e69a3e55 100644 --- a/externals/ace/config-doxygen.h +++ b/externals/ace/config-doxygen.h @@ -6,7 +6,7 @@ * * @file config-doxygen.h * - * $Id: config-doxygen.h 91101 2010-07-15 09:49:28Z johnnyw $ + * $Id: config-doxygen.h 84610 2009-02-26 10:26:09Z johnnyw $ * * @author Carlos O'Ryan <coryan@uci.edu> * @author Darrell Brunsch <brunsch@uci.edu> @@ -123,6 +123,4 @@ #define TAO_BEGIN_VERSIONED_NAMESPACE_DECL #define TAO_END_VERSIONED_NAMESPACE_DECL -#define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1 - #endif /* ACE_CONFIG_DOXYGEN_H */ diff --git a/externals/ace/config-irix6.5.x-sgic++.h b/externals/ace/config-irix6.5.x-sgic++.h deleted file mode 100644 index 2d501010b68..00000000000 --- a/externals/ace/config-irix6.5.x-sgic++.h +++ /dev/null @@ -1,18 +0,0 @@ -// -*- C++ -*- -// $Id: config-irix6.5.x-sgic++.h 80826 2008-03-04 14:51:23Z wotte $ - -// Use this file for IRIX 6.5.x - -#ifndef ACE_CONFIG_IRIX65X_H -#define ACE_CONFIG_IRIX65X_H -#include /**/ "ace/pre.h" - -// Include IRIX 6.[234] configuration -#include "ace/config-irix6.x-sgic++.h" - -// Irix 6.5 man pages show that they exist -#undef ACE_LACKS_CONDATTR_PSHARED -#undef ACE_LACKS_MUTEXATTR_PSHARED - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_IRIX65X_H */ diff --git a/externals/ace/config-irix6.x-common.h b/externals/ace/config-irix6.x-common.h deleted file mode 100644 index 1de756d530c..00000000000 --- a/externals/ace/config-irix6.x-common.h +++ /dev/null @@ -1,254 +0,0 @@ -/* -*- C++ -*- */ -// -// $Id: config-irix6.x-common.h 87167 2009-10-19 19:33:53Z olli $ -// -// This file contains the common configuration options for both -// SGI/MIPSPro C++ and g++ under IRIX 6.X -// -// For IRIX 6.2 there are several patches that should be applied to -// get reliable operation with multi-threading and exceptions. -// Specifically you should get a reasonable current IRIX, Compiler -// and POSIX patch-sets. - -// For IRIX 6.[34] it's less critical, but it's still recommended -// that you apply the applicable patch-sets (IRIX and Compiler I believe). - -// These patches are updated frequently, so you should ask your support -// contact or search SGI's web site (http://www.sgi.com) for the latest -// version. - -// Use this file for IRIX 6.[234] if you have the pthreads patches -// installed. - -#ifndef ACE_CONFIG_IRIX6X_COMMON_H - -#ifndef IRIX6 -# define IRIX6 -#endif - -#if ! defined(ACE_CONFIG_H) -#error "This file may only be included by config-irix6.x-sgic++.h, config-irix6.x-kcc.h or config-irix6.x-g++.h" -#endif - -// The Irix 6.x float.h doesn't allow us to distinguish between a -// double and a long double. So, we have to hard-code this. Thanks -// to Bob Laferriere <laferrie@gsao.med.ge.com> for figuring it out. -#if defined (_MIPS_SIM) /* 6.X System */ -# include <sgidefs.h> -# if defined (__GNUC__) -# define ACE_SIZEOF_LONG_DOUBLE 16 -# elif defined (_MIPS_SIM_NABI32) && (_MIPS_SIM == _MIPS_SIM_NABI32) -# define ACE_SIZEOF_LONG_DOUBLE 16 -# elif defined (_MIPS_SIM_ABI32) && (_MIPS_SIM == _MIPS_SIM_ABI32) -# define ACE_SIZEOF_LONG_DOUBLE 8 -# elif defined (_MIPS_SIM_ABI64) && (_MIPS_SIM == _MIPS_SIM_ABI64) -# define ACE_SIZEOF_LONG_DOUBLE 16 -# elif !defined (ACE_SIZEOF_LONG_DOUBLE) -# define ACE_SIZEOF_LONG_DOUBLE 8 -# endif -#else -# define ACE_SIZEOF_LONG_DOUBLE 8 /* 5.3 System */ -#endif - -// petern, Next part of it: - -// Platform supports getpagesize() call. -#define ACE_HAS_GETPAGESIZE - -// Platform has no implementation of pthread_condattr_setpshared(), -// even though it supports pthreads! (like Irix 6.2) -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_MUTEXATTR_PSHARED - -#define ACE_LACKS_SUSECONDS_T - -// Platform/compiler has the sigwait(2) prototype -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIGTIMEDWAIT -#define ACE_HAS_SIGSUSPEND - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Platform requires void * for mmap(). -#define ACE_HAS_VOIDPTR_MMAP - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the <sys/syscall.h> file. -#define ACE_HAS_SYS_SYSCALL_H - -// Compiler/platform supports alloca() -// Although ACE does have alloca() on this compiler/platform combination, it is -// disabled by default since it can be dangerous. Uncomment the following line -// if you ACE to use it. -//#define ACE_HAS_ALLOCA - -// Compiler/platform has <alloca.h> -#define ACE_HAS_ALLOCA_H - -// Irix needs to define bzero() in this odd file <bstring.h> -#define ACE_HAS_BSTRING - -// Compiler/platform has the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Platform contains <poll.h>. -#define ACE_HAS_POLL - -// Platform supports the /proc file system. -#define ACE_HAS_PROC_FS - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals. -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Platform provides <sys/filio.h> header. -#define ACE_HAS_SYS_FILIO_H - -// Compiler/platform defines a union semun for SysV shared memory. -#define ACE_HAS_SEMUN - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST -#ifdef ACE_LACKS_PERFECT_MULTICAST_FILTERING - #undef ACE_LACKS_PERFECT_MULTICAST_FILTERING -#endif -#define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 - -//************************************************************** -// Not so sure how next lines should look like - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME - -//************************************************************** - -// IRIX 6.4 and below do not support reentrant netdb functions -// (getprotobyname_r, getprotobynumber_r, gethostbyaddr_r, -// gethostbyname_r, getservbyname_r). -#if (ACE_IRIX_VERS <= 64) && !defined (ACE_HAS_NETDB_REENTRANT_FUNCTIONS) -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#endif /* ACE_HAS_NETDB_REENTRANT_FUNCTIONS */ - -#define ACE_HAS_DIRENT -// Unless the thread enabled version is used the readdir_r interface -// does not get defined in IRIX 6.2 -#define ACE_LACKS_READDIR_R -#define ACE_LACKS_RWLOCK_T - -#define ACE_HAS_GPERF - -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_BROKEN_DGRAM_SENDV - -#define ACE_LACKS_PLACEMENT_OPERATOR_DELETE -#define ACE_PI_CONTROL_BLOCK_ALIGN_LONGS 2 - -// Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS - -// IRIX 6.5 supports AIO -#define ACE_HAS_AIO_CALLS -#define ACE_POSIX_AIOCB_PROACTOR -#define ACE_HAS_SGIDLADD -#define ACE_HAS_P_READ_WRITE -#define ACE_LACKS_LINEBUFFERED_STREAMBUF -#define ACE_LACKS_STDINT_H -#define ACE_HAS_SYSENT_H -#define ACE_HAS_SYSV_SYSINFO -#define ACE_HAS_SYS_SYSTEMINFO_H - -// Platform has support for multi-byte character support compliant -// with the XPG4 Worldwide Portability Interface wide-character -// classification. -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -// We need to setup a very high address or Naming_Test won't run. -#define ACE_DEFAULT_BASE_ADDR ((char *) (1024U * 1024 * 1024)) - -#define ACE_LACKS_SIGNED_CHAR - -// Platform supports reentrant functions (i.e., all the POSIX *_r -// functions). -#define ACE_HAS_REENTRANT_FUNCTIONS - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Platform does not support reentrant password file accessor functiions. -#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS - -// uses ctime_r & asctime_r with only two parameters vs. three -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - -// Prototypes for both signal() and struct sigaction are consistent. -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -#define ACE_HAS_UALARM - -// Scheduling functions are declared in <sched.h> -#define ACE_NEEDS_SCHED_H - -// Compile using multi-thread libraries by default -#if !defined (ACE_MT_SAFE) - #define ACE_MT_SAFE 1 -#endif /* ACE_MT_SAFE */ - -#if (ACE_MT_SAFE != 0) - -// Add threading support - -#define ACE_HAS_IRIX62_THREADS - -// Needed for the threading stuff? -#include /**/ <task.h> -#define PTHREAD_MIN_PRIORITY PX_PRIO_MIN -#define PTHREAD_MAX_PRIORITY PX_PRIO_MAX - -// ACE supports threads. -#define ACE_HAS_THREADS - -// Platform has no implementation of pthread_condattr_setpshared(), -// even though it supports pthreads! (like Irix 6.2) -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_MUTEXATTR_PSHARED - -// IRIX 6.2 supports a variant of POSIX Pthreads, supposedly POSIX 1c -#define ACE_HAS_PTHREADS - -// Compiler/platform has thread-specific storage -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -// The pthread_cond_timedwait call does not reset the timer. -#define ACE_LACKS_COND_TIMEDWAIT_RESET 1 - -// When threads are enabled READDIR_R is supported on IRIX. -#undef ACE_LACKS_READDIR_R - -#endif /* (ACE_MT_SAFE == 0) */ - - -#endif /* ACE_CONFIG_IRIX6X_COMMON_H */ diff --git a/externals/ace/config-irix6.x-g++.h b/externals/ace/config-irix6.x-g++.h deleted file mode 100644 index 94c79119a64..00000000000 --- a/externals/ace/config-irix6.x-g++.h +++ /dev/null @@ -1,15 +0,0 @@ -/* -*- C++ -*- */ -// $Id: config-irix6.x-g++.h 87268 2009-10-29 21:06:06Z olli $ - -// The following configuration file is designed to work for the SGI -// Indigo2EX running Irix 6.2 platform using the GNU C++ Compiler - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include /**/ "ace/pre.h" - -#include "ace/config-g++-common.h" -#include "ace/config-irix6.x-common.h" - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/externals/ace/config-irix6.x-sgic++.h b/externals/ace/config-irix6.x-sgic++.h deleted file mode 100644 index 8bba07ac671..00000000000 --- a/externals/ace/config-irix6.x-sgic++.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- C++ -*- */ -// $Id: config-irix6.x-sgic++.h 81935 2008-06-12 22:01:53Z jtc $ - -// Use this file for IRIX 6.[234] if you have the pthreads patches -// installed. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include /**/ "ace/pre.h" - -#include "ace/config-irix6.x-common.h" - -// This is the config file for IRIX 6.2, 6.4 and hopefully 6.3, using -// the SGI C++ compiler (7.1 or higher). - -// The following three should be enabled/disabled together. -#if _COMPILER_VERSION < 720 -#define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA -#endif /* _COMPILER_VERSION < 720 */ -#define ACE_TEMPLATES_REQUIRE_SOURCE -#define ACE_NEEDS_FUNC_DEFINITIONS - -// Platform supports STREAM pipes (note that this is disabled by -// default, see the manual page on pipe(2) to find out how to enable -// it). -// #define ACE_HAS_STREAM_PIPES - -#if defined (_COMPILER_VERSION) -# define ACE_CC_NAME ACE_TEXT ("SGI/MIPSPro") -# define ACE_CC_MAJOR_VERSION (_COMPILER_VERSION / 100) -# define ACE_CC_MINOR_VERSION (_COMPILER_VERSION % 100) -# define ACE_CC_BETA_VERSION (0) -#endif /* _COMPILER_VERSION */ - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/externals/ace/config-macosx-snowleopard.h b/externals/ace/config-macosx-snowleopard.h index 09e9458d6b9..f9b3522a5aa 100644 --- a/externals/ace/config-macosx-snowleopard.h +++ b/externals/ace/config-macosx-snowleopard.h @@ -1,17 +1,10 @@ -// $Id: config-macosx-snowleopard.h 91093 2010-07-15 09:12:20Z wotte $ +// $Id: config-macosx-snowleopard.h 87236 2009-10-27 08:21:42Z wotte $ #ifndef ACE_CONFIG_MACOSX_SNOWLEOPARD_H #define ACE_CONFIG_MACOSX_SNOWLEOPARD_H - #include "ace/config-macosx-leopard.h" -#ifdef __clang__ -#ifdef ACE_HAS_GCC_ATOMIC_BUILTINS -#undef ACE_HAS_GCC_ATOMIC_BUILTINS -#endif -#endif - // This header has been deprecated in Snow Leopard. #define ACE_LACKS_UCONTEXT_H -#endif // ACE_CONFIG_MACOSX_SNOWLEOPARD_H +#endif ACE_CONFIG_MACOSX_SNOWLEOPARD_H diff --git a/externals/ace/config-sco-5.0.0-nothread.h b/externals/ace/config-sco-5.0.0-nothread.h deleted file mode 100644 index 259bd55c273..00000000000 --- a/externals/ace/config-sco-5.0.0-nothread.h +++ /dev/null @@ -1,12 +0,0 @@ -/* -*- C++ -*- */ -// $Id: config-sco-5.0.0-nothread.h 87268 2009-10-29 21:06:06Z olli $ - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include /**/ "ace/pre.h" - -#include "ace/config-g++-common.h" -#include "ace/config-sco-5.0.0.h" - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/externals/ace/config-sunos5.4-g++.h b/externals/ace/config-sunos5.4-g++.h deleted file mode 100644 index a678389e78d..00000000000 --- a/externals/ace/config-sunos5.4-g++.h +++ /dev/null @@ -1,176 +0,0 @@ -/* -*- C++ -*- */ -// $Id: config-sunos5.4-g++.h 87268 2009-10-29 21:06:06Z olli $ - -// The following configuration file is designed to work for SunOS 5.4 -// platforms using the GNU g++ compiler. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include /**/ "ace/pre.h" - -#if ! defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so -// this must appear before its #include. -#define ACE_HAS_STRING_CLASS - -#include "ace/config-g++-common.h" - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Platform supports pread() and pwrite() -#define ACE_HAS_P_READ_WRITE - -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -// Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Sun has the wrong prototype for sendmsg. -#define ACE_HAS_NONCONST_SENDMSG - -// The SunOS 5.x version of rand_r is inconsistent with the header files... -#define ACE_HAS_BROKEN_RANDR - -// Platform supports system configuration information. -#define ACE_HAS_SYS_SYSTEMINFO_H -#define ACE_HAS_SYSV_SYSINFO - -// Platform supports the POSIX regular expression library -#define ACE_HAS_REGEX - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the <sys/syscall.h> file. -#define ACE_HAS_SYS_SYSCALL_H - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Compiler/platform supports SunOS high resolution timers. -#define ACE_HAS_HI_RES_TIMER - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Compiler/platform supports alloca() -// Although ACE does have alloca() on this compiler/platform combination, it is -// disabled by default since it can be dangerous. Uncomment the following line -// if you ACE to use it. -//#define ACE_HAS_ALLOCA - -// Compiler/platform has <alloca.h> -#define ACE_HAS_ALLOCA_H - -// Platform contains <poll.h>. -#define ACE_HAS_POLL - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME - -// Platform supports the /proc file system. -#define ACE_HAS_PROC_FS - -// Platform supports the prusage_t struct. -#define ACE_HAS_PRUSAGE_T - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals. -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SYS_SOCKIO_H - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Platform supports STREAM pipes. -#define ACE_HAS_STREAM_PIPES - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform supports SVR4 gettimeofday() prototype. -#define ACE_HAS_SVR4_GETTIMEOFDAY - -// Platform lacks pthread_sigaction -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK - -// Compiler/platform supports SVR4 TLI (in particular, T_GETNAME stuff)... -#define ACE_HAS_SVR4_TLI - -// Platform provides <sys/filio.h> header. -#define ACE_HAS_SYS_FILIO_H - -#define ACE_HAS_STRSIGNAL - -/* Turn off the following defines if you want to disable threading. */ -// Compile using multi-thread libraries. -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -# if !defined (_REENTRANT) -# define _REENTRANT -# endif /* _REENTRANT */ -#endif /* !ACE_MT_SAFE */ - -// Platform supports Solaris threads. -#define ACE_HAS_STHREADS - -// Platform supports threads. -#define ACE_HAS_THREADS - -// Compiler/platform has thread-specific storage -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -// Platform supports reentrant functions (i.e., all the POSIX *_r functions). -#define ACE_HAS_REENTRANT_FUNCTIONS - -/* end threading defines */ - -#define ACE_HAS_PRIOCNTL -#define ACE_NEEDS_LWP_PRIO_SET - -// Platform supports TLI timod STREAMS module. -#define ACE_HAS_TIMOD_H - -// Platform supports TLI tiuser header. -#define ACE_HAS_TIUSER_H - -// Platform provides TLI function prototypes. -#define ACE_HAS_TLI_PROTOTYPES - -// Platform supports TLI. -#define ACE_HAS_TLI - -// Use the poll() event demultiplexor rather than select(). -//#define ACE_USE_POLL - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 -#define ACE_HAS_IDTYPE_T -#define ACE_HAS_GPERF -#define ACE_HAS_DIRENT - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/externals/ace/config-sunos5.4-sunc++-4.x.h b/externals/ace/config-sunos5.4-sunc++-4.x.h deleted file mode 100644 index d7d0862e328..00000000000 --- a/externals/ace/config-sunos5.4-sunc++-4.x.h +++ /dev/null @@ -1,186 +0,0 @@ -/* -*- C++ -*- */ -// $Id: config-sunos5.4-sunc++-4.x.h 87250 2009-10-28 11:57:17Z olli $ - -// The following configuration file is designed to work for SunOS 5.4 -// platforms using the SunC++ 4.0.x compiler. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include /**/ "ace/pre.h" - -#if ! defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Platform supports pread() and pwrite() -#define ACE_HAS_P_READ_WRITE - -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Sun has the wrong prototype for sendmsg. -#define ACE_HAS_NONCONST_SENDMSG - -// The SunOS 5.x version of rand_r is inconsistent with the header files... -#define ACE_HAS_BROKEN_RANDR - -// Platform supports system configuration information. -#define ACE_HAS_SYS_SYSTEMINFO_H -#define ACE_HAS_SYSV_SYSINFO - -// Platform supports the POSIX regular expression library. -#define ACE_HAS_REGEX - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the <sys/syscall.h> file. -#define ACE_HAS_SYS_SYSCALL_H - -// Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Compiler/platform supports SunOS high resolution timers. -#define ACE_HAS_HI_RES_TIMER - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Compiler/platform supports alloca() -// Although ACE does have alloca() on this compiler/platform combination, it is -// disabled by default since it can be dangerous. Uncomment the following line -// if you ACE to use it. -//#define ACE_HAS_ALLOCA - -// Compiler/platform has <alloca.h> -#define ACE_HAS_ALLOCA_H - -// Platform contains <poll.h>. -#define ACE_HAS_POLL - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME - -// Platform supports the /proc file system. -#define ACE_HAS_PROC_FS - -// Platform supports the prusage_t struct. -#define ACE_HAS_PRUSAGE_T - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals. -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SYS_SOCKIO_H - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Platform supports STREAM pipes. -#define ACE_HAS_STREAM_PIPES - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform supports SVR4 gettimeofday() prototype. -#define ACE_HAS_SVR4_GETTIMEOFDAY - -// Compiler/platform supports SVR4 signal typedef. -#define ACE_HAS_SVR4_SIGNAL_T - -// Platform lacks pthread_sigaction -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK - -// Compiler/platform supports SVR4 ACE_TLI (in particular, T_GETNAME stuff)... -#define ACE_HAS_SVR4_TLI - -// Platform provides <sys/filio.h> header. -#define ACE_HAS_SYS_FILIO_H - -#define ACE_HAS_STRSIGNAL - -/* Turn off the following defines if you want to disable threading. */ -// Compile using multi-thread libraries. -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif - -// Platform supports Solaris threads. -#define ACE_HAS_STHREADS - -// Platform supports threads. -#define ACE_HAS_THREADS - -// Compiler/platform has thread-specific storage -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -// Platform supports reentrant functions (i.e., all the POSIX *_r functions). -#define ACE_HAS_REENTRANT_FUNCTIONS - -/* end threading defines */ - -#define ACE_HAS_PRIOCNTL -#define ACE_NEEDS_LWP_PRIO_SET - -// Reactor detects deadlock -// #define ACE_REACTOR_HAS_DEADLOCK_DETECTION - -// Platform supports ACE_TLI timod STREAMS module. -#define ACE_HAS_TIMOD_H - -// Platform supports ACE_TLI tiuser header. -#define ACE_HAS_TIUSER_H - -// Platform provides ACE_TLI function prototypes. -#define ACE_HAS_TLI_PROTOTYPES - -// Platform supports ACE_TLI. -#define ACE_HAS_TLI - -#define ACE_LACKS_LINEBUFFERED_STREAMBUF -#define ACE_LACKS_SIGNED_CHAR - -// Use the poll() event demultiplexor rather than select(). -//#define ACE_USE_POLL - -#define ACE_NEEDS_DEV_IO_CONVERSION - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 -#define ACE_HAS_IDTYPE_T - -#define ACE_HAS_GPERF -#define ACE_HAS_DIRENT - -# if defined (ACE_HAS_EXCEPTIONS) - // If exceptions are enabled and we are using Sun/CC then - // <operator new> throws an exception instead of returning 0. -# define ACE_NEW_THROWS_EXCEPTIONS -# endif /* ACE_HAS_EXCEPTIONS */ - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/externals/ace/config.h.in b/externals/ace/config.h.in index 2129880a15b..aa09aa48bf6 100644 --- a/externals/ace/config.h.in +++ b/externals/ace/config.h.in @@ -2092,9 +2092,6 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME -/* Define to the home page for this package. */ -#undef PACKAGE_URL - /* Define to the version of this package. */ #undef PACKAGE_VERSION diff --git a/externals/ace/os_include/os_errno.h b/externals/ace/os_include/os_errno.h index 4f5cfe6954c..53c907624bd 100644 --- a/externals/ace/os_include/os_errno.h +++ b/externals/ace/os_include/os_errno.h @@ -6,7 +6,7 @@ * * system error numbers * - * $Id: os_errno.h 91076 2010-07-13 14:20:35Z johnnyw $ + * $Id: os_errno.h 85122 2009-04-20 16:34:19Z johnnyw $ * * @author Don Hinton <dhinton@dresystems.com> * @author This code was originally in various places including ace/OS.h. @@ -42,121 +42,6 @@ extern "C" #if defined (ACE_WIN32) // error code mapping for windows - // VC++ 10 has these error codes defined in errno.h, - // this will cause different errors in ACE. - // So we undef these error codes if they are wrongly defined -# if defined (EWOULDBLOCK) && (EWOULDBLOCK != WSAEWOULDBLOCK) -# undef EWOULDBLOCK -# endif /* EWOULDBLOCK */ -# if defined (EINPROGRESS) && (EINPROGRESS != WSAEINPROGRESS) -# undef EINPROGRESS -# endif /* EINPROGRESS */ -# if defined (EALREADY) && (EALREADY != WSAEALREADY) -# undef EALREADY -# endif /* EALREADY */ -# if defined (ENOTSOCK) && (ENOTSOCK != WSAENOTSOCK) -# undef ENOTSOCK -# endif /* ENOTSOCK */ -# if defined (EDESTADDRREQ) && (EDESTADDRREQ != WSAEDESTADDRREQ) -# undef EDESTADDRREQ -# endif /* EDESTADDRREQ */ -# if defined (EMSGSIZE) && (EMSGSIZE != WSAEMSGSIZE) -# undef EMSGSIZE -# endif /* EMSGSIZE */ -# if defined (EPROTOTYPE) && (EPROTOTYPE != WSAEPROTOTYPE) -# undef EPROTOTYPE -# endif /* EPROTOTYPE */ -# if defined (ENOPROTOOPT) && (ENOPROTOOPT != WSAENOPROTOOPT) -# undef ENOPROTOOPT -# endif /* ENOPROTOOPT */ -# if defined (EPROTONOSUPPORT) && (EPROTONOSUPPORT != WSAEPROTONOSUPPORT) -# undef EPROTONOSUPPORT -# endif /* EPROTONOSUPPORT */ -# if defined (ESOCKTNOSUPPORT) && (ESOCKTNOSUPPORT != WSAESOCKTNOSUPPORT) -# undef ESOCKTNOSUPPORT -# endif /* ESOCKTNOSUPPORT */ -# if defined (EOPNOTSUPP) && (EOPNOTSUPP != WSAEOPNOTSUPP) -# undef EOPNOTSUPP -# endif /* EOPNOTSUPP */ -# if defined (EPFNOSUPPORT) && (EPFNOSUPPORT != WSAEPFNOSUPPORT) -# undef EPFNOSUPPORT -# endif /* EPFNOSUPPORT */ -# if defined (EAFNOSUPPORT) && (EAFNOSUPPORT != WSAEAFNOSUPPORT) -# undef EAFNOSUPPORT -# endif /* EAFNOSUPPORT */ -# if defined (EADDRINUSE) && (EADDRINUSE != WSAEADDRINUSE) -# undef EADDRINUSE -# endif /* EADDRINUSE */ -# if defined (EADDRNOTAVAIL) && (EADDRNOTAVAIL != WSAEADDRNOTAVAIL) -# undef EADDRNOTAVAIL -# endif /* EADDRNOTAVAIL */ -# if defined (ENETDOWN) && (ENETDOWN != WSAENETDOWN) -# undef ENETDOWN -# endif /* ENETDOWN */ -# if defined (ENETUNREACH) && (ENETUNREACH != WSAENETUNREACH) -# undef ENETUNREACH -# endif /* ENETUNREACH */ -# if defined (ENETRESET) && (ENETRESET != WSAENETRESET) -# undef ENETRESET -# endif /* ENETRESET */ -# if defined (ECONNABORTED) && (ECONNABORTED != WSAECONNABORTED) -# undef ECONNABORTED -# endif /* ECONNABORTED */ -# if defined (ECONNRESET) && (ECONNRESET != WSAECONNRESET) -# undef ECONNRESET -# endif /* ECONNRESET */ -# if defined (ENOBUFS) && (ENOBUFS != WSAENOBUFS) -# undef ENOBUFS -# endif /* ENOBUFS */ -# if defined (EISCONN) && (EISCONN != WSAEISCONN) -# undef EISCONN -# endif /* EISCONN */ -# if defined (ENOTCONN) && (ENOTCONN != WSAENOTCONN) -# undef ENOTCONN -# endif /* ENOTCONN */ -# if defined (ESHUTDOWN) && (ESHUTDOWN != WSAESHUTDOWN) -# undef ESHUTDOWN -# endif /* ESHUTDOWN */ -# if defined (ETOOMANYREFS) && (ETOOMANYREFS != WSAETOOMANYREFS) -# undef ETOOMANYREFS -# endif /* ETOOMANYREFS */ -# if defined (ETIMEDOUT) && (ETIMEDOUT != WSAETIMEDOUT) -# undef ETIMEDOUT -# endif /* ETIMEDOUT */ -# if defined (ECONNREFUSED) && (ECONNREFUSED != WSAECONNREFUSED) -# undef ECONNREFUSED -# endif /* ECONNREFUSED */ -# if defined (ELOOP) && (ELOOP != WSAELOOP) -# undef ELOOP -# endif /* ELOOP */ -//# if defined (ENAMETOOLONG) && (ENAMETOOLONG != WSAENAMETOOLONG) -//# undef ENAMETOOLONG -//# endif /* ENAMETOOLONG */ -# if defined (EHOSTDOWN) && (EHOSTDOWN != WSAEHOSTDOWN) -# undef EHOSTDOWN -# endif /* EHOSTDOWN */ -# if defined (EHOSTUNREACH) && (EHOSTUNREACH != WSAEHOSTUNREACH) -# undef EHOSTUNREACH -# endif /* EHOSTUNREACH */ -//# if defined (ENOTEMPTY) && (ENOTEMPTY != WSAENOTEMPTY) -//# undef ENOTEMPTY -//# endif /* ENOTEMPTY */ -# if defined (EPROCLIM) && (EPROCLIM != WSAEPROCLIM) -# undef EPROCLIM -# endif /* EPROCLIM */ -# if defined (EUSERS) && (EUSERS != WSAEUSERS) -# undef EUSERS -# endif /* EUSERS */ -# if defined (EDQUOT) && (EDQUOT != WSAEDQUOT) -# undef EDQUOT -# endif /* EDQUOT */ -# if defined (ESTALE) && (ESTALE != WSAESTALE) -# undef ESTALE -# endif /* ESTALE */ -# if defined (EREMOTE) && (EREMOTE != WSAEREMOTE) -# undef EREMOTE -# endif /* EREMOTE */ - # if !defined (ETIME) # define ETIME ERROR_SEM_TIMEOUT # endif /* !ETIME */ |