mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 10:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10874] Update ACE to v5.8.3

Browse source 
(based on zergtmn's repo commit 3a8c259)
(based on zergtmn's repo commit 946c1a8)

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
zerg 2010-12-14 17:14:34 +03:00 • committed by VladimirMangos
parent c38c876b1d
commit b8d773091a
343 changed files with 3060 additions and 7431 deletions
Download patch file Download diff file Expand all files Collapse all files

30
dep/ACE_wrappers/ACE-INSTALL.html
View file

@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head><!-- $Id: ACE-INSTALL.html 90858 2010-06-25 12:47:19Z johnnyw $ --> <html><head><!-- $Id: ACE-INSTALL.html 92151 2010-10-05 07:27:20Z johnnyw $ -->
<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Building and Installing ACE and Its Auxiliary Libraries and Services</title> <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Building and Installing ACE and Its Auxiliary Libraries and Services</title>
<link rev="made" href="mailto:d.schmidt@vanderbilt.edu"></head> <link rev="made" href="mailto:d.schmidt@vanderbilt.edu"></head>
@ -123,7 +123,7 @@ document</a>.</p><p>
</thead><tbody> </thead><tbody>
<tr> <tr>
<th>DOC Group</th> <th>DOC Group</th>
<td>Windows 2000, XP (MSVC++ 7.1, and 8); <td>Windows 2000, XP (MSVC++ 7.1, 8, 9, and 10);
many versions of Linux/Intel (many compilers). many versions of Linux/Intel (many compilers).
</td> </td>
<td>DOC sites at <a href="http://www.dre.vanderbilt.edu/">ISIS</a>, <td>DOC sites at <a href="http://www.dre.vanderbilt.edu/">ISIS</a>,
@ -155,7 +155,7 @@ document</a>.</p><p>
<td>Maintains ACE on many platforms required for their ACE and <td>Maintains ACE on many platforms required for their ACE and
TAO service offerings. We support AIX, TAO service offerings. We support AIX,
CodeGear C++ Builder 2007/2009, CodeGear RAD Studio 2007, Embarcadero C++ Builder 2010, CodeGear C++ Builder 2007/2009, CodeGear RAD Studio 2007, Embarcadero C++ Builder 2010,
CBuilderX 1.0, Windows CE, MinGW, Microsoft Visual C++ 7.1/8/9, GCC, CBuilderX 1.0, Windows CE, MinGW, Microsoft Visual C++ 7.1/8/9/10, GCC,
Cygwin, VxWorks 5.5.x - 6.x (kernel and rtp), OpenVMS 8.2-1 & 8.3 on Alpha and IA64, Cygwin, VxWorks 5.5.x - 6.x (kernel and rtp), OpenVMS 8.2-1 & 8.3 on Alpha and IA64,
BlueCAT Linux, RedHat Linux, Fedora, MacOSX, Solaris, BlueCAT Linux, RedHat Linux, Fedora, MacOSX, Solaris,
Tru64, SuSE Linux on Alpha/IA32/EM64T/IA64, RTEMS, QNX, LynxOS 4.0/4.2, Tru64, SuSE Linux on Alpha/IA32/EM64T/IA64, RTEMS, QNX, LynxOS 4.0/4.2,
@ -232,7 +232,7 @@ supported by the DOC group, Riverace, OCI or Remedy IT. </p><p>
HREF="http://downloads.ociweb.com/MPC/docs/html/MakeProjectCreator.html">MPC</A> HREF="http://downloads.ociweb.com/MPC/docs/html/MakeProjectCreator.html">MPC</A>
(MakeProjectCreator) to generate files used by all supported build (MakeProjectCreator) to generate files used by all supported build
tools (such as GNUmakefiles for UNIX based platforms, sln and vcproj tools (such as GNUmakefiles for UNIX based platforms, sln and vcproj
files for VC71/VC8 and CodeGear makefiles) on various platforms. To files for VC71/VC8 and Embarcadero makefiles) on various platforms. To
help new users to bootstrap quickly the release bundles of ACE (as help new users to bootstrap quickly the release bundles of ACE (as
well as TAO and CIAO) include all needed files to use the build well as TAO and CIAO) include all needed files to use the build
instructions in this document. instructions in this document.
@ -556,7 +556,7 @@ one will not clean up any old files, and trying to use the environment's
<ul> <ul>
<li><a href="#msvc">Microsoft Visual Studio</a></li> <li><a href="#msvc">Microsoft Visual Studio</a></li>
<li><a href="#codegear">CodeGear C++Builder</a></li> <li><a href="#codegear">Embarcadero C++Builder</a></li>
<li><a href="#mingw">MinGW</a></li> <li><a href="#mingw">MinGW</a></li>
<li><a href="#cygwin">Cygwin</a></li> <li><a href="#cygwin">Cygwin</a></li>
</ul> </ul>
@ -565,20 +565,19 @@ one will not clean up any old files, and trying to use the environment's
</p><h3><a name="msvc">Building and Installing ACE on Windows with </p><h3><a name="msvc">Building and Installing ACE on Windows with
Microsoft Visual Studio</a></h3> Microsoft Visual Studio</a></h3>
<p>ACE contains project files for Microsoft Visual Studio .NET 2003 (VC7.1) <p>ACE contains project files for Microsoft Visual Studio .NET 2005 (VC8)
and Visual Studio 2005 (VC8). Visual Studio 2005 supports building for , Visual Studio 2009 (VC9), and Visual Studio 2010 (VC10).
Visual Studio 2005 supports building for
desktop/server Windows as well as for Windows CE and Windows Mobile. Since desktop/server Windows as well as for Windows CE and Windows Mobile. Since
not all users will be interested in the CE/Mobile capability, these platforms not all users will be interested in the CE/Mobile capability, these platforms
have separate solution and project files from the desktop/server Windows. have separate solution and project files from the desktop/server Windows.
Furthermore, VC7.1 and VC8 use different file formats but the same file Furthermore, VC7.1, VC8, VC9, and 10 use different file formats but the same file
suffixes (<code>.sln</code> and <code>.vcproj</code>). To support both suffixes (<code>.sln</code> and <code>.vcproj</code>). To support both
environments, ACE supplies files with different names for the different environments, ACE supplies files with different names for the different
development and target platforms. The platform/name mapping is shown below. development and target platforms. The platform/name mapping is shown below.
All solution files have a <code>.sln</code> suffix and all project files have All solution files have a <code>.sln</code> suffix and all project files have
a <code>.vcproj</code> suffix.</p> a <code>.vcproj</code> suffix.</p>
<p>Visual Studio 2008 (VC9) is also supported.</p>
<p> <p>
The free Visual C++ 2008 Express Edition will work in place of the traditional The free Visual C++ 2008 Express Edition will work in place of the traditional
Visual Studio editions. All the other notes in this document Visual Studio editions. All the other notes in this document
@ -614,6 +613,11 @@ can be built with the compiler and linker included in the <a href="http://www.mi
<td><i>name</i><code>_vc9</code> <td><i>name</i><code>_vc9</code>
</td> </td>
</tr> </tr>
<tr>
<th>VC10 for desktop/server</th>
<td><i>name</i><code>_vc10</code>
</td>
</tr>
</tbody></table> </tbody></table>
<p>The VC++ compiler and linker can now be invoked from GNU make just like <p>The VC++ compiler and linker can now be invoked from GNU make just like
@ -790,7 +794,7 @@ include or library directories are specified using backslashes instead of forwar
slashes. If this occurs, the easiest way to fix it is to recreate it.</a></p> slashes. If this occurs, the easiest way to fix it is to recreate it.</a></p>
<hr align="left" width="50%"><p>&nbsp;</p> <hr align="left" width="50%"><p>&nbsp;</p>
<h3><a name="codegear">Building and Installing ACE on Windows with CodeGear C++</a></h3> <h3><a name="codegear">Building and Installing ACE on Windows with Embarcadero C++</a></h3>
If you are building for a machine without a network card, you may want If you are building for a machine without a network card, you may want
to check <a href="#win32nonic">here</a> first. <p> to check <a href="#win32nonic">here</a> first. <p>
@ -842,7 +846,7 @@ to check <a href="#win32nonic">here</a> first. <p>
<br> <br>
Set the environment variable below to build a version of ACE optimized Set the environment variable below to build a version of ACE optimized
for a certain CPU. For this there are special compiler flags for a certain CPU. For this there are special compiler flags
(-3/-4/-5/-6), see the CodeGear help for more info.<br> (-3/-4/-5/-6), see the Embarcadero help for more info.<br>
<code>set CPU_FLAG=-6</code><br> <code>set CPU_FLAG=-6</code><br>
<br> <br>
You can then start the build with the command You can then start the build with the command
@ -857,7 +861,7 @@ to check <a href="#win32nonic">here</a> first. <p>
Note that when you run <code>make</code> in a sub directory you give <code>make -f Makefile.bmak all</code>. The <code>all</code> is needed to make sure the complete project is build.<p> Note that when you run <code>make</code> in a sub directory you give <code>make -f Makefile.bmak all</code>. The <code>all</code> is needed to make sure the complete project is build.<p>
The Borland/CodeGear C++ Builder 4.0/5.0/6.0/2006/2007/2009/2010 port has been done by Jody Hagins, <a href="mailto:chris@kohlhoff.com">Christopher Kohlhoff</a> and <a href="mailto:jwillemsen@remedy.nl">Johnny Willemsen</a>. </p><p> The Borland/CodeGear/Embarcadero C++ Builder 4.0/5.0/6.0/2006/2007/2009/2010 port has been done by Jody Hagins, <a href="mailto:chris@kohlhoff.com">Christopher Kohlhoff</a> and <a href="mailto:jwillemsen@remedy.nl">Johnny Willemsen</a>. </p><p>
<b>ACE TESTS</b></p><p> <b>ACE TESTS</b></p><p>

101
dep/ACE_wrappers/COPYING
View file

@ -1,36 +1,37 @@
_________________________________________________________________ _________________________________________________________________
Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), and Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM),
CoSMIC(TM) DAnCE(TM), and CoSMIC(TM)
[1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), and [4]CoSMIC(TM) (henceforth [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), DAnCE(TM), and [4]CoSMIC(TM)
referred to as "DOC software") are copyrighted by [5]Douglas C. (henceforth referred to as "DOC software") are copyrighted by
Schmidt and his [6]research group at [7]Washington University, [5]Douglas C. Schmidt and his [6]research group at [7]Washington
[8]University of California, Irvine, and [9]Vanderbilt University, University, [8]University of California, Irvine, and [9]Vanderbilt
Copyright (c) 1993-2010, all rights reserved. Since DOC software is University, Copyright (c) 1993-2009, all rights reserved. Since DOC
open-source, freely available software, you are free to use, modify, software is open-source, freely available software, you are free to
copy, and distribute--perpetually and irrevocably--the DOC software use, modify, copy, and distribute--perpetually and irrevocably--the
source code and object code produced from the source, as well as copy DOC software source code and object code produced from the source, as
and distribute modified versions of this software. You must, however, well as copy and distribute modified versions of this software. You
include this copyright statement along with any code built using DOC must, however, include this copyright statement along with any code
software that you release. No copyright statement needs to be provided built using DOC software that you release. No copyright statement
if you just ship binary executables of your software products. needs to be provided if you just ship binary executables of your
software products.
You can use DOC software in commercial and/or binary software releases You can use DOC software in commercial and/or binary software releases
and are under no obligation to redistribute any of your source code and are under no obligation to redistribute any of your source code
that is built using DOC software. Note, however, that you may not do that is built using DOC software. Note, however, that you may not
anything to the DOC software code, such as copyrighting it yourself or misappropriate the DOC software code, such as copyrighting it yourself
claiming authorship of the DOC software code, that will prevent DOC or claiming authorship of the DOC software code, in a way that will
software from being distributed freely using an open-source prevent DOC software from being distributed freely using an
development model. You needn't inform anyone that you're using DOC open-source development model. You needn't inform anyone that you're
software in your software, though we encourage you to let [10]us know using DOC software in your software, though we encourage you to let
so we can promote your project in the [11]DOC software success [10]us know so we can promote your project in the [11]DOC software
stories. success stories.
The [12]ACE, [13]TAO, [14]CIAO, and [15]CoSMIC web sites are The [12]ACE, [13]TAO, [14]CIAO, [15]DAnCE, and [16]CoSMIC web sites
maintained by the [16]DOC Group at the [17]Institute for Software are maintained by the [17]DOC Group at the [18]Institute for Software
Integrated Systems (ISIS) and the [18]Center for Distributed Object Integrated Systems (ISIS) and the [19]Center for Distributed Object
Computing of Washington University, St. Louis for the development of Computing of Washington University, St. Louis for the development of
open-source software as part of the open-source software community. open-source software as part of the open-source software community.
Submissions are provided by the submitter ``as is'' with no warranties Submissions are provided by the submitter ``as is'' with no warranties
@ -54,11 +55,10 @@
DOC software is provided with no support and without any obligation on DOC software is provided with no support and without any obligation on
the part of Washington University, UC Irvine, Vanderbilt University, the part of Washington University, UC Irvine, Vanderbilt University,
their employees, or students to assist in its use, correction, their employees, or students to assist in its use, correction,
modification, or enhancement. A [19]number of companies around the modification, or enhancement. A [20]number of companies around the
world provide commercial support for DOC software, however. world provide commercial support for DOC software, however. DOC
software is Y2K-compliant, as long as the underlying OS platform is
DOC software is Y2K-compliant, as long as the underlying OS platform Y2K-compliant. Likewise, DOC software is compliant with the new US
is Y2K-compliant. Likewise, DOC software is compliant with the new US
daylight savings rule passed by Congress as "The Energy Policy Act of daylight savings rule passed by Congress as "The Energy Policy Act of
2005," which established new daylight savings times (DST) rules for 2005," which established new daylight savings times (DST) rules for
the United States that expand DST as of March 2007. Since DOC software the United States that expand DST as of March 2007. Since DOC software
@ -66,23 +66,23 @@
users will not be affected by the new DST rules as long as they users will not be affected by the new DST rules as long as they
upgrade their operating systems accordingly. upgrade their operating systems accordingly.
The names ACE(TM), TAO(TM), CIAO(TM), CoSMIC(TM), Washington The names ACE(TM), TAO(TM), CIAO(TM), DAnCE(TM), CoSMIC(TM),
University, UC Irvine, and Vanderbilt University, may not be used to Washington University, UC Irvine, and Vanderbilt University, may not
endorse or promote products or services derived from this source be used to endorse or promote products or services derived from this
without express written permission from Washington University, UC source without express written permission from Washington University,
Irvine, or Vanderbilt University. This license grants no permission to UC Irvine, or Vanderbilt University. This license grants no permission
call products or services derived from this source ACE(TM), TAO(TM), to call products or services derived from this source ACE(TM),
CIAO(TM), or CoSMIC(TM), nor does it grant permission for the name TAO(TM), CIAO(TM), DAnCE(TM), or CoSMIC(TM), nor does it grant
Washington University, UC Irvine, or Vanderbilt University to appear permission for the name Washington University, UC Irvine, or
in their names. Vanderbilt University to appear in their names.
If you have any suggestions, additions, comments, or questions, please If you have any suggestions, additions, comments, or questions, please
let [20]me know. let [21]me know.
[21]Douglas C. Schmidt [22]Douglas C. Schmidt
_________________________________________________________________ _________________________________________________________________
Back to the [22]ACE home page. Back to the [23]ACE home page.
References References
@ -100,11 +100,12 @@ References
12. http://www.cs.wustl.edu/~schmidt/ACE.html 12. http://www.cs.wustl.edu/~schmidt/ACE.html
13. http://www.cs.wustl.edu/~schmidt/TAO.html 13. http://www.cs.wustl.edu/~schmidt/TAO.html
14. http://www.dre.vanderbilt.edu/CIAO/ 14. http://www.dre.vanderbilt.edu/CIAO/
15. http://www.dre.vanderbilt.edu/cosmic/ 15. http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/DAnCE/
16. http://www.dre.vanderbilt.edu/ 16. http://www.dre.vanderbilt.edu/cosmic/
17. http://www.isis.vanderbilt.edu/ 17. http://www.dre.vanderbilt.edu/
18. http://www.cs.wustl.edu/~schmidt/doc-center.html 18. http://www.isis.vanderbilt.edu/
 19. http://www.cs.wustl.edu/~schmidt/commercial-support.html 19. http://www.cs.wustl.edu/~schmidt/doc-center.html
20. mailto:d.schmidt@vanderbilt.edu 20. http://www.cs.wustl.edu/~schmidt/commercial-support.html
21. http://www.dre.vanderbilt.edu/~schmidt/ 21. mailto:d.schmidt@vanderbilt.edu
22. http://www.cs.wustl.edu/ACE.html 22. http://www.dre.vanderbilt.edu/~schmidt/
23. http://www.cs.wustl.edu/ACE.html

1596
dep/ACE_wrappers/ChangeLog
View file

File diff suppressed because it is too large Load diff

34
dep/ACE_wrappers/NEWS
View file

@ -1,3 +1,37 @@
USER VISIBLE CHANGES BETWEEN ACE-5.8.2 and ACE-5.8.3
====================================================
. Two new methods were added to ACE_Pipe: close_read() and close_write().
These methods can be used to close individual pipe handles.
. The ACE::handle_ready() family of methods was changed to prefer using
poll() over select() on platforms where poll() is available. This
preference was previously only used if ACE_HAS_LIMITED_SELECT was set.
The ACE_HAS_LIMITED_SELECT choice is removed, making ACE_HAS_POLL the
setting that switches this preference. The driving reason for this
is that if select() is called to detect changes on a handle whose
values falls outside that which can safely be stored in an fdset,
the handle-setting macros/functions will set/clear bits outside
of the fdset. This results in very weird memory changes, often in
the stack, which are very hard to diagnose. poll()'s operation
does not suffer from this affect. With the growing use of large
numbers of handles and use of ACE_Dev_Poll_Reactor on Linux,
the rate at which this problem was cropping up was increasing.
. Added a simple helper ACE::is_equal() which compares equality of two
objects without using operator==. This is useful for comparing floating
point values.
. Removed all deprecated methods, arguments, files, classes, macros and
anything else we kept for years.
. Removed Irix/Tru64/SCO/Uniware/Cray support
. ACE_Pair has been removed. Users should now use std::pair.
. This is the last micro release that will work with GCC < 3, after x.8.3
support for GCC < 3 will be removed
USER VISIBLE CHANGES BETWEEN ACE-5.8.1 and ACE-5.8.2 USER VISIBLE CHANGES BETWEEN ACE-5.8.1 and ACE-5.8.2
==================================================== ====================================================

17
dep/ACE_wrappers/PROBLEM-REPORT-FORM
View file

@ -1,6 +1,7 @@
[Please use the PRF form below to submit bug reports, problem reports, [Please use the PRF form below to submit bug reports, problem reports,
etc., to the ACE developers and interested users. Send to etc., to the ACE developers and interested users. Send it to
ace-bugs@cs.wustl.edu. If you are using OCI, PrismTech, or ace-bugs@list.isis.vanderbilt.edu, you must be subscribed to the list
in order to be able to post to it. If you are using OCI, PrismTech, or
Riverace's versions of ACE do not send bugs to this mailing list, but Riverace's versions of ACE do not send bugs to this mailing list, but
instead contact those companies for support. Please also send your instead contact those companies for support. Please also send your
PRF as plain ASCII text, _not_ uuencoded or as an attachment. PRF as plain ASCII text, _not_ uuencoded or as an attachment.
@ -15,12 +16,8 @@
browse bugzilla and the ChangeLog files to find out if your problem browse bugzilla and the ChangeLog files to find out if your problem
has been solved in a more recent version of ACE. has been solved in a more recent version of ACE.
To ensure that you see responses, please do one of the following: To subscribe to the list see
http://www.cs.wustl.edu/~schmidt/ACE-mail.html
1) Subscribe to the ace-bugs mail list, by sending email with
contents "subscribe ace-bugs" to majordomo@cs.wustl.edu.
2) Or, monitor the comp.soft-sys.ace newsgroup for responses.
Replace/remove all the explanatory text in brackets before mailing. Replace/remove all the explanatory text in brackets before mailing.
@ -40,10 +37,10 @@
8<----------8<----------8<----------8<----------8<----------8<----------8<---- 8<----------8<----------8<----------8<----------8<----------8<----------8<----
To: ace-bugs@cs.wustl.edu To: ace-bugs@list.isis.vanderbilt.edu
Subject: [area]: [synopsis] Subject: [area]: [synopsis]
ACE VERSION: 5.8.2 ACE VERSION: 5.8.3
HOST MACHINE and OPERATING SYSTEM: HOST MACHINE and OPERATING SYSTEM:
If on Windows based OS's, which version of WINSOCK do you If on Windows based OS's, which version of WINSOCK do you

7
dep/ACE_wrappers/THANKS
View file

@ -2333,6 +2333,12 @@ Rafi <rafi dot net at gmail dot com>
Kannan Ramaswamy <kannan dot ramaswamy at cogcap dot com> Kannan Ramaswamy <kannan dot ramaswamy at cogcap dot com>
Brian Johnson <johnsonb at ociweb dot com> Brian Johnson <johnsonb at ociweb dot com>
Catherine L. Paquin <catherine dot paquin at ngc dot com> Catherine L. Paquin <catherine dot paquin at ngc dot com>
Susan Finster <sfinster at daetwyler-rd dot com>
Frank Preischl <Frank dot Preischl at ids dot de>
Matthew Waller <matthewrwaller at gmail dot com>
Elez <elezsh at gmail dot com>
Ranjit Hande <hande at avaya dot com>
Van Vuong <vanvuong1 at us dot ibm dot com>
I would particularly like to thank Paul Stephenson, who worked with me I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson in the early 1990's. Paul devised the recursive Makefile at Ericsson in the early 1990's. Paul devised the recursive Makefile
@ -2353,6 +2359,7 @@ hear about it. Please see the instructions in
$ACE_ROOT/PROBLEM-REPORT-FORM $ACE_ROOT/PROBLEM-REPORT-FORM
$TAO_ROOT/PROBLEM-REPORT-FORM $TAO_ROOT/PROBLEM-REPORT-FORM
$CIAO_ROOT/PROBLEM-REPORT-FORM $CIAO_ROOT/PROBLEM-REPORT-FORM
$DANCE_ROOT/PROBLEM-REPORT-FORM
for instructions on submitting suggestions or fixes. for instructions on submitting suggestions or fixes.

13
dep/ACE_wrappers/VERSION
View file

@ -1,11 +1,8 @@
This is ACE version 5.8.2, released Sat Sep 04 11:30:18 CEST 2010 This is ACE version 5.8.3, released Wed Oct 27 12:01:05 CEST 2010
If you have any problems with or questions about ACE, please send If you have any problems with or questions about ACE, please send
email to the ACE mailing list (ace-users@cs.wustl.edu), using the form e-mail to the ACE mailing list (ace-bugs@list.isis.vanderbilt.edu),
found in the file PROBLEM-REPORT-FORM. To ensure that you see responses, using the form found in the file PROBLEM-REPORT-FORM. In order
please do one of the following: to post to the list you must subscribe to it.
1) Subscribe to the ace-users mail list, by sending email with See http://www.cs.wustl.edu/~schmidt/ACE-mail.html
contents "subscribe ace-users" to majordomo@cs.wustl.edu.
2) Or, monitor the comp.soft-sys.ace newsgroup for responses.

95
dep/ACE_wrappers/ace/ACE.cpp
View file

@ -1,4 +1,4 @@
// $Id: ACE.cpp 91604 2010-09-02 14:51:58Z vzykov $ // $Id: ACE.cpp 92298 2010-10-21 11:15:17Z johnnyw $
#include "ace/ACE.h" #include "ace/ACE.h"
@ -33,9 +33,9 @@ extern "C" int maxFiles;
#include "ace/ACE.inl" #include "ace/ACE.inl"
#endif /* __ACE_INLINE__ */ #endif /* __ACE_INLINE__ */
#if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) #if defined (ACE_HAS_POLL)
# include "ace/OS_NS_poll.h" # include "ace/OS_NS_poll.h"
#endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ #endif /* ACE_HAS_POLL */
// Open versioned namespace, if enabled by the user. // Open versioned namespace, if enabled by the user.
ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@ -88,10 +88,6 @@ ACE::out_of_handles (int error)
#elif defined (__OpenBSD__) #elif defined (__OpenBSD__)
// OpenBSD appears to return EBADF. // OpenBSD appears to return EBADF.
error == EBADF || error == EBADF ||
#elif defined (__sgi) // irix
error == ENOTSUP ||
#elif defined (DIGITAL_UNIX) // osf1
error == ENOTSUP ||
#endif /* ACE_WIN32 */ #endif /* ACE_WIN32 */
error == ENFILE) error == ENFILE)
return 1; return 1;
@ -2169,28 +2165,29 @@ ACE::handle_ready (ACE_HANDLE handle,
int write_ready, int write_ready,
int exception_ready) int exception_ready)
{ {
#if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) #if defined (ACE_HAS_POLL)
ACE_UNUSED_ARG (write_ready);
ACE_UNUSED_ARG (exception_ready); ACE_UNUSED_ARG (exception_ready);
struct pollfd fds; struct pollfd fds;
fds.fd = handle; fds.fd = handle;
fds.events = read_ready ? POLLIN : POLLOUT; fds.events = read_ready ? POLLIN : 0;
if( write_ready )
{
fds.events |= POLLOUT;
}
fds.revents = 0; fds.revents = 0;
int result = ACE_OS::poll (&fds, 1, timeout); int const result = ACE_OS::poll (&fds, 1, timeout);
#else #else
ACE_Handle_Set handle_set; ACE_Handle_Set handle_set;
handle_set.set_bit (handle); handle_set.set_bit (handle);
// Wait for data or for the timeout to elapse. // Wait for data or for the timeout to elapse.
int select_width; int select_width = 0;
# if defined (ACE_WIN32) #if !defined (ACE_WIN32)
// This arg is ignored on Windows and causes pointer truncation
// warnings on 64-bit compiles.
select_width = 0;
# else
select_width = int (handle) + 1; select_width = int (handle) + 1;
# endif /* ACE_WIN64 */ # endif /* ACE_WIN64 */
int result = ACE_OS::select (select_width, int result = ACE_OS::select (select_width,
@ -2199,8 +2196,7 @@ ACE::handle_ready (ACE_HANDLE handle,
exception_ready ? handle_set.fdset () : 0, // exception_fds. exception_ready ? handle_set.fdset () : 0, // exception_fds.
timeout); timeout);
#endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ #endif /* ACE_HAS_POLL */
switch (result) switch (result)
{ {
case 0: // Timer expired. case 0: // Timer expired.
@ -2221,14 +2217,12 @@ ACE::enter_recv_timedwait (ACE_HANDLE handle,
const ACE_Time_Value *timeout, const ACE_Time_Value *timeout,
int &val) int &val)
{ {
int result = ACE::handle_read_ready (handle, int const result = ACE::handle_read_ready (handle, timeout);
timeout);
if (result == -1) if (result == -1)
return -1; return -1;
ACE::record_and_set_non_blocking_mode (handle, ACE::record_and_set_non_blocking_mode (handle, val);
val);
return result; return result;
} }
@ -2238,21 +2232,18 @@ ACE::enter_send_timedwait (ACE_HANDLE handle,
const ACE_Time_Value *timeout, const ACE_Time_Value *timeout,
int &val) int &val)
{ {
int result = ACE::handle_write_ready (handle, int const result = ACE::handle_write_ready (handle, timeout);
timeout);
if (result == -1) if (result == -1)
return -1; return -1;
ACE::record_and_set_non_blocking_mode (handle, ACE::record_and_set_non_blocking_mode (handle, val);
val);
return result; return result;
} }
void void
ACE::record_and_set_non_blocking_mode (ACE_HANDLE handle, ACE::record_and_set_non_blocking_mode (ACE_HANDLE handle, int &val)
int &val)
{ {
// We need to record whether we are already *in* nonblocking mode, // We need to record whether we are already *in* nonblocking mode,
// so that we can correctly reset the state when we're done. // so that we can correctly reset the state when we're done.
@ -2265,11 +2256,9 @@ ACE::record_and_set_non_blocking_mode (ACE_HANDLE handle,
} }
void void
ACE::restore_non_blocking_mode (ACE_HANDLE handle, ACE::restore_non_blocking_mode (ACE_HANDLE handle, int val)
int val)
{ {
if (ACE_BIT_DISABLED (val, if (ACE_BIT_DISABLED (val, ACE_NONBLOCK))
ACE_NONBLOCK))
{ {
// Save/restore errno. // Save/restore errno.
ACE_Errno_Guard error (errno); ACE_Errno_Guard error (errno);
@ -2279,11 +2268,9 @@ ACE::restore_non_blocking_mode (ACE_HANDLE handle,
} }
} }
/// Format buffer into printable format. This is useful for debugging.
// Format buffer into printable format. This is useful for debugging. /// Portions taken from mdump by J.P. Knight (J.P.Knight@lut.ac.uk)
// Portions taken from mdump by J.P. Knight (J.P.Knight@lut.ac.uk) /// Modifications by Todd Montgomery.
// Modifications by Todd Montgomery.
size_t size_t
ACE::format_hexdump (const char *buffer, ACE::format_hexdump (const char *buffer,
size_t size, size_t size,
@ -2528,7 +2515,7 @@ ACE::handle_timed_complete (ACE_HANDLE h,
{ {
ACE_TRACE ("ACE::handle_timed_complete"); ACE_TRACE ("ACE::handle_timed_complete");
#if !defined (ACE_WIN32) && defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) #if !defined (ACE_WIN32) && defined (ACE_HAS_POLL)
struct pollfd fds; struct pollfd fds;
@ -2541,7 +2528,7 @@ ACE::handle_timed_complete (ACE_HANDLE h,
ACE_Handle_Set wr_handles; ACE_Handle_Set wr_handles;
rd_handles.set_bit (h); rd_handles.set_bit (h);
wr_handles.set_bit (h); wr_handles.set_bit (h);
#endif /* !ACE_WIN32 && ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ #endif /* !ACE_WIN32 && ACE_HAS_POLL */
#if defined (ACE_WIN32) #if defined (ACE_WIN32)
// Winsock is different - it sets the exception bit for failed connect, // Winsock is different - it sets the exception bit for failed connect,
@ -2561,7 +2548,7 @@ ACE::handle_timed_complete (ACE_HANDLE h,
ex_handles, ex_handles,
timeout); timeout);
#else #else
# if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) # if defined (ACE_HAS_POLL)
int n = ACE_OS::poll (&fds, 1, timeout); int n = ACE_OS::poll (&fds, 1, timeout);
@ -2579,7 +2566,7 @@ ACE::handle_timed_complete (ACE_HANDLE h,
wr_handles, wr_handles,
0, 0,
timeout); timeout);
# endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ # endif /* ACE_HAS_POLL */
#endif /* ACE_WIN32 */ #endif /* ACE_WIN32 */
// If we failed to connect within the time period allocated by the // If we failed to connect within the time period allocated by the
@ -2613,18 +2600,18 @@ ACE::handle_timed_complete (ACE_HANDLE h,
} }
#else #else
if (is_tli) if (is_tli)
# if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) # if defined (ACE_HAS_POLL)
need_to_check = (fds.revents & POLLIN) && !(fds.revents & POLLOUT); need_to_check = (fds.revents & POLLIN) && !(fds.revents & POLLOUT);
# else # else
need_to_check = rd_handles.is_set (h) && !wr_handles.is_set (h); need_to_check = rd_handles.is_set (h) && !wr_handles.is_set (h);
# endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ # endif /* ACE_HAS_POLL */
else else
# if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) # if defined (ACE_HAS_POLL)
need_to_check = (fds.revents & POLLIN); need_to_check = (fds.revents & POLLIN);
# else # else
need_to_check = true; need_to_check = true;
# endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ # endif /* ACE_HAS_POLL */
#endif /* ACE_WIN32 */ #endif /* ACE_WIN32 */
if (need_to_check) if (need_to_check)
@ -2686,7 +2673,7 @@ ACE::handle_timed_accept (ACE_HANDLE listener,
if (listener == ACE_INVALID_HANDLE) if (listener == ACE_INVALID_HANDLE)
return -1; return -1;
#if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) #if defined (ACE_HAS_POLL)
struct pollfd fds; struct pollfd fds;
@ -2698,29 +2685,25 @@ ACE::handle_timed_accept (ACE_HANDLE listener,
// Use the select() implementation rather than poll(). // Use the select() implementation rather than poll().
ACE_Handle_Set rd_handle; ACE_Handle_Set rd_handle;
rd_handle.set_bit (listener); rd_handle.set_bit (listener);
#endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ #endif /* ACE_HAS_POLL */
// We need a loop here if <restart> is enabled. // We need a loop here if <restart> is enabled.
for (;;) for (;;)
{ {
#if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) #if defined (ACE_HAS_POLL)
int n = ACE_OS::poll (&fds, 1, timeout); int n = ACE_OS::poll (&fds, 1, timeout);
#else #else
int select_width; int select_width = 0;
# if defined (ACE_WIN32) # if !defined (ACE_WIN32)
// This arg is ignored on Windows and causes pointer truncation
// warnings on 64-bit compiles.
select_width = 0;
# else
select_width = int (listener) + 1; select_width = int (listener) + 1;
# endif /* ACE_WIN32 */ # endif /* ACE_WIN32 */
int n = ACE_OS::select (select_width, int n = ACE_OS::select (select_width,
rd_handle, 0, 0, rd_handle, 0, 0,
timeout); timeout);
#endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ #endif /* ACE_HAS_POLL */
switch (n) switch (n)
{ {

12
dep/ACE_wrappers/ace/ACE.h
View file

@ -4,7 +4,7 @@
/** /**
* @file ACE.h * @file ACE.h
* *
* $Id: ACE.h 91603 2010-09-01 21:02:28Z shuston $ * $Id: ACE.h 92060 2010-09-27 18:08:48Z johnnyw $
* *
* This file contains value added ACE functions that extend the * This file contains value added ACE functions that extend the
* behavior of the UNIX and Win32 OS calls. * behavior of the UNIX and Win32 OS calls.
@ -90,7 +90,7 @@ namespace ACE
/// Simple wildcard matching function supporting '*' and '?' /// Simple wildcard matching function supporting '*' and '?'
/// return true if string s matches pattern. /// return true if string s matches pattern.
/// If character_classes is true, '[' is treated as a wildcard character /// If @a character_classes is true, '[' is treated as a wildcard character
/// as described in the fnmatch() POSIX API. The following POSIX "bracket /// as described in the fnmatch() POSIX API. The following POSIX "bracket
/// expression" features are not implemented: collating symbols, equivalence /// expression" features are not implemented: collating symbols, equivalence
/// class expressions, and character class expressions. The POSIX locale is /// class expressions, and character class expressions. The POSIX locale is
@ -642,6 +642,14 @@ namespace ACE
/// Computes the base 2 logarithm of {num}. /// Computes the base 2 logarithm of {num}.
ACE_NAMESPACE_INLINE_FUNCTION u_long log2 (u_long num); ACE_NAMESPACE_INLINE_FUNCTION u_long log2 (u_long num);
/// Helper to avoid comparing floating point values with ==
/// (uses < and > operators).
template <typename T>
bool is_equal (const T& a, const T& b)
{
return !((a < b) || (a > b));
}
/// Hex conversion utility. /// Hex conversion utility.
extern ACE_Export ACE_TCHAR nibble2hex (u_int n); extern ACE_Export ACE_TCHAR nibble2hex (u_int n);

29
dep/ACE_wrappers/ace/ACE.inl
View file

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
// //
// $Id: ACE.inl 87366 2009-11-05 20:16:30Z olli $ // $Id: ACE.inl 91813 2010-09-17 07:52:52Z johnnyw $
#include "ace/OS_NS_unistd.h" #include "ace/OS_NS_unistd.h"
#include "ace/OS_NS_Thread.h" #include "ace/OS_NS_Thread.h"
@ -238,36 +238,21 @@ ACE::recv_i (ACE_HANDLE handle, void *buf, size_t len)
} }
ACE_INLINE int ACE_INLINE int
ACE::handle_read_ready (ACE_HANDLE handle, ACE::handle_read_ready (ACE_HANDLE handle, const ACE_Time_Value *timeout)
const ACE_Time_Value *timeout)
{ {
return ACE::handle_ready (handle, return ACE::handle_ready (handle, timeout, 1, 0, 0);
timeout,
1,
0,
0);
} }
ACE_INLINE int ACE_INLINE int
ACE::handle_write_ready (ACE_HANDLE handle, ACE::handle_write_ready (ACE_HANDLE handle, const ACE_Time_Value *timeout)
const ACE_Time_Value *timeout)
{ {
return ACE::handle_ready (handle, return ACE::handle_ready (handle, timeout, 0, 1, 0);
timeout,
0,
1,
0);
} }
ACE_INLINE int ACE_INLINE int
ACE::handle_exception_ready (ACE_HANDLE handle, ACE::handle_exception_ready (ACE_HANDLE handle, const ACE_Time_Value *timeout)
const ACE_Time_Value *timeout)
{ {
return ACE::handle_ready (handle, return ACE::handle_ready (handle, timeout, 0, 0, 1);
timeout,
0,
0,
1);
} }
ACE_INLINE void ACE_INLINE void

6
dep/ACE_wrappers/ace/ACE_export.h
View file

@ -1,5 +1,5 @@
// -*- C++ -*- // -*- C++ -*-
// $Id: ACE_export.h 80826 2008-03-04 14:51:23Z wotte $ // $Id: ACE_export.h 91683 2010-09-09 09:07:49Z johnnyw $
// Definition for Win32 Export directives. // Definition for Win32 Export directives.
// This file is generated automatically by // This file is generated automatically by
// generate_export_file.pl // generate_export_file.pl
@ -53,9 +53,7 @@
#if defined (__ACE_INLINE__) #if defined (__ACE_INLINE__)
# if defined (_MSC_VER) || defined (__MINGW32__) || defined (CYGWIN32) || \ # if defined (_MSC_VER) || defined (__MINGW32__) || defined (CYGWIN32) || \
(defined (__SUNPRO_CC) && __SUNPRO_CC >= 0x560) || \ (defined (__SUNPRO_CC) && __SUNPRO_CC >= 0x560) || \
(defined (__HP_aCC) && (__HP_aCC >= 60500)) || \ (defined (__HP_aCC) && (__HP_aCC >= 60500))
(defined (__sgi) && \
defined (_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
# define ACE_NAMESPACE_INLINE_FUNCTION inline # define ACE_NAMESPACE_INLINE_FUNCTION inline
# else # else
# define ACE_NAMESPACE_INLINE_FUNCTION ACE_NAMESPACE_STORAGE_CLASS inline # define ACE_NAMESPACE_INLINE_FUNCTION ACE_NAMESPACE_STORAGE_CLASS inline

43
dep/ACE_wrappers/ace/Acceptor.cpp
View file

@ -1,4 +1,4 @@
// $Id: Acceptor.cpp 91604 2010-09-02 14:51:58Z vzykov $ // $Id: Acceptor.cpp 91623 2010-09-06 09:30:59Z sma $
#ifndef ACE_ACCEPTOR_CPP #ifndef ACE_ACCEPTOR_CPP
#define ACE_ACCEPTOR_CPP #define ACE_ACCEPTOR_CPP
@ -10,12 +10,10 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */ #endif /* ACE_LACKS_PRAGMA_ONCE */
#include "ace/Acceptor.h" #include "ace/Acceptor.h"
#include "ace/Handle_Set.h"
#include "ace/Svc_Handler.h" #include "ace/Svc_Handler.h"
#include "ace/WFMO_Reactor.h" #include "ace/WFMO_Reactor.h"
#include "ace/OS_NS_stdio.h" #include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_string.h" #include "ace/OS_NS_string.h"
#include "ace/OS_NS_sys_select.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@ -365,17 +363,9 @@ template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listener) ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listener)
{ {
ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input"); ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input");
ACE_Handle_Set conn_handle;
// Default is "timeout (0, 0)," which means "poll." // Default is "timeout (0, 0)," which means "poll."
ACE_Time_Value timeout; ACE_Time_Value timeout;
# if defined (ACE_WIN32)
// This arg is ignored on Windows and causes pointer truncation
// warnings on 64-bit compiles
int select_width = 0;
# else
int select_width = int (listener) + 1;
# endif /* ACE_WIN32 */
// Accept connections from clients. Note that a loop is used for two // Accept connections from clients. Note that a loop is used for two
// reasons: // reasons:
@ -387,6 +377,11 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene
// 2. It allows the TLI_SAP::ACE_Acceptor class to work correctly (don't // 2. It allows the TLI_SAP::ACE_Acceptor class to work correctly (don't
// ask -- TLI is *horrible*...). // ask -- TLI is *horrible*...).
// Ensure that errno is preserved in case the ACE::handle_read_ready()
// method resets it in the loop bellow. We are actually supposed to
// ignore any errors from this loop, hence the return 0 following it.
ACE_Errno_Guard error (errno);
// @@ What should we do if any of the substrategies fail? Right // @@ What should we do if any of the substrategies fail? Right
// now, we just print out a diagnostic message if <ACE::debug> // now, we just print out a diagnostic message if <ACE::debug>
// returns > 0 and return 0 (which means that the Acceptor remains // returns > 0 and return 0 (which means that the Acceptor remains
@ -401,9 +396,11 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene
if (this->make_svc_handler (svc_handler) == -1) if (this->make_svc_handler (svc_handler) == -1)
{ {
if (ACE::debug ()) if (ACE::debug ())
{
ACE_DEBUG ((LM_DEBUG, ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("%p\n"), ACE_TEXT ("%p\n"),
ACE_TEXT ("make_svc_handler"))); ACE_TEXT ("make_svc_handler")));
}
return 0; return 0;
} }
// Accept connection into the Svc_Handler. // Accept connection into the Svc_Handler.
@ -412,10 +409,18 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene
// Note that <accept_svc_handler> closes the <svc_handler> // Note that <accept_svc_handler> closes the <svc_handler>
// on failure. // on failure.
if (ACE::debug ()) if (ACE::debug ())
{
ACE_DEBUG ((LM_DEBUG, ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("%p\n"), ACE_TEXT ("%p\n"),
ACE_TEXT ("accept_svc_handler"))); ACE_TEXT ("accept_svc_handler")));
return this->handle_accept_error (); }
const int ret = this->handle_accept_error ();
if (ret == -1)
{
// Ensure that the errno from the above call propegates.
error = errno;
}
return ret;
} }
// Activate the <svc_handler> using the designated concurrency // Activate the <svc_handler> using the designated concurrency
// strategy (note that this method becomes responsible for // strategy (note that this method becomes responsible for
@ -427,23 +432,17 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene
// on failure. // on failure.
if (ACE::debug ()) if (ACE::debug ())
{
ACE_DEBUG ((LM_DEBUG, ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("%p\n"), ACE_TEXT ("%p\n"),
ACE_TEXT ("activate_svc_handler"))); ACE_TEXT ("activate_svc_handler")));
}
return 0; return 0;
} }
conn_handle.set_bit (listener);
}
// Now, check to see if there is another connection pending and // Now, check to see if there is another connection pending and
// break out of the loop if there is none. // break out of the loop if there is none.
while (this->use_select_ } while (this->use_select_ &&
&& ACE_OS::select (select_width, ACE::handle_read_ready (listener, &timeout) == 1);
conn_handle,
0,
0,
&timeout) == 1);
return 0; return 0;
} }

2
dep/ACE_wrappers/ace/Arg_Shifter.cpp
View file

@ -1,4 +1,4 @@
// $Id: Arg_Shifter.cpp 91286 2010-08-05 09:04:31Z johnnyw $ // $Id: Arg_Shifter.cpp 91286 2010-08-05 09:04:31Z johnnyw $
#ifndef ACE_ARG_SHIFTER_T_CPP #ifndef ACE_ARG_SHIFTER_T_CPP
#define ACE_ARG_SHIFTER_T_CPP #define ACE_ARG_SHIFTER_T_CPP

29
dep/ACE_wrappers/ace/Array.h
View file

@ -1,29 +0,0 @@
/* -*- C++ -*- */
//=============================================================================
/**
* @file Array.h
*
* $Id: Array.h 80826 2008-03-04 14:51:23Z wotte $
*
* @deprecated
*
* @note This file has been deprecated and will soon go away. You
* should directly include "Containers_T.h" instead.
*
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
*/
//=============================================================================
#ifndef ACE_ARRAY_H
#define ACE_ARRAY_H
#include /**/ "ace/pre.h"
#include "ace/Containers_T.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include /**/ "ace/post.h"
#endif /* ACE_ARRAY_H */

9
dep/ACE_wrappers/ace/Asynch_Acceptor.cpp
View file

@ -1,5 +1,5 @@
/* -*- C++ -*- */ /* -*- C++ -*- */
// $Id: Asynch_Acceptor.cpp 91286 2010-08-05 09:04:31Z johnnyw $ // $Id: Asynch_Acceptor.cpp 91693 2010-09-09 12:57:54Z johnnyw $
#ifndef ACE_ASYNCH_ACCEPTOR_C #ifndef ACE_ASYNCH_ACCEPTOR_C
#define ACE_ASYNCH_ACCEPTOR_C #define ACE_ASYNCH_ACCEPTOR_C
@ -445,13 +445,6 @@ ACE_Asynch_Acceptor<HANDLER>::make_handler (void)
return handler; return handler;
} }
/* static */
template <class HANDLER> size_t
ACE_Asynch_Acceptor<HANDLER>::address_size (void)
{
return sizeof (sockaddr) + sizeof (sockaddr_in);
}
template <class HANDLER> bool template <class HANDLER> bool
ACE_Asynch_Acceptor<HANDLER>::pass_addresses (void) const ACE_Asynch_Acceptor<HANDLER>::pass_addresses (void) const
{ {

7
dep/ACE_wrappers/ace/Asynch_Acceptor.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Asynch_Acceptor.h * @file Asynch_Acceptor.h
* *
* $Id: Asynch_Acceptor.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: Asynch_Acceptor.h 91693 2010-09-09 12:57:54Z johnnyw $
* *
* @author Irfan Pyarali (irfan@cs.wustl.edu) * @author Irfan Pyarali (irfan@cs.wustl.edu)
*/ */
@ -211,11 +211,6 @@ public:
/// Set bytes to be read with the <accept> call. /// Set bytes to be read with the <accept> call.
virtual void bytes_to_read (size_t new_value); virtual void bytes_to_read (size_t new_value);
/// @deprecated address_size() assumes IPv4 use, so is not always valid.
/// This method will be removed after ACE 5.5. Internal uses have been
/// changes to base needed sizes on the addr_family_ member.
static size_t address_size (void);
protected: protected:
/// This is called when an outstanding accept completes. /// This is called when an outstanding accept completes.

28
dep/ACE_wrappers/ace/Asynch_Connector.cpp
View file

@ -1,4 +1,4 @@
// $Id: Asynch_Connector.cpp 80826 2008-03-04 14:51:23Z wotte $ // $Id: Asynch_Connector.cpp 92069 2010-09-28 11:38:59Z johnnyw $
#ifndef ACE_ASYNCH_CONNECTOR_CPP #ifndef ACE_ASYNCH_CONNECTOR_CPP
#define ACE_ASYNCH_CONNECTOR_CPP #define ACE_ASYNCH_CONNECTOR_CPP
@ -221,32 +221,6 @@ ACE_Asynch_Connector<HANDLER>::parse_address (const ACE_Asynch_Connect::Result &
remote_address.set (reinterpret_cast<sockaddr_in *> (&remote_addr), remote_address.set (reinterpret_cast<sockaddr_in *> (&remote_addr),
remote_size); remote_size);
#if 0
// @@ Just debugging.
char local_address_buf [BUFSIZ];
char remote_address_buf [BUFSIZ];
if (local_address.addr_to_string (local_address_buf,
sizeof local_address_buf) == -1)
ACE_ERROR ((LM_ERROR,
"Error:%m:can't obtain local_address's address string"));
ACE_DEBUG ((LM_DEBUG,
"ACE_Asynch_Connector<HANDLER>::parse_address : "
"Local address %s\n",
local_address_buf));
if (remote_address.addr_to_string (remote_address_buf,
sizeof remote_address_buf) == -1)
ACE_ERROR ((LM_ERROR,
"Error:%m:can't obtain remote_address's address string"));
ACE_DEBUG ((LM_DEBUG,
"ACE_Asynch_Connector<HANDLER>::parse_address : "
"Remote address %s\n",
remote_address_buf));
#endif /* 0 */
return; return;
} }

2
dep/ACE_wrappers/ace/Atomic_Op.inl
View file

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
// //
// $Id: Atomic_Op.inl 89905 2010-04-16 13:04:47Z johnnyw $ // $Id: Atomic_Op.inl 91813 2010-09-17 07:52:52Z johnnyw $
#if defined (ACE_HAS_INTRINSIC_INTERLOCKED) #if defined (ACE_HAS_INTRINSIC_INTERLOCKED)
# include "ace/os_include/os_intrin.h" # include "ace/os_include/os_intrin.h"

4
dep/ACE_wrappers/ace/Atomic_Op_T.cpp
View file

@ -1,4 +1,4 @@
// $Id: Atomic_Op_T.cpp 91287 2010-08-05 10:30:49Z johnnyw $ // $Id: Atomic_Op_T.cpp 92052 2010-09-27 14:20:22Z vzykov $
#ifndef ACE_ATOMIC_OP_T_CPP #ifndef ACE_ATOMIC_OP_T_CPP
#define ACE_ATOMIC_OP_T_CPP #define ACE_ATOMIC_OP_T_CPP
@ -38,7 +38,7 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::dump (void) const
// ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::dump"); // ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::dump");
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
this->mutex_.dump (); this->mutex_.dump ();
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
#endif /* ACE_HAS_DUMP */ #endif /* ACE_HAS_DUMP */
} }

41
dep/ACE_wrappers/ace/Atomic_Op_T.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Atomic_Op_T.h * @file Atomic_Op_T.h
* *
* $Id: Atomic_Op_T.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: Atomic_Op_T.h 92353 2010-10-25 06:34:35Z johnnyw $
* *
* @author Douglas C. Schmidt <schmidt@uci.edu> * @author Douglas C. Schmidt <schmidt@uci.edu>
*/ */
@ -220,11 +220,12 @@ public:
ACE_Atomic_Op_Ex (ACE_Atomic_Op_Ex<ACE_LOCK, TYPE> const &); ACE_Atomic_Op_Ex (ACE_Atomic_Op_Ex<ACE_LOCK, TYPE> 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 * possible to acquire the lock explicitly, which can be useful in
* some cases if you instantiate the <ACE_Atomic_Op_Ex> with an * some cases if you instantiate the ACE_Atomic_Op_Ex with an
* ACE_Recursive_Mutex or ACE_Process_Mutex. @note the right * ACE_Recursive_Mutex or ACE_Process_Mutex.
* 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); ACE_LOCK & mutex (void);
@ -274,10 +275,10 @@ public:
/// Manage copying... /// Manage copying...
ACE_Atomic_Op (ACE_Atomic_Op<ACE_LOCK, TYPE> const & c); ACE_Atomic_Op (ACE_Atomic_Op<ACE_LOCK, TYPE> const & c);
/// Atomically assign rhs to @c value_. /// Atomically assign @a rhs to @c value_.
ACE_Atomic_Op<ACE_LOCK, TYPE> & operator= (arg_type rhs); ACE_Atomic_Op<ACE_LOCK, TYPE> & operator= (arg_type rhs);
/// Atomically assign <rhs> to @c value_. /// Atomically assign @a rhs to @c value_.
ACE_Atomic_Op<ACE_LOCK, TYPE> & operator= ( ACE_Atomic_Op<ACE_LOCK, TYPE> & operator= (
ACE_Atomic_Op<ACE_LOCK, TYPE> const & rhs); ACE_Atomic_Op<ACE_LOCK, TYPE> const & rhs);
@ -296,25 +297,25 @@ public:
/// Atomically post-decrement @c value_. /// Atomically post-decrement @c value_.
TYPE operator-- (int); TYPE operator-- (int);
/// Atomically decrement @c value_ by rhs. /// Atomically decrement @c value_ by @a rhs.
TYPE operator-= (arg_type rhs); TYPE operator-= (arg_type rhs);
/// Atomically compare @c value_ with rhs. /// Atomically compare @c value_ with @a rhs.
bool operator== (arg_type rhs) const; bool operator== (arg_type rhs) const;
/// Atomically compare @c value_ with rhs. /// Atomically compare @c value_ with @a rhs.
bool operator!= (arg_type rhs) const; bool operator!= (arg_type rhs) const;
/// Atomically check if @c value_ greater than or equal to rhs. /// Atomically check if @c value_ greater than or equal to @a rhs.
bool operator>= (arg_type rhs) const; bool operator>= (arg_type rhs) const;
/// Atomically check if @c value_ greater than rhs. /// Atomically check if @c value_ greater than @a rhs.
bool operator> (arg_type rhs) const; bool operator> (arg_type rhs) const;
/// Atomically check if @c value_ less than or equal to rhs. /// Atomically check if @c value_ less than or equal to @a rhs.
bool operator<= (arg_type rhs) const; bool operator<= (arg_type rhs) const;
/// Atomically check if @c value_ less than rhs. /// Atomically check if @c value_ less than @a rhs.
bool operator< (arg_type rhs) const; bool operator< (arg_type rhs) const;
/// Explicitly return @c value_. /// Explicitly return @c value_.
@ -323,18 +324,6 @@ public:
/// Dump the state of an object. /// Dump the state of an object.
void dump (void) const; void dump (void) const;
/**
* 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.
*
* @deprecated This member function is deprecated and so may go away in
* the future. If you need access to the underlying mutex, consider
* using the ACE_Atomic_Op_Ex template instead.
*/
ACE_LOCK & mutex (void);
/** /**
* Explicitly return @c value_ (by reference). This gives the user * Explicitly return @c value_ (by reference). This gives the user
* full, unrestricted access to the underlying value. This method * full, unrestricted access to the underlying value. This method

10
dep/ACE_wrappers/ace/Atomic_Op_T.inl
View file

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
// //
// $Id: Atomic_Op_T.inl 80826 2008-03-04 14:51:23Z wotte $ // $Id: Atomic_Op_T.inl 91688 2010-09-09 11:21:50Z johnnyw $
#include "ace/Guard_T.h" #include "ace/Guard_T.h"
@ -322,14 +322,6 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::dump (void) const
#endif /* ACE_HAS_DUMP */ #endif /* ACE_HAS_DUMP */
return; return;
} }
template <class ACE_LOCK, class TYPE>
ACE_INLINE ACE_LOCK &
ACE_Atomic_Op<ACE_LOCK, TYPE>::mutex (void)
{
return this->own_mutex_;
}
template <class ACE_LOCK, class TYPE> template <class ACE_LOCK, class TYPE>
ACE_INLINE TYPE & ACE_INLINE TYPE &
ACE_Atomic_Op<ACE_LOCK, TYPE>::value_i (void) ACE_Atomic_Op<ACE_LOCK, TYPE>::value_i (void)

4
dep/ACE_wrappers/ace/Auto_Event.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Auto_Event.h * @file Auto_Event.h
* *
* $Id: Auto_Event.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: Auto_Event.h 91781 2010-09-15 12:49:15Z johnnyw $
* *
* Moved from Synch.h. * Moved from Synch.h.
* *
@ -32,7 +32,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
* @brief Auto Events. * @brief Auto Events.
* *
* Specialization of Event mechanism which wakes up one waiting * Specialization of Event mechanism which wakes up one waiting
* thread on <signal>. All platforms support process-scope locking * thread on @c signal. All platforms support process-scope locking
* support. However, only Win32 platforms support global naming and * support. However, only Win32 platforms support global naming and
* system-scope locking support. * system-scope locking support.
*/ */

24
dep/ACE_wrappers/ace/Auto_IncDec_T.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Auto_IncDec_T.h * @file Auto_IncDec_T.h
* *
* $Id: Auto_IncDec_T.h 84675 2009-03-02 11:44:35Z johnnyw $ * $Id: Auto_IncDec_T.h 92353 2010-10-25 06:34:35Z johnnyw $
* *
* @author Edan Ayal <EdanA@cti2.com> * @author Edan Ayal <EdanA@cti2.com>
*/ */
@ -34,14 +34,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
* *
* This data structure is meant to be used within a method, * This data structure is meant to be used within a method,
* function, or scope. The actual parameter given for the * function, or scope. The actual parameter given for the
* <ACE_SAFELY_INCREMENTABLE_DECREMENTABLE> template parameter * @c ACE_SAFELY_INCREMENTABLE_DECREMENTABLE template parameter
* must provide at least operators ++ and --. * must provide at least operators ++ and --.
*/ */
template <class ACE_SAFELY_INCREMENTABLE_DECREMENTABLE> template <class ACE_SAFELY_INCREMENTABLE_DECREMENTABLE>
class ACE_Auto_IncDec class ACE_Auto_IncDec : private ACE_Copy_Disabled
{ {
public: public:
/// Implicitly increment the counter. /// Implicitly increment the counter.
ACE_Auto_IncDec (ACE_SAFELY_INCREMENTABLE_DECREMENTABLE &counter); ACE_Auto_IncDec (ACE_SAFELY_INCREMENTABLE_DECREMENTABLE &counter);
@ -52,16 +51,9 @@ public:
void dump (void) const; void dump (void) const;
protected: protected:
/// Reference to the <ACE_SAFELY_INCREMENTABLE_DECREMENTABLE> counter /// Reference to the @c ACE_SAFELY_INCREMENTABLE_DECREMENTABLE counter
/// we're incrementing/decrementing. /// we're incrementing/decrementing.
ACE_SAFELY_INCREMENTABLE_DECREMENTABLE &counter_; ACE_SAFELY_INCREMENTABLE_DECREMENTABLE &counter_;
private:
// = Prevent assignment and initialization.
ACE_UNIMPLEMENTED_FUNC (void operator= (const
ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE> &))
ACE_UNIMPLEMENTED_FUNC (ACE_Auto_IncDec (const
ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE> &))
}; };
ACE_END_VERSIONED_NAMESPACE_DECL ACE_END_VERSIONED_NAMESPACE_DECL
@ -72,14 +64,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
#include "ace/Auto_IncDec_T.cpp" #include "ace/Auto_IncDec_T.cpp"
// On Win32 platforms, this code will be included as template source
// code and will not be inlined. Therefore, we first turn off
// ACE_INLINE, set it to be nothing, include the code, and then turn
// ACE_INLINE back to its original setting. All this nonsense is
// necessary, since the generic template code that needs to be
// specialized cannot be inlined, else the compiler will ignore the
// specialization code. Also, the specialization code *must* be
// inlined or the compiler will ignore the specializations.
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)

22
dep/ACE_wrappers/ace/Barrier.cpp
View file

@ -1,4 +1,4 @@
// $Id: Barrier.cpp 91286 2010-08-05 09:04:31Z johnnyw $ // $Id: Barrier.cpp 92069 2010-09-28 11:38:59Z johnnyw $
#include "ace/Barrier.h" #include "ace/Barrier.h"
@ -167,26 +167,6 @@ ACE_Thread_Barrier::dump (void) const
#endif /* ACE_HAS_DUMP */ #endif /* ACE_HAS_DUMP */
} }
#if 0
ACE_ALLOC_HOOK_DEFINE(ACE_Process_Barrier)
ACE_Process_Barrier::ACE_Process_Barrier (u_int count,
const ACE_TCHAR *name)
: ACE_Barrier (count, USYNC_PROCESS, name)
{
// ACE_TRACE ("ACE_Process_Barrier::ACE_Process_Barrier");
}
void
ACE_Process_Barrier::dump (void) const
{
#if defined (ACE_HAS_DUMP)
// ACE_TRACE ("ACE_Process_Barrier::dump");
ACE_Barrier::dump ();
#endif /* ACE_HAS_DUMP */
}
#endif /* 0 */
ACE_END_VERSIONED_NAMESPACE_DECL ACE_END_VERSIONED_NAMESPACE_DECL
#endif /* ACE_HAS_THREADS */ #endif /* ACE_HAS_THREADS */

25
dep/ACE_wrappers/ace/Barrier.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Barrier.h * @file Barrier.h
* *
* $Id: Barrier.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: Barrier.h 92069 2010-09-28 11:38:59Z johnnyw $
* *
* Moved from Synch.h. * Moved from Synch.h.
* *
@ -156,29 +156,6 @@ private:
ACE_Barrier (const ACE_Barrier &); ACE_Barrier (const ACE_Barrier &);
}; };
#if 0
/**
* @class ACE_Process_Barrier
*
* @brief Implements "barrier synchronization" using ACE_Process_Mutexes!
*
* This class is just a simple wrapper for ACE_Barrier that
* selects the USYNC_PROCESS variant for the locks.
*/
class ACE_Export ACE_Process_Barrier : public ACE_Barrier
{
public:
/// Create a Process_Barrier, passing in the optional @a name.
ACE_Process_Barrier (unsigned int count, const ACE_TCHAR *name = 0);
/// Dump the state of an object.
void dump (void) const;
/// Declare the dynamic allocation hooks.
ACE_ALLOC_HOOK_DECLARE;
};
#endif /* 0 */
/** /**
* @class ACE_Thread_Barrier * @class ACE_Thread_Barrier
* *

6
dep/ACE_wrappers/ace/Bound_Ptr.inl
View file

@ -1,5 +1,5 @@
/* -*- C++ -*- */ /* -*- C++ -*- */
// $Id: Bound_Ptr.inl 82723 2008-09-16 09:35:44Z johnnyw $ // $Id: Bound_Ptr.inl 91626 2010-09-07 10:59:20Z johnnyw $
// Bound_Ptr.i // Bound_Ptr.i
@ -67,7 +67,7 @@ ACE_Bound_Ptr_Counter<ACE_LOCK>::detach_strong (ACE_Bound_Ptr_Counter<ACE_LOCK>*
counter->obj_ref_count_ = -1; counter->obj_ref_count_ = -1;
if (--counter->self_ref_count_ == 0) if (--counter->self_ref_count_ == 0)
// Since counter contains the lock held by the ACE_Guard, the // Since counter contains the lock held by the guard, the
// guard needs to be released before freeing the memory holding // guard needs to be released before freeing the memory holding
// the lock. So save the pointer to free, then release, then // the lock. So save the pointer to free, then release, then
// free. // free.
@ -112,7 +112,7 @@ ACE_Bound_Ptr_Counter<ACE_LOCK>::detach_weak (ACE_Bound_Ptr_Counter<ACE_LOCK>* c
ACE_GUARD (ACE_LOCK, guard, counter->lock_); ACE_GUARD (ACE_LOCK, guard, counter->lock_);
if (--counter->self_ref_count_ == 0) if (--counter->self_ref_count_ == 0)
// Since counter contains the lock held by the ACE_Guard, the // Since counter contains the lock held by the guard, the
// guard needs to be released before freeing the memory holding // guard needs to be released before freeing the memory holding
// the lock. So save the pointer to free, then release, then // the lock. So save the pointer to free, then release, then
// free. // free.

25
dep/ACE_wrappers/ace/CDR_Base.cpp
View file

@ -1,4 +1,4 @@
// $Id: CDR_Base.cpp 91287 2010-08-05 10:30:49Z johnnyw $ // $Id: CDR_Base.cpp 91685 2010-09-09 09:35:14Z johnnyw $
#include "ace/CDR_Base.h" #include "ace/CDR_Base.h"
@ -774,27 +774,4 @@ ACE_CDR::LongDouble::operator ACE_CDR::LongDouble::NativeImpl () const
} }
#endif /* NONNATIVE_LONGDOUBLE */ #endif /* NONNATIVE_LONGDOUBLE */
#if defined(_UNICOS) && !defined(_CRAYMPP)
// placeholders to get things compiling
ACE_CDR::Float::Float (void)
{
}
ACE_CDR::Float::Float (const float & /* init */)
{
}
ACE_CDR::Float &
ACE_CDR::Float::operator= (const float & /* rhs */)
{
return *this;
}
bool
ACE_CDR::Float::operator!= (const ACE_CDR::Float & /* rhs */) const
{
return false;
}
#endif /* _UNICOS */
ACE_END_VERSIONED_NAMESPACE_DECL ACE_END_VERSIONED_NAMESPACE_DECL

10
dep/ACE_wrappers/ace/CDR_Base.h
View file

@ -4,7 +4,7 @@
/** /**
* @file CDR_Base.h * @file CDR_Base.h
* *
* $Id: CDR_Base.h 88488 2010-01-12 14:20:13Z olli $ * $Id: CDR_Base.h 91685 2010-09-09 09:35:14Z johnnyw $
* *
* ACE Common Data Representation (CDR) basic types. * ACE Common Data Representation (CDR) basic types.
* *
@ -209,7 +209,7 @@ public:
# if (defined (_MSC_VER)) || (defined (__BORLANDC__)) # if (defined (_MSC_VER)) || (defined (__BORLANDC__))
typedef __int64 LongLong; typedef __int64 LongLong;
# elif ACE_SIZEOF_LONG == 8 && !defined(_CRAYMPP) # elif ACE_SIZEOF_LONG == 8
typedef long LongLong; typedef long LongLong;
# elif defined(__TANDEM) # elif defined(__TANDEM)
typedef long long LongLong; typedef long long LongLong;
@ -263,12 +263,6 @@ public:
# else /* ACE_SIZEOF_INT != 4 */ # else /* ACE_SIZEOF_INT != 4 */
// Applications will probably have trouble with this. // Applications will probably have trouble with this.
char f[4]; char f[4];
# if defined(_UNICOS) && !defined(_CRAYMPP)
Float (void);
Float (const float &init);
Float & operator= (const float &rhs);
bool operator!= (const Float &rhs) const;
# endif /* _UNICOS */
# endif /* ACE_SIZEOF_INT != 4 */ # endif /* ACE_SIZEOF_INT != 4 */
}; };
# endif /* ACE_SIZEOF_FLOAT != 4 */ # endif /* ACE_SIZEOF_FLOAT != 4 */

2
dep/ACE_wrappers/ace/CDR_Size.cpp
View file

@ -1,4 +1,4 @@
// $Id: CDR_Size.cpp 91287 2010-08-05 10:30:49Z johnnyw $ // $Id: CDR_Size.cpp 91813 2010-09-17 07:52:52Z johnnyw $
#include "ace/CDR_Size.h" #include "ace/CDR_Size.h"
#include "ace/SString.h" #include "ace/SString.h"

367
dep/ACE_wrappers/ace/CORBA_macros.h
View file

@ -4,7 +4,7 @@
/** /**
* @file CORBA_macros.h * @file CORBA_macros.h
* *
* $Id: CORBA_macros.h 91285 2010-08-05 08:29:30Z johnnyw $ * $Id: CORBA_macros.h 91626 2010-09-07 10:59:20Z johnnyw $
* *
* Writing code that is portable between platforms with or without * Writing code that is portable between platforms with or without
* native C++ exceptions is hard. The following macros offer some * native C++ exceptions is hard. The following macros offer some
@ -43,369 +43,6 @@
# define ACE_del_bad_alloc # define ACE_del_bad_alloc
#endif #endif
#if !defined (ACE_LACKS_DEPRECATED_MACROS)
// If you wish to you use these macros for emulating exceptions on
// platforms which lack native exception support, you need to do the
// following:
// 1. Define a class Exception. You can name it as you please. This class
// should be at the root of the inheritance hierarchy of all the
// exceptions used in your application. It should define at a minimum
// the following pure virtual methods:
// a) _downcast () - Which allows narrowing of the base exception type to a
// derived type.
// b) _raise() - Which throws an exception of type Exception.
//
// Classes which derive from these should implement these operations.
//
// 2. Define a class Environment. You can name it as you please. This class
// is an exception holder. This class is always on the stack. It should
// support at a minimum the following methods:
// a) exception() - Which returns the Exception held in the current
// Environment.
// b) exception (Exception* foo) - Which replaces/sets the Exception
// held in the current Environment with foo.
// b) clear() - Which resets a particular instance of Environment.
// c) A copy constructor and an assignment operator.
//
// Note that the above description assumes that you use the following
// macros only within a particular domain. For example, if your
// application has to interoperate across domains, then you need to define
// an exception adapter to translate exceptions from one domain to
// exceptions in the other. Please refer to Stroustrup's book on how to do
// this. If your use case is this complex, you would be better off with
// going with native exceptions rather than emulated exceptions, though
// the macros should still work if you defined your adapter class as
// ACE_EXCEPTION_TYPE.
// The following macros assume that an environment variable is passed
// in/out of each function that can throw an exception. The type of the
// environment variable is defined by ACE_ENV_TYPE.
#if !defined (ACE_ENV_TYPE)
# define ACE_ENV_TYPE CORBA::Environment
#endif /* ACE_ENV_TYPE */
// The name of the variable is defined by ACE_TRY_ENV. Below is the name
// that we use by default. If you wish to change it you can redefine
// ACE_TRY_ENV to change the default name. Also ACE_ADOPT_ENV allows the
// use of non-standard name within a scope.
#if !defined (ACE_TRY_ENV)
# define ACE_TRY_ENV _ACE_CORBA_Environment_variable
#endif /* ACE_TRY_ENV */
// The base type of Exception from which all the other exception types are
// derived. You can set this to any type as you please. By default, it is
// set to CORBA::Exception.
#if !defined (ACE_EXCEPTION_TYPE)
# define ACE_EXCEPTION_TYPE CORBA::Exception
#endif /* ACE_EXCEPTION_TYPE */
// This method is used to get the default value of the Environment
// variable. In the case of TAO, this variable is part of the TSS ORB
// resources and the method TAO_default_environment() returns the
// Environment variable.
#if !defined (ACE_DEFAULT_GET_ENV_METHOD)
# define ACE_DEFAULT_GET_ENV_METHOD TAO_default_environment
#endif /* ACE_DEFAULT_GET_ENV_METHOD */
// This is the exception caught by ACE_CATCHANY.
#if !defined (ACE_ANY_EXCEPTION)
# define ACE_ANY_EXCEPTION ex
#endif /* ACE_ANY_EXCEPTION */
// Declare a new environment variable on the stack. The type of the
// environment variable is determined by ACE_ENV_TYPE.
#if defined (ACE_USES_NATIVE_EXCEPTIONS)
// Don't instantiate an emulated exception environment at all when
// using native C++ exception support. It won't be used.
# define ACE_DECLARE_NEW_ENV
#else
# define ACE_DECLARE_NEW_ENV \
ACE_ENV_TYPE ACE_TRY_ENV
#endif /* ACE_USES_NATIVE_EXCEPTIONS */
// Provided for backward compatibility purposes. Don't use it in new code.
// Use the definition above along with defining ACE_ENV_TYPE.
#if defined (ACE_ENV_POLLUTE_NAMES)
# define ACE_DECLARE_NEW_CORBA_ENV ACE_DECLARE_NEW_ENV
#endif /* ACE_ENV_POLLUTE_NAMES */
#if defined (ACE_USES_NATIVE_EXCEPTIONS)
// -----------------------------------------------------------------
// Provided for backward compatibility purposes. Don't use it in new code.
#if defined (ACE_ENV_POLLUTE_NAMES)
# define ACE_ADOPT_CORBA_ENV(ENV)
#endif /* ACE_ENV_POLLUTE_NAMES */
#define ACE_ADOPT_ENV (ENV)
// No need to check. Native exceptions handle the control flow
// automatically when an exception occurs.
# define ACE_CHECK
// Used when the function requires a return value.
# define ACE_CHECK_RETURN(RETV)
// ACE_THROW_INT should not be used by the user.
# define ACE_THROW_INT(EXCEPTION) \
throw EXCEPTION
// Throwing an exception is easy. These two macros should _NOT_ be
// used within try blocks.
# define ACE_THROW(EXCEPTION) \
throw EXCEPTION
// Throwing an exception when the function requires a return value.
# define ACE_THROW_RETURN(EXCEPTION,RETV) \
throw EXCEPTION
// For compilers with native exceptions, we can simply use try to try. ;-)
// do {} while (0) is required to avoid compilation warnings.
# define ACE_TRY \
do \
{ \
try \
{
# define ACE_TRY_NEW_ENV \
do \
{ \
try \
{
# define ACE_TRY_EX(LABEL) \
do \
{ \
try \
{
// No need to check for exceptions within try block for compilers with
// native exceptions.
# define ACE_TRY_CHECK
# define ACE_TRY_CHECK_EX(LABEL)
// Likewise, throwing exceptions within try blocks is easy.
# define ACE_TRY_THROW(EXCEPTION) throw EXCEPTION
# define ACE_TRY_THROW_EX(EXCEPTION,LABEL) throw EXCEPTION
// Same thing for catch.
# define ACE_CATCH(EXCEPTION,VAR) \
} \
catch (EXCEPTION & VAR) \
{ \
ACE_UNUSED_ARG (VAR);
# define ACE_CATCHANY \
ACE_CATCH(ACE_EXCEPTION_TYPE, ACE_ANY_EXCEPTION)
# define ACE_CATCHALL \
} \
catch (...) \
{
# if defined (ACE_HAS_DEPRECATED_ACE_RETHROW)
# define ACE_RETHROW throw
# endif /* ACE_HAS_DEPRECATED_ACE_RETHROW */
// Rethrowing the exception from catch blocks.
# define ACE_RE_THROW throw
# define ACE_RE_THROW_EX(LABEL) throw
// Close the catch block.
# define ACE_ENDTRY \
} \
} while (0)
#else /* ! ACE_USES_NATIVE_EXCEPTIONS */
// -----------------------------------------------------------------
// When handling compilers without native exceptions, things get a bit
// hairy. Exceptions are simulated using ACE_ENV_TYPE. The trick here is to
// make sure the flow-of-control can simulate the case when native
// exceptions occur...
#if defined (ACE_ENV_POLLUTE_NAMES)
# define ACE_ADOPT_CORBA_ENV(ENV) ACE_ENV_TYPE &ACE_TRY_ENV = ENV
#endif /* ACE_ENV_POLLUTE_NAMES */
# define ACE_ADOPT_ENV(ENV) ACE_ENV_TYPE &ACE_TRY_ENV = ENV
// Follow every statement that could throw exceptions with ACE_CHECK or
// ACE_CHECK_RETURN. These two macros should _NOT_ be used within try
// blocks. Use ACE_TRY_CHECK or ACE_TRY_CHECK_EX instead.
# define ACE_CHECK \
if (ACE_TRY_ENV . exception () != 0) \
return
// When function requires a return value
# define ACE_CHECK_RETURN(RETV) \
if (ACE_TRY_ENV . exception () != 0) \
return RETV
// ACE_THROW_INT should not be used by the user.
# define ACE_THROW_INT(EXCEPTION) ACE_TRY_ENV.exception (new EXCEPTION)
// Throwing exceptions will inevitably cause a return from the current
// function. These two macros should _NOT_ be used within try blocks. Use
// ACE_TRY_THROW or ACE_TRY_THROW_EX instead.
# define ACE_THROW(EXCEPTION) \
do \
{ \
ACE_TRY_ENV.exception (new EXCEPTION); \
return; \
} while (0)
# define ACE_THROW_RETURN(EXCEPTION,RETV) \
do \
{ \
ACE_TRY_ENV.exception (new EXCEPTION); \
return RETV; \
} while (0)
// ACE_TRY sets up flags to control program flow. ACE_TRY_FLAG acts like a
// one-shot flip-flop. When an exception occurs (detected using
// ACE_TRY_CHECK,) ACE_TRY_FLAG will be reset and the control goes back
// into ACE_TRY_LABEL. Since ACE_TRY_FLAG is reset, the try block won't get
// executed again and the control proceeds to the following catch blocks.
// ACE_EXCEPTION_NOT_CAUGHT flag is used to prevent catching an exception
// twice. This macro assumes there's already an ACE_ENV_TYPE variable
// ACE_TRY_ENV defined (which should be the case normally)
# define ACE_TRY \
do { \
int ACE_TRY_FLAG = 1; \
int ACE_EXCEPTION_NOT_CAUGHT = 1; \
ACE_TRY_LABEL: \
if (ACE_TRY_FLAG) \
do {
// ACE_TRY_NEW_ENV functions like the macro ACE_TRY but defines a new
// ACE_ENV_TYPE variable ACE_TRY_ENV. It is most often used in the outer
// most function where no ACE_TRY_ENV is available.
# define ACE_TRY_NEW_ENV \
do { \
ACE_DECLARE_NEW_ENV;\
int ACE_TRY_FLAG = 1; \
int ACE_EXCEPTION_NOT_CAUGHT = 1; \
ACE_TRY_LABEL: \
if (ACE_TRY_FLAG) \
do {
// ACE_TRY_EX works exactly like ACE_TRY macro except the label used in the
// try block is customizable to avoid name clashing. It should be used when
// nested try blocks or multiple try blocks are required, in the same
// function.
# define ACE_TRY_EX(LABEL) \
do { \
int ACE_TRY_FLAG = 1; \
int ACE_EXCEPTION_NOT_CAUGHT = 1; \
ACE_TRY_LABEL ## LABEL: \
if (ACE_TRY_FLAG) \
do {
// Check for exceptions within try blocks.
# define ACE_TRY_CHECK \
{ \
if (ACE_TRY_ENV.exception () != 0) \
{ \
ACE_TRY_FLAG = 0; \
goto ACE_TRY_LABEL; \
} \
}
// Checking exception within EX try blocks.
# define ACE_TRY_CHECK_EX(LABEL) \
{ \
if (ACE_TRY_ENV.exception () != 0) \
{ \
ACE_TRY_FLAG = 0; \
goto ACE_TRY_LABEL ## LABEL; \
} \
}
// Throwing exception within TRY blocks.
# define ACE_TRY_THROW(EXCEPTION) \
{ \
ACE_TRY_ENV.exception (new EXCEPTION); \
ACE_TRY_FLAG = 0; \
goto ACE_TRY_LABEL; \
}
# define ACE_TRY_THROW_EX(EXCEPTION,LABEL) \
{ \
ACE_TRY_ENV.exception (new EXCEPTION); \
ACE_TRY_FLAG = 0; \
goto ACE_TRY_LABEL ## LABEL; \
}
// When exceptions occur or try block finishes execution without exception,
// control will continue in the catch block. This macro first checks if
// there's any uncaught exception left. If all the conditions are met, we
// have caught an exception. It then resets ACE_EXCEPTION_NOT_CAUGHT to
// prevent subsequent catch blocks from catching the same exception again,
// and extracts out the underlying exception in ACE_TRY_ENV. We also make a
// copy of ACE_TRY_ENV in ACE_CAUGHT_ENV, in case we want to rethrow the
// exception. ACE_TRY_ENV is cleared out after the exception is caught so
// you should not use ACE_TRY_ENV within the catch block(You should use the
// exception directly).
# define ACE_CATCH(TYPE,VAR) \
} while (0); \
do \
if (ACE_TRY_ENV.exception () != 0 && ACE_EXCEPTION_NOT_CAUGHT && \
TYPE::_downcast(ACE_TRY_ENV.exception ()) != 0) \
{ \
ACE_ENV_TYPE ACE_CAUGHT_ENV = ACE_TRY_ENV;\
ACE_EXCEPTION_NOT_CAUGHT = 0; \
TYPE &VAR = *TYPE::_downcast (ACE_CAUGHT_ENV.exception ()); \
ACE_UNUSED_ARG (VAR); \
ACE_TRY_ENV.clear ();
// ACE_CATCHANY uses ACE_CATCH to catch all exceptions derived from
// ACE_EXCEPTION_TYPE
# define ACE_CATCHANY ACE_CATCH (ACE_EXCEPTION_TYPE, ACE_ANY_EXCEPTION)
// Since there's no other exception for compilers without exception
// support, we simply catch all ACE_EXCEPTION_TYPE exceptions for
// ACE_CATCHALL.
# define ACE_CATCHALL ACE_CATCHANY
# if defined (ACE_HAS_DEPRECATED_ACE_RETHROW)
# define ACE_RETHROW \
do \
ACE_TRY_ENV = ACE_CAUGHT_ENV; \
while (0)
# endif /* ACE_HAS_DEPRECATED_ACE_RETHROW */
// Rethrowing exception within catch blocks. Notice that we depend on the
// ACE_CHECK/ACE_CHECK_RETURN following the ACE_ENDTRY, or ACE_TRY_CHECK/
// ACE_TRY_CHECK_EX following the ACE_ENDTRY when the catch block is within
// another try block, to do the "Right Thing[TM]."
# define ACE_RE_THROW \
do {\
ACE_TRY_ENV = ACE_CAUGHT_ENV; \
goto ACE_TRY_LABEL; \
} while (0)
# define ACE_RE_THROW_EX(LABEL) \
do {\
ACE_TRY_ENV = ACE_CAUGHT_ENV; \
goto ACE_TRY_LABEL ## LABEL; \
} while (0)
// Close the try block. Since exceptions may not get caught, and exceptions
// can also be rethrown from the catch block, it's always a good idea to
// follow ACE_ENDTRY with ACE_CHECK or ACE_TRY_CHECK (depending on the
// context.)
# define ACE_ENDTRY \
} while (0); \
} while (0)
#endif /* ! ACE_USES_NATIVE_EXCEPTIONS */
#endif /* !ACE_LACKS_DEPRECATED_MACROS */
// ACE_HAS_EXCEPTIONS is not the same as ACE_NEW_THROWS_EXCEPTIONS. // ACE_HAS_EXCEPTIONS is not the same as ACE_NEW_THROWS_EXCEPTIONS.
#if defined(ACE_NEW_THROWS_EXCEPTIONS) #if defined(ACE_NEW_THROWS_EXCEPTIONS)
@ -434,6 +71,7 @@
#endif /* ACE_NEW_THROWS_EXCEPTIONS */ #endif /* ACE_NEW_THROWS_EXCEPTIONS */
// FUZZ: disable check_for_ACE_Guard
# define ACE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \ # define ACE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \
ACE_Guard< MUTEX > OBJ (LOCK); \ ACE_Guard< MUTEX > OBJ (LOCK); \
if (OBJ.locked () == 0) throw EXCEPTION; if (OBJ.locked () == 0) throw EXCEPTION;
@ -445,6 +83,7 @@
# define ACE_WRITE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \ # define ACE_WRITE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \
ACE_Write_Guard< MUTEX > OBJ (LOCK); \ ACE_Write_Guard< MUTEX > OBJ (LOCK); \
if (OBJ.locked () == 0) throw EXCEPTION; if (OBJ.locked () == 0) throw EXCEPTION;
// FUZZ: enable check_for_ACE_Guard
#include /**/ "ace/post.h" #include /**/ "ace/post.h"

10
dep/ACE_wrappers/ace/Cache_Map_Manager_T.cpp
View file

@ -1,4 +1,4 @@
// $Id: Cache_Map_Manager_T.cpp 80826 2008-03-04 14:51:23Z wotte $ // $Id: Cache_Map_Manager_T.cpp 92097 2010-09-30 05:41:49Z msmit $
#ifndef ACE_CACHE_MAP_MANAGER_T_CPP #ifndef ACE_CACHE_MAP_MANAGER_T_CPP
#define ACE_CACHE_MAP_MANAGER_T_CPP #define ACE_CACHE_MAP_MANAGER_T_CPP
@ -77,7 +77,7 @@ ACE_Cache_Map_Manager<ACE_T2>::bind (const KEY &key,
{ {
int result = this->caching_strategy_.notify_bind (bind_result, int result = this->caching_strategy_.notify_bind (bind_result,
cache_value.second ()); cache_value.second);
if (result == -1) if (result == -1)
{ {
@ -285,7 +285,7 @@ ACE_Cache_Map_Manager<ACE_T2>::find (const KEY &key,
{ {
int result = this->caching_strategy_.notify_find (find_result, int result = this->caching_strategy_.notify_find (find_result,
cache_value.second ()); cache_value.second);
// Unless the find and notification operations go thru, this // Unless the find and notification operations go thru, this
// method is not successful. // method is not successful.
@ -301,7 +301,7 @@ ACE_Cache_Map_Manager<ACE_T2>::find (const KEY &key,
if (rebind_result == -1) if (rebind_result == -1)
find_result = -1; find_result = -1;
else else
value = cache_value.first (); value = cache_value.first;
} }
@ -361,7 +361,7 @@ ACE_Cache_Map_Manager<ACE_T2>::unbind (const KEY &key)
{ {
int result = this->caching_strategy_.notify_unbind (unbind_result, int result = this->caching_strategy_.notify_unbind (unbind_result,
cache_value.second ()); cache_value.second);
if (result == -1) if (result == -1)
unbind_result = -1; unbind_result = -1;

16
dep/ACE_wrappers/ace/Cache_Map_Manager_T.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Cache_Map_Manager_T.h * @file Cache_Map_Manager_T.h
* *
* $Id: Cache_Map_Manager_T.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: Cache_Map_Manager_T.h 92097 2010-09-30 05:41:49Z msmit $
* *
* @author Kirthika Parameswaran <kirthika@cs.wustl.edu> * @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
*/ */
@ -91,7 +91,7 @@ public:
* are used by the strategy and is transparent to the user of this * are used by the strategy and is transparent to the user of this
* class. * class.
*/ */
typedef ACE_Pair<VALUE, ATTRIBUTES> CACHE_VALUE; typedef std::pair<VALUE, ATTRIBUTES> CACHE_VALUE;
// = Initialization and termination methods. // = Initialization and termination methods.
@ -251,10 +251,10 @@ public:
// = Traits. // = Traits.
/// The actual value mapped to the key in the cache. The <attributes> /// The actual value mapped to the key in the cache. The <attributes>
/// are used by the strategy and is transperant to the cache user. /// are used by the strategy and is transparent to the cache user.
typedef ACE_Reference_Pair<KEY, VALUE> typedef ACE_Reference_Pair<KEY, VALUE>
value_type; value_type;
typedef ACE_Pair <VALUE, ATTRIBUTES> typedef std::pair <VALUE, ATTRIBUTES>
CACHE_VALUE; CACHE_VALUE;
// = Initialisation and termination methods. // = Initialisation and termination methods.
@ -274,7 +274,7 @@ public:
(const ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, (const ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION,
CACHING_STRATEGY, ATTRIBUTES> &rhs); CACHING_STRATEGY, ATTRIBUTES> &rhs);
/// Comparision operators. /// Comparison operators.
bool operator== (const ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs) const; bool operator== (const ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs) const;
bool operator!= (const ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs) const; bool operator!= (const ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs) const;
@ -327,9 +327,9 @@ public:
// = Traits. // = Traits.
/// The actual value mapped to the key in the cache. The <attributes> /// The actual value mapped to the key in the cache. The <attributes>
/// are used by the strategy and is transperant to the cache user. /// are used by the strategy and is transparent to the cache user.
typedef ACE_Reference_Pair<KEY, VALUE> value_type; typedef ACE_Reference_Pair<KEY, VALUE> value_type;
typedef ACE_Pair <VALUE, ATTRIBUTES> CACHE_VALUE; typedef std::pair <VALUE, ATTRIBUTES> CACHE_VALUE;
// = Initialisation and termination methods. // = Initialisation and termination methods.
@ -348,7 +348,7 @@ public:
(const ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, (const ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION,
CACHING_STRATEGY, ATTRIBUTES> &rhs); CACHING_STRATEGY, ATTRIBUTES> &rhs);
/// Comparision operators. /// Comparison operators.
bool operator== (const ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs) const; bool operator== (const ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs) const;
bool operator!= (const ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs) const; bool operator!= (const ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs) const;

6
dep/ACE_wrappers/ace/Cache_Map_Manager_T.inl
View file

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
// //
//$Id: Cache_Map_Manager_T.inl 80826 2008-03-04 14:51:23Z wotte $ //$Id: Cache_Map_Manager_T.inl 92097 2010-09-30 05:41:49Z msmit $
ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@ -89,7 +89,7 @@ template <class KEY, class VALUE, class IMPLEMENTATION, class CACHING_STRATEGY,
ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator* (void) const ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator* (void) const
{ {
value_type retn ((*this->iterator_implementation_).ext_id_, value_type retn ((*this->iterator_implementation_).ext_id_,
(*this->iterator_implementation_).int_id_.first ()); (*this->iterator_implementation_).int_id_.first);
return retn; return retn;
} }
@ -183,7 +183,7 @@ template <class KEY, class VALUE, class REVERSE_IMPLEMENTATION, class CACHING_ST
ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator* (void) const ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator* (void) const
{ {
value_type retv ((*this->reverse_iterator_implementation_).ext_id_, value_type retv ((*this->reverse_iterator_implementation_).ext_id_,
(*this->reverse_iterator_implementation_).int_id_.first ()); (*this->reverse_iterator_implementation_).int_id_.first);
return retv; return retv;
} }

27
dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.cpp
View file

@ -1,4 +1,4 @@
//$Id: Cached_Connect_Strategy_T.cpp 82771 2008-09-17 18:47:48Z johnnyw $ //$Id: Cached_Connect_Strategy_T.cpp 92097 2010-09-30 05:41:49Z msmit $
#ifndef ACE_CACHED_CONNECT_STRATEGY_T_CPP #ifndef ACE_CACHED_CONNECT_STRATEGY_T_CPP
#define ACE_CACHED_CONNECT_STRATEGY_T_CPP #define ACE_CACHED_CONNECT_STRATEGY_T_CPP
@ -14,7 +14,6 @@
#include "ace/Service_Types.h" #include "ace/Service_Types.h"
#include "ace/Thread_Manager.h" #include "ace/Thread_Manager.h"
#include "ace/WFMO_Reactor.h" #include "ace/WFMO_Reactor.h"
#include "ace/Pair_T.h"
#define ACE_T1 class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX #define ACE_T1 class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX
#define ACE_T2 SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX #define ACE_T2 SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX
@ -54,7 +53,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::check_hint_i
bool reuse_addr, bool reuse_addr,
int flags, int flags,
int perms, int perms,
ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry, ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, std::pair<SVC_HANDLER *, ATTRIBUTES> > *&entry,
int &found) int &found)
{ {
ACE_UNUSED_ARG (remote_addr); ACE_UNUSED_ARG (remote_addr);
@ -77,8 +76,8 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::check_hint_i
if (possible_entry->ext_id_.decrement () == 0) if (possible_entry->ext_id_.decrement () == 0)
{ {
// If refcount goes to zero, close down the svc_handler // If refcount goes to zero, close down the svc_handler
possible_entry->int_id_.first ()->recycler (0, 0); possible_entry->int_id_.first->recycler (0, 0);
possible_entry->int_id_.first ()->close (); possible_entry->int_id_.first->close ();
this->purge_i (possible_entry); this->purge_i (possible_entry);
} }
@ -111,7 +110,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::check_hint_i
int find_result = 0; int find_result = 0;
int result = this->caching_strategy ().notify_find (find_result, int result = this->caching_strategy ().notify_find (find_result,
possible_entry->int_id_.second ()); possible_entry->int_id_.second);
if (result == -1) if (result == -1)
return result; return result;
@ -144,7 +143,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::find_or_create_svc_handler_i
bool reuse_addr, bool reuse_addr,
int flags, int flags,
int perms, int perms,
ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry, ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, std::pair<SVC_HANDLER *, ATTRIBUTES> > *&entry,
int &found) int &found)
{ {
REFCOUNTED_HASH_RECYCLABLE_ADDRESS search_addr (remote_addr); REFCOUNTED_HASH_RECYCLABLE_ADDRESS search_addr (remote_addr);
@ -155,7 +154,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::find_or_create_svc_handler_i
{ {
// We found a cached svc_handler. // We found a cached svc_handler.
// Get the cached <svc_handler> // Get the cached <svc_handler>
sh = entry->int_id_.first (); sh = entry->int_id_.first;
// Is the connection clean? // Is the connection clean?
int state_result = int state_result =
@ -450,8 +449,8 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cleanup_hint_i (const void *recycling_ac
if (entry->ext_id_.recycle_state () == ACE_RECYCLABLE_CLOSED && if (entry->ext_id_.recycle_state () == ACE_RECYCLABLE_CLOSED &&
refcount == 0) refcount == 0)
{ {
entry->int_id_.first ()->recycler (0, 0); entry->int_id_.first->recycler (0, 0);
entry->int_id_.first ()->close (); entry->int_id_.first->close ();
this->purge_i (entry); this->purge_i (entry);
} }
@ -472,10 +471,10 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::caching_strategy (void)
template <ACE_T1> int template <ACE_T1> int
ACE_Cached_Connect_Strategy_Ex<ACE_T2>::find (ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR> &search_addr, ACE_Cached_Connect_Strategy_Ex<ACE_T2>::find (ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR> &search_addr,
ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry) ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, std::pair<SVC_HANDLER *, ATTRIBUTES> > *&entry)
{ {
typedef ACE_Hash_Map_Bucket_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, typedef ACE_Hash_Map_Bucket_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,
ACE_Pair<SVC_HANDLER *, ATTRIBUTES>, std::pair<SVC_HANDLER *, ATTRIBUTES>,
ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
ACE_Null_Mutex> ACE_Null_Mutex>
@ -512,7 +511,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::find (ACE_Refcounted_Hash_Recyclable<ACE
int find_result = 0; int find_result = 0;
int result = this->caching_strategy ().notify_find (find_result, int result = this->caching_strategy ().notify_find (find_result,
entry->int_id_.second ()); entry->int_id_.second);
if (result == -1) if (result == -1)
return result; return result;
@ -591,7 +590,7 @@ ACE_Bounded_Cached_Connect_Strategy<ACE_T2>::find_or_create_svc_handler_i
int flags, int flags,
int perms, int perms,
ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>,
ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry, std::pair<SVC_HANDLER *, ATTRIBUTES> > *&entry,
int &found) int &found)
{ {

14
dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Cached_Connect_Strategy_T.h * @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 92097 2010-09-30 05:41:49Z msmit $
* *
* @author Kirthika Parameswaran <kirthika@cs.wustl.edu> * @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
*/ */
@ -90,9 +90,9 @@ public:
typedef typename CONNECTION_CACHE::mapped_type VALUE; typedef typename CONNECTION_CACHE::mapped_type VALUE;
typedef ACE_Recyclable_Handler_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, typedef ACE_Recyclable_Handler_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,
ACE_Pair<SVC_HANDLER *, ATTRIBUTES>, std::pair<SVC_HANDLER *, ATTRIBUTES>,
ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,
ACE_Pair<SVC_HANDLER *, ATTRIBUTES>, std::pair<SVC_HANDLER *, ATTRIBUTES>,
ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
MUTEX> > MUTEX> >
@ -108,7 +108,7 @@ protected:
/// Find an idle handle. /// Find an idle handle.
int find (ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR> &search_addr, int find (ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR> &search_addr,
ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry); ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, std::pair<SVC_HANDLER *, ATTRIBUTES> > *&entry);
/// Remove from cache (non-locking version). /// Remove from cache (non-locking version).
virtual int purge_i (const void *recycling_act); virtual int purge_i (const void *recycling_act);
@ -133,7 +133,7 @@ protected:
bool reuse_addr, bool reuse_addr,
int flags, int flags,
int perms, int perms,
ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry, ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, std::pair<SVC_HANDLER *, ATTRIBUTES> > *&entry,
int &found); int &found);
virtual int find_or_create_svc_handler_i (SVC_HANDLER *&sh, virtual int find_or_create_svc_handler_i (SVC_HANDLER *&sh,
@ -143,7 +143,7 @@ protected:
bool reuse_addr, bool reuse_addr,
int flags, int flags,
int perms, int perms,
ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry, ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, std::pair<SVC_HANDLER *, ATTRIBUTES> > *&entry,
int &found); int &found);
virtual int connect_svc_handler_i (SVC_HANDLER *&sh, virtual int connect_svc_handler_i (SVC_HANDLER *&sh,
@ -240,7 +240,7 @@ protected:
int flags, int flags,
int perms, int perms,
ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>,
ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry, std::pair<SVC_HANDLER *, ATTRIBUTES> > *&entry,
int &found); int &found);
protected: protected:

8
dep/ACE_wrappers/ace/Caching_Strategies_T.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Caching_Strategies_T.h * @file Caching_Strategies_T.h
* *
* $Id: Caching_Strategies_T.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: Caching_Strategies_T.h 92097 2010-09-30 05:41:49Z msmit $
* *
* @author Kirthika Parameswaran <kirthika@cs.wustl.edu> * @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
*/ */
@ -191,7 +191,7 @@ private:
* The ATTRIBUTES are the deciding factor for purging of entries * The ATTRIBUTES are the deciding factor for purging of entries
* and should logically be included with the VALUE. Some ways of * and should logically be included with the VALUE. Some ways of
* doing this are: As being a member of the VALUE or VALUE being * doing this are: As being a member of the VALUE or VALUE being
* ACE_Pair<x, ATTRIBUTES>. The CACHING_UTILITY is the * std::pair<x, ATTRIBUTES>. The CACHING_UTILITY is the
* class which can be plugged in and which decides the entries * class which can be plugged in and which decides the entries
* to purge. * to purge.
*/ */
@ -291,7 +291,7 @@ private:
* The ATTRIBUTES are the deciding factor for purging of entries * The ATTRIBUTES are the deciding factor for purging of entries
* and should logically be included with the VALUE. Some ways of * and should logically be included with the VALUE. Some ways of
* doing this are: As being a member of the VALUE or VALUE being * doing this are: As being a member of the VALUE or VALUE being
* ACE_Pair<x, ATTRIBUTES>. The CACHING_UTILITY is the * std::pair<x, ATTRIBUTES>. The CACHING_UTILITY is the
* class which can be plugged in and which decides the entries * class which can be plugged in and which decides the entries
* to purge. * to purge.
*/ */
@ -384,7 +384,7 @@ private:
* The ATTRIBUTES are the deciding factor for purging of entries * The ATTRIBUTES are the deciding factor for purging of entries
* and should logically be included with the VALUE. Some ways of * and should logically be included with the VALUE. Some ways of
* doing this are: As being a member of the VALUE or VALUE being * doing this are: As being a member of the VALUE or VALUE being
* ACE_Pair<x, ATTRIBUTES>. The CACHING_UTILITY is the * std::pair<x, ATTRIBUTES>. The CACHING_UTILITY is the
* class which can be plugged in and which decides the entries * class which can be plugged in and which decides the entries
* to purge. * to purge.
*/ */

45
dep/ACE_wrappers/ace/Caching_Utility_T.cpp
View file

@ -1,4 +1,4 @@
// $Id: Caching_Utility_T.cpp 80826 2008-03-04 14:51:23Z wotte $ // $Id: Caching_Utility_T.cpp 92264 2010-10-19 18:12:46Z olli $
#ifndef ACE_CACHING_UTILITY_T_CPP #ifndef ACE_CACHING_UTILITY_T_CPP
#define ACE_CACHING_UTILITY_T_CPP #define ACE_CACHING_UTILITY_T_CPP
@ -9,6 +9,7 @@
#pragma once #pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */ #endif /* ACE_LACKS_PRAGMA_ONCE */
#include "ace/ACE.h"
#include "ace/Min_Max.h" #include "ace/Min_Max.h"
#include "ace/OS_Memory.h" #include "ace/OS_Memory.h"
#include "ace/Recyclable.h" #include "ace/Recyclable.h"
@ -19,7 +20,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Pair_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy, ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Pair_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy,
int delete_cleanup_strategy) bool delete_cleanup_strategy)
: cleanup_strategy_ (cleanup_strategy), : cleanup_strategy_ (cleanup_strategy),
delete_cleanup_strategy_ (delete_cleanup_strategy) delete_cleanup_strategy_ (delete_cleanup_strategy)
{ {
@ -27,7 +28,7 @@ ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Pair_
{ {
ACE_NEW (this->cleanup_strategy_, ACE_NEW (this->cleanup_strategy_,
CLEANUP_STRATEGY); CLEANUP_STRATEGY);
this->delete_cleanup_strategy_ = 1; this->delete_cleanup_strategy_ = true;
} }
} }
@ -43,7 +44,7 @@ ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cac
double purge_percent) double purge_percent)
{ {
// Check that the purge_percent is non-zero. // Check that the purge_percent is non-zero.
if (purge_percent == 0) if (ACE::is_equal (purge_percent, 0.0))
return 0; return 0;
// Get the number of entries in the container. // Get the number of entries in the container.
@ -94,7 +95,7 @@ ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::minimum (
// Starting values. // Starting values.
ITERATOR iter = container.begin (); ITERATOR iter = container.begin ();
ITERATOR end = container.end (); ITERATOR end = container.end ();
ATTRIBUTES min = (*iter).int_id_.second (); ATTRIBUTES min = (*iter).int_id_.second;
key_to_remove = &(*iter).ext_id_; key_to_remove = &(*iter).ext_id_;
value_to_remove = &(*iter).int_id_; value_to_remove = &(*iter).int_id_;
@ -104,10 +105,10 @@ ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::minimum (
iter != end; iter != end;
++iter) ++iter)
{ {
if (min > (*iter).int_id_.second ()) if (min > (*iter).int_id_.second)
{ {
// Ah! an item with lower ATTTRIBUTES... // Ah! an item with lower ATTTRIBUTES...
min = (*iter).int_id_.second (); min = (*iter).int_id_.second;
key_to_remove = &(*iter).ext_id_; key_to_remove = &(*iter).ext_id_;
value_to_remove = &(*iter).int_id_; value_to_remove = &(*iter).int_id_;
} }
@ -118,7 +119,7 @@ ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::minimum (
template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Recyclable_Handler_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy, ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Recyclable_Handler_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy,
int delete_cleanup_strategy) bool delete_cleanup_strategy)
: cleanup_strategy_ (cleanup_strategy), : cleanup_strategy_ (cleanup_strategy),
delete_cleanup_strategy_ (delete_cleanup_strategy) delete_cleanup_strategy_ (delete_cleanup_strategy)
{ {
@ -126,7 +127,7 @@ ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUT
{ {
ACE_NEW (this->cleanup_strategy_, ACE_NEW (this->cleanup_strategy_,
CLEANUP_STRATEGY); CLEANUP_STRATEGY);
this->delete_cleanup_strategy_ = 1; this->delete_cleanup_strategy_ = true;
} }
} }
@ -142,7 +143,7 @@ ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUT
double purge_percent) double purge_percent)
{ {
// Check that the purge_percent is non-zero. // Check that the purge_percent is non-zero.
if (purge_percent == 0) if (ACE::is_equal (purge_percent, 0.0))
return 0; return 0;
// Get the number of entries in the container. // Get the number of entries in the container.
@ -194,7 +195,7 @@ ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUT
// Starting values. // Starting values.
ITERATOR end = container.end (); ITERATOR end = container.end ();
ITERATOR iter = container.begin (); ITERATOR iter = container.begin ();
ATTRIBUTES min = (*iter).int_id_.second (); ATTRIBUTES min = (*iter).int_id_.second;
key_to_remove = 0; key_to_remove = 0;
value_to_remove = 0; value_to_remove = 0;
// Found the minimum entry to be purged? // Found the minimum entry to be purged?
@ -214,7 +215,7 @@ ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUT
{ {
if (found == 0) if (found == 0)
{ {
min = (*iter).int_id_.second (); min = (*iter).int_id_.second;
key_to_remove = &(*iter).ext_id_; key_to_remove = &(*iter).ext_id_;
value_to_remove = &(*iter).int_id_; value_to_remove = &(*iter).int_id_;
found = 1; found = 1;
@ -222,9 +223,9 @@ ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUT
else else
{ {
// Ah! an entry with lower ATTTRIBUTES... // Ah! an entry with lower ATTTRIBUTES...
if (min > (*iter).int_id_.second ()) if (min > (*iter).int_id_.second)
{ {
min = (*iter).int_id_.second (); min = (*iter).int_id_.second;
key_to_remove = &(*iter).ext_id_; key_to_remove = &(*iter).ext_id_;
value_to_remove = &(*iter).int_id_; value_to_remove = &(*iter).int_id_;
} }
@ -237,7 +238,7 @@ ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUT
template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
ACE_Refcounted_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Refcounted_Recyclable_Handler_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy, ACE_Refcounted_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Refcounted_Recyclable_Handler_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy,
int delete_cleanup_strategy) bool delete_cleanup_strategy)
: cleanup_strategy_ (cleanup_strategy), : cleanup_strategy_ (cleanup_strategy),
delete_cleanup_strategy_ (delete_cleanup_strategy), delete_cleanup_strategy_ (delete_cleanup_strategy),
marked_as_closed_entries_ (0) marked_as_closed_entries_ (0)
@ -246,7 +247,7 @@ ACE_Refcounted_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATO
{ {
ACE_NEW (this->cleanup_strategy_, ACE_NEW (this->cleanup_strategy_,
CLEANUP_STRATEGY); CLEANUP_STRATEGY);
this->delete_cleanup_strategy_ = 1; this->delete_cleanup_strategy_ = true;
} }
} }
@ -262,7 +263,7 @@ ACE_Refcounted_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATO
double purge_percent) double purge_percent)
{ {
// Check that the purge_percent is non-zero. // Check that the purge_percent is non-zero.
if (purge_percent == 0) if (ACE::is_equal (purge_percent, 0.0))
return 0; return 0;
// Get the number of entries in the container which can be considered for purging. // Get the number of entries in the container which can be considered for purging.
@ -362,7 +363,7 @@ ACE_Refcounted_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATO
template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Handler_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy, ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Handler_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy,
int delete_cleanup_strategy) bool delete_cleanup_strategy)
: cleanup_strategy_ (cleanup_strategy), : cleanup_strategy_ (cleanup_strategy),
delete_cleanup_strategy_ (delete_cleanup_strategy) delete_cleanup_strategy_ (delete_cleanup_strategy)
{ {
@ -370,7 +371,7 @@ ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Ha
{ {
ACE_NEW (this->cleanup_strategy_, ACE_NEW (this->cleanup_strategy_,
CLEANUP_STRATEGY); CLEANUP_STRATEGY);
this->delete_cleanup_strategy_ = 1; this->delete_cleanup_strategy_ = true;
} }
} }
@ -386,7 +387,7 @@ ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_
double purge_percent) double purge_percent)
{ {
// Check that the purge_percent is non-zero. // Check that the purge_percent is non-zero.
if (purge_percent == 0) if (ACE::is_equal (purge_percent, 0.0))
return 0; return 0;
// Get the number of entries in the container. // Get the number of entries in the container.
@ -455,7 +456,7 @@ ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::minimu
template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Null_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy, ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Null_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy,
int delete_cleanup_strategy) bool delete_cleanup_strategy)
: cleanup_strategy_ (cleanup_strategy), : cleanup_strategy_ (cleanup_strategy),
delete_cleanup_strategy_ (delete_cleanup_strategy) delete_cleanup_strategy_ (delete_cleanup_strategy)
{ {
@ -463,7 +464,7 @@ ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Null_
{ {
ACE_NEW (this->cleanup_strategy_, ACE_NEW (this->cleanup_strategy_,
CLEANUP_STRATEGY); CLEANUP_STRATEGY);
this->delete_cleanup_strategy_ = 1; this->delete_cleanup_strategy_ = true;
} }
} }

70
dep/ACE_wrappers/ace/Caching_Utility_T.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Caching_Utility_T.h * @file Caching_Utility_T.h
* *
* $Id: Caching_Utility_T.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: Caching_Utility_T.h 92085 2010-09-29 12:23:13Z johnnyw $
* *
* @author Kirthika Parameswaran <kirthika@cs.wustl.edu> * @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
*/ */
@ -23,9 +23,7 @@
#include "ace/Global_Macros.h" #include "ace/Global_Macros.h"
#include "ace/Cleanup_Strategies_T.h" #include "ace/Cleanup_Strategies_T.h"
#include "ace/Copy_Disabled.h"
// For linkers that cant grok long names.
#define ACE_Pair_Caching_Utility APUTIL
ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@ -44,7 +42,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
* entries to be cleaned up will be delegated. * entries to be cleaned up will be delegated.
*/ */
template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
class ACE_Pair_Caching_Utility class ACE_Pair_Caching_Utility : private ACE_Copy_Disabled
{ {
public: public:
@ -52,7 +50,7 @@ public:
/// Constructor. /// Constructor.
ACE_Pair_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy = 0, ACE_Pair_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy = 0,
int delete_cleanup_strategy = 0); bool delete_cleanup_strategy = false);
/// Destructor. /// Destructor.
~ACE_Pair_Caching_Utility (void); ~ACE_Pair_Caching_Utility (void);
@ -61,8 +59,7 @@ public:
* Purge entries from the @a container. The Cleanup_Strategy will do the * Purge entries from the @a container. The Cleanup_Strategy will do the
* actual job of cleanup once the entries to be cleaned up are decided. * actual job of cleanup once the entries to be cleaned up are decided.
*/ */
int clear_cache (CONTAINER &container, int clear_cache (CONTAINER &container, double purge_percent);
double purge_percent);
protected: protected:
@ -76,15 +73,9 @@ protected:
CLEANUP_STRATEGY *cleanup_strategy_; CLEANUP_STRATEGY *cleanup_strategy_;
/// Whether the cleanup_strategy should be destroyed or not. /// Whether the cleanup_strategy should be destroyed or not.
int delete_cleanup_strategy_; bool delete_cleanup_strategy_;
ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Pair_Caching_Utility<KEY,VALUE,CONTAINER,ITERATOR,ATTRIBUTES> &))
ACE_UNIMPLEMENTED_FUNC (ACE_Pair_Caching_Utility (const ACE_Pair_Caching_Utility<KEY,VALUE,CONTAINER,ITERATOR,ATTRIBUTES> &))
}; };
////////////////////////////////////////////////////////////////////////////////
#define ACE_Recyclable_Handler_Caching_Utility ARHUTIL
/** /**
* @class ACE_Recyclable_Handler_Caching_Utility * @class ACE_Recyclable_Handler_Caching_Utility
* *
@ -100,7 +91,7 @@ protected:
* be cleaned up will be delegated. * be cleaned up will be delegated.
*/ */
template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
class ACE_Recyclable_Handler_Caching_Utility class ACE_Recyclable_Handler_Caching_Utility : private ACE_Copy_Disabled
{ {
public: public:
@ -110,7 +101,7 @@ public:
/// Constructor. /// Constructor.
ACE_Recyclable_Handler_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy = 0, ACE_Recyclable_Handler_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy = 0,
int delete_cleanup_strategy = 0); bool delete_cleanup_strategy = false);
/// Destructor. /// Destructor.
~ACE_Recyclable_Handler_Caching_Utility (void); ~ACE_Recyclable_Handler_Caching_Utility (void);
@ -134,16 +125,9 @@ protected:
CLEANUP_STRATEGY_BASE *cleanup_strategy_; CLEANUP_STRATEGY_BASE *cleanup_strategy_;
/// Whether the cleanup_strategy should be destroyed or not. /// Whether the cleanup_strategy should be destroyed or not.
int delete_cleanup_strategy_; bool delete_cleanup_strategy_;
private:
ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Recyclable_Handler_Caching_Utility<KEY,VALUE,CONTAINER,ITERATOR,ATTRIBUTES> &))
ACE_UNIMPLEMENTED_FUNC (ACE_Recyclable_Handler_Caching_Utility (const ACE_Recyclable_Handler_Caching_Utility<KEY,VALUE,CONTAINER,ITERATOR,ATTRIBUTES> &))
}; };
///////////////////////////////////////////////////////////////////////////
#define ACE_Refcounted_Recyclable_Handler_Caching_Utility ARRHUTIL
/** /**
* @class ACE_Refcounted_Recyclable_Handler_Caching_Utility * @class ACE_Refcounted_Recyclable_Handler_Caching_Utility
* *
@ -160,17 +144,15 @@ private:
* delegated. * delegated.
*/ */
template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
class ACE_Refcounted_Recyclable_Handler_Caching_Utility class ACE_Refcounted_Recyclable_Handler_Caching_Utility : private ACE_Copy_Disabled
{ {
public: public:
typedef ACE_Refcounted_Recyclable_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY; typedef ACE_Refcounted_Recyclable_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY;
typedef ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY_BASE; typedef ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> CLEANUP_STRATEGY_BASE;
/// Constructor. /// Constructor.
ACE_Refcounted_Recyclable_Handler_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy = 0, ACE_Refcounted_Recyclable_Handler_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy = 0,
int delete_cleanup_strategy = 0); bool delete_cleanup_strategy = false);
/// Destructor. /// Destructor.
~ACE_Refcounted_Recyclable_Handler_Caching_Utility (void); ~ACE_Refcounted_Recyclable_Handler_Caching_Utility (void);
@ -194,7 +176,7 @@ protected:
CLEANUP_STRATEGY_BASE *cleanup_strategy_; CLEANUP_STRATEGY_BASE *cleanup_strategy_;
/// Whether the cleanup_strategy should be destroyed or not. /// Whether the cleanup_strategy should be destroyed or not.
int delete_cleanup_strategy_; bool delete_cleanup_strategy_;
/** /**
* This figure denotes the number of entries are there in the * This figure denotes the number of entries are there in the
@ -202,14 +184,8 @@ protected:
* not have been unbound from the container. * not have been unbound from the container.
*/ */
size_t marked_as_closed_entries_; size_t marked_as_closed_entries_;
private:
ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Refcounted_Recyclable_Handler_Caching_Utility<KEY,VALUE,CONTAINER,ITERATOR,ATTRIBUTES> &))
ACE_UNIMPLEMENTED_FUNC (ACE_Refcounted_Recyclable_Handler_Caching_Utility (const ACE_Refcounted_Recyclable_Handler_Caching_Utility<KEY,VALUE,CONTAINER,ITERATOR,ATTRIBUTES> &))
}; };
////////////////////////////////////////////////////////////////////////////////////////
/** /**
* @class ACE_Handler_Caching_Utility * @class ACE_Handler_Caching_Utility
* *
@ -225,7 +201,7 @@ private:
* class to which the entries to be cleaned up will be delegated. * class to which the entries to be cleaned up will be delegated.
*/ */
template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
class ACE_Handler_Caching_Utility class ACE_Handler_Caching_Utility : private ACE_Copy_Disabled
{ {
public: public:
@ -234,7 +210,7 @@ public:
/// Constructor. /// Constructor.
ACE_Handler_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy = 0, ACE_Handler_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy = 0,
int delete_cleanup_strategy = 0); bool delete_cleanup_strategy = false);
/// Destructor. /// Destructor.
~ACE_Handler_Caching_Utility (void); ~ACE_Handler_Caching_Utility (void);
@ -264,15 +240,9 @@ protected:
CLEANUP_STRATEGY_BASE *cleanup_strategy_; CLEANUP_STRATEGY_BASE *cleanup_strategy_;
/// Whether the cleanup_strategy should be destroyed or not. /// Whether the cleanup_strategy should be destroyed or not.
int delete_cleanup_strategy_; bool delete_cleanup_strategy_;
private:
ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Handler_Caching_Utility<KEY,VALUE,CONTAINER,ITERATOR,ATTRIBUTES> &))
ACE_UNIMPLEMENTED_FUNC (ACE_Handler_Caching_Utility (const ACE_Handler_Caching_Utility<KEY,VALUE,CONTAINER,ITERATOR,ATTRIBUTES> &))
}; };
///////////////////////////////////////////////////////////////////////////
#define ACE_Null_Caching_Utility ANUTIL
/** /**
* @class ACE_Null_Caching_Utility * @class ACE_Null_Caching_Utility
* *
@ -286,7 +256,7 @@ private:
* be cleaned up will be delegated. * be cleaned up will be delegated.
*/ */
template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES>
class ACE_Null_Caching_Utility class ACE_Null_Caching_Utility : private ACE_Copy_Disabled
{ {
public: public:
@ -295,7 +265,7 @@ public:
/// Constructor. /// Constructor.
ACE_Null_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy = 0, ACE_Null_Caching_Utility (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy = 0,
int delete_cleanup_strategy = 0); bool delete_cleanup_strategy = false);
/// Destructor. /// Destructor.
~ACE_Null_Caching_Utility (void); ~ACE_Null_Caching_Utility (void);
@ -325,11 +295,7 @@ protected:
CLEANUP_STRATEGY_BASE *cleanup_strategy_; CLEANUP_STRATEGY_BASE *cleanup_strategy_;
/// Whether the cleanup_strategy should be destroyed or not. /// Whether the cleanup_strategy should be destroyed or not.
int delete_cleanup_strategy_; bool delete_cleanup_strategy_;
private:
ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Null_Caching_Utility<KEY,VALUE,CONTAINER,ITERATOR,ATTRIBUTES> &))
ACE_UNIMPLEMENTED_FUNC (ACE_Null_Caching_Utility (const ACE_Null_Caching_Utility<KEY,VALUE,CONTAINER,ITERATOR,ATTRIBUTES> &))
}; };
ACE_END_VERSIONED_NAMESPACE_DECL ACE_END_VERSIONED_NAMESPACE_DECL

6
dep/ACE_wrappers/ace/Cleanup_Strategies_T.cpp
View file

@ -1,4 +1,4 @@
//$Id: Cleanup_Strategies_T.cpp 80826 2008-03-04 14:51:23Z wotte $ //$Id: Cleanup_Strategies_T.cpp 92097 2010-09-30 05:41:49Z msmit $
#ifndef ACE_CLEANUP_STRATEGIES_T_CPP #ifndef ACE_CLEANUP_STRATEGIES_T_CPP
#define ACE_CLEANUP_STRATEGIES_T_CPP #define ACE_CLEANUP_STRATEGIES_T_CPP
@ -39,9 +39,9 @@ ACE_Recyclable_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (
if (container.unbind (*key, value) == -1) if (container.unbind (*key, value) == -1)
return -1; return -1;
value.first ()->recycler (0, 0); value.first->recycler (0, 0);
value.first ()->close (); value.first->close ();
return 0; return 0;
} }

2
dep/ACE_wrappers/ace/Codecs.cpp
View file

@ -1,4 +1,4 @@
// $Id: Codecs.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ // $Id: Codecs.cpp 91813 2010-09-17 07:52:52Z johnnyw $
#include "ace/Codecs.h" #include "ace/Codecs.h"
#include "ace/Log_Msg.h" #include "ace/Log_Msg.h"

26
dep/ACE_wrappers/ace/Condition_Thread_Mutex.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Condition_Thread_Mutex.h * @file Condition_Thread_Mutex.h
* *
* $Id: Condition_Thread_Mutex.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: Condition_Thread_Mutex.h 92069 2010-09-28 11:38:59Z johnnyw $
* *
* Moved from Synch.h. * Moved from Synch.h.
* *
@ -154,30 +154,6 @@ private:
ACE_Condition_Thread_Mutex (const ACE_Condition_Thread_Mutex &); ACE_Condition_Thread_Mutex (const ACE_Condition_Thread_Mutex &);
}; };
#if 0
// The following class is commented out since there doesn't
// appear to be a portable and robust means of implementing this
// functionality across platforms. If you know of a portable and
// robust way to implement this functionality please let us know.
/**
* @class ACE_Process_Condition
*
* @brief ACE_Condition variable wrapper that works across processes.
*/
class ACE_Export ACE_Process_Condition
{
public:
ACE_Process_Condition (MUTEX &m, const ACE_TCHAR *name = 0, void *arg = 0);
/// Dump the state of an object.
void dump (void) const;
// ACE_ALLOC_HOOK_DECLARE;
// Declare the dynamic allocation hooks.
};
#endif /* 0 */
ACE_END_VERSIONED_NAMESPACE_DECL ACE_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__) #if defined (__ACE_INLINE__)

23
dep/ACE_wrappers/ace/Condition_Thread_Mutex.inl
View file

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
// //
// $Id: Condition_Thread_Mutex.inl 80826 2008-03-04 14:51:23Z wotte $ // $Id: Condition_Thread_Mutex.inl 92069 2010-09-28 11:38:59Z johnnyw $
ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@ -50,25 +50,4 @@ ACE_Condition_Thread_Mutex::mutex (void)
return this->mutex_; return this->mutex_;
} }
#if 0
template <class MUTEX> void
ACE_Process_Condition<MUTEX>::dump (void) const
{
#if defined (ACE_HAS_DUMP)
// ACE_TRACE ("ACE_Process_Condition<MUTEX>::dump");
ACE_Condition<MUTEX>::dump ();
#endif /* ACE_HAS_DUMP */
}
template <class MUTEX>
ACE_Process_Condition<MUTEX>::ACE_Process_Condition (MUTEX &m,
const ACE_TCHAR *name,
void *arg)
: ACE_Condition<MUTEX> (m, USYNC_PROCESS, name, arg)
{
// ACE_TRACE ("ACE_Process_Condition<MUTEX>::ACE_Process_Condition");
}
#endif /* 0 */
ACE_END_VERSIONED_NAMESPACE_DECL ACE_END_VERSIONED_NAMESPACE_DECL

22
dep/ACE_wrappers/ace/Configuration.cpp
View file

@ -1,4 +1,4 @@
// $Id: Configuration.cpp 86348 2009-08-04 14:45:29Z shuston $ // $Id: Configuration.cpp 91688 2010-09-09 11:21:50Z johnnyw $
#include "ace/Configuration.h" #include "ace/Configuration.h"
#include "ace/Auto_Ptr.h" #include "ace/Auto_Ptr.h"
#include "ace/SString.h" #include "ace/SString.h"
@ -6,10 +6,6 @@
#include "ace/OS_NS_strings.h" #include "ace/OS_NS_strings.h"
#include "ace/Tokenizer_T.h" #include "ace/Tokenizer_T.h"
// Can remove this when import_config and export_config are removed from
// ACE_Configuration. They're deprecated at ACE 5.2.
#include "ace/Configuration_Import_Export.h"
#if !defined (ACE_LACKS_ACCESS) #if !defined (ACE_LACKS_ACCESS)
# include "ace/OS_NS_unistd.h" # include "ace/OS_NS_unistd.h"
#endif /* ACE_LACKS_ACCESS */ #endif /* ACE_LACKS_ACCESS */
@ -135,22 +131,6 @@ ACE_Configuration::expand_path (const ACE_Configuration_Section_Key& key,
} }
// import_config and export_config are here for backward compatibility,
// and have been deprecated.
int
ACE_Configuration::export_config (const ACE_TCHAR* filename)
{
ACE_Registry_ImpExp exporter (*this);
return exporter.export_config (filename);
}
int
ACE_Configuration::import_config (const ACE_TCHAR* filename)
{
ACE_Registry_ImpExp importer (*this);
return importer.import_config (filename);
}
int int
ACE_Configuration::validate_name (const ACE_TCHAR* name, int allow_path) ACE_Configuration::validate_name (const ACE_TCHAR* name, int allow_path)
{ {

21
dep/ACE_wrappers/ace/Configuration.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Configuration.h * @file Configuration.h
* *
* $Id: Configuration.h 86348 2009-08-04 14:45:29Z shuston $ * $Id: Configuration.h 91688 2010-09-09 11:21:50Z johnnyw $
* *
* @author Chris Hafey <chafey@stentor.com> * @author Chris Hafey <chafey@stentor.com>
* *
@ -359,22 +359,6 @@ public:
ACE_Configuration_Section_Key& key_out, ACE_Configuration_Section_Key& key_out,
int create = 1); int create = 1);
/**
* @deprecated Exports the configuration database to filename.
* If @a filename is already present, it is overwritten. This function is
* deprecated and will be removed in a future version of ACE. Please use
* either ACE_Registry_ImpExp or ACE_Ini_ImpExp instead.
*/
int export_config (const ACE_TCHAR* filename);
/**
* @deprecated Imports the configuration database from filename. Any
* existing data is not removed. This function is deprecated and will be
* removed in a future version of ACE. Please use ACE_Registry_ImpExp
* or ACE_Ini_ImpExp instead.
*/
int import_config (const ACE_TCHAR* filename);
/** /**
* Determine if the contents of this object is the same as the * Determine if the contents of this object is the same as the
* contents of the object on the right hand side. * contents of the object on the right hand side.
@ -619,9 +603,6 @@ typedef ACE_Hash_Map_Manager_Ex<ACE_Configuration_ExtId,
ACE_Null_Mutex> ACE_Null_Mutex>
SUBSECTION_HASH; SUBSECTION_HASH;
/// @deprecated Deprecated typedef. Use the SUBSECTION_HASH::ENTRY trait instead.
typedef SUBSECTION_HASH::ENTRY SUBSECTION_ENTRY;
/** /**
* @class ACE_Configuration_Value_IntId * @class ACE_Configuration_Value_IntId
* *

35
dep/ACE_wrappers/ace/Containers_T.cpp
View file

@ -1,4 +1,4 @@
// $Id: Containers_T.cpp 82588 2008-08-11 13:37:41Z johnnyw $ // $Id: Containers_T.cpp 92069 2010-09-28 11:38:59Z johnnyw $
#ifndef ACE_CONTAINERS_T_CPP #ifndef ACE_CONTAINERS_T_CPP
#define ACE_CONTAINERS_T_CPP #define ACE_CONTAINERS_T_CPP
@ -796,35 +796,6 @@ ACE_Double_Linked_List<T>::dump (void) const
#endif /* ACE_HAS_DUMP */ #endif /* ACE_HAS_DUMP */
} }
#if 0
template <class T> T *
ACE_Double_Linked_List<T>::find (const T &item)
{
for (ACE_Double_Linked_List_Iterator<T> iter (*this);
!iter.done ();
iter.advance ())
{
T *temp = iter.next ();
if (*temp == item)
return temp;
}
return 0;
}
template <class T> int
ACE_Double_Linked_List<T>::remove (const T &item)
{
T *temp = this->find (item);
if (temp != 0)
return this->remove (temp);
else
return -1;
}
#endif /* 0 */
template <class T> int template <class T> int
ACE_Double_Linked_List<T>::remove (T *n) ACE_Double_Linked_List<T>::remove (T *n)
{ {
@ -1621,7 +1592,7 @@ template <class T> int
ACE_Ordered_MultiSet<T>::find (const T &item, ACE_Ordered_MultiSet<T>::find (const T &item,
ITERATOR &iter) const ITERATOR &iter) const
{ {
// search an occurance of item, using iterator's current position as a hint // search an occurrence of item, using iterator's current position as a hint
ACE_DNode<T> *node = iter.current_; ACE_DNode<T> *node = iter.current_;
int const result = locate (item, node, node); int const result = locate (item, node, node);
@ -1779,7 +1750,7 @@ ACE_Ordered_MultiSet<T>::locate (const T &item, ACE_DNode<T> *start_position,
return 0; return 0;
} }
// Looks for first occurance of <item> in the ordered set, using the // Looks for first occurrence of <item> in the ordered set, using the
// passed starting position as a hint: if there is such an instance, // passed starting position as a hint: if there is such an instance,
// it updates the new_position pointer to point to one such node and // it updates the new_position pointer to point to one such node and
// returns 0; if there is no such node, then if there is a node before // returns 0; if there is no such node, then if there is a node before

4
dep/ACE_wrappers/ace/Containers_T.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Containers_T.h * @file Containers_T.h
* *
* $Id: Containers_T.h 88975 2010-02-12 19:19:38Z johnnyw $ * $Id: Containers_T.h 91995 2010-09-24 12:45:24Z johnnyw $
* *
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu> * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
*/ */
@ -1920,7 +1920,7 @@ private:
ACE_DNode<T> **new_position); ACE_DNode<T> **new_position);
/** /**
* Looks for first occurance of @a item in the ordered set, using the * Looks for first occurrence of @a item in the ordered set, using the
* passed starting position as a hint: if there is such an instance, it * passed starting position as a hint: if there is such an instance, it
* updates the new_position pointer to point to this node and returns 0; * updates the new_position pointer to point to this node and returns 0;
* if there is no such node, then if there is a node before where the * if there is no such node, then if there is a node before where the

15
dep/ACE_wrappers/ace/DEV.h
View file

@ -4,7 +4,7 @@
/** /**
* @file DEV.h * @file DEV.h
* *
* $Id: DEV.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: DEV.h 91685 2010-09-09 09:35:14Z johnnyw $
* *
* @author Gerhard Lenzer * @author Gerhard Lenzer
*/ */
@ -23,19 +23,6 @@
#include "ace/DEV_Addr.h" #include "ace/DEV_Addr.h"
// The following is necessary since many C++ compilers don't support
// typedef'd types inside of classes used as formal template
// arguments... ;-(. Luckily, using the C++ preprocessor I can hide
// most of this nastiness!
#if defined (ACE_HAS_TEMPLATE_TYPEDEFS)
#define ACE_DEV_CONNECTOR ACE_DEV_Connector
#define ACE_DEV_STREAM ACE_DEV_IO
#else /* TEMPLATES are broken (must be a cfront-based compiler...) */
#define ACE_DEV_CONNECTOR ACE_DEV_Connector, ACE_DEV_Addr
#define ACE_DEV_STREAM ACE_DEV_IO, ACE_DEV_Addr
#endif /* ACE_TEMPLATE_TYPEDEFS */
ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL
/** /**

17
dep/ACE_wrappers/ace/Default_Constants.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Default_Constants.h * @file Default_Constants.h
* *
* $Id: Default_Constants.h 87487 2009-11-12 07:54:39Z johnnyw $ * $Id: Default_Constants.h 91688 2010-09-09 11:21:50Z johnnyw $
* *
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu> * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
* @author Jesper S. M|ller<stophph@diku.dk> * @author Jesper S. M|ller<stophph@diku.dk>
@ -556,21 +556,6 @@
# define ACE_DEFAULT_GLOBALNAME_A "globalnames" # define ACE_DEFAULT_GLOBALNAME_A "globalnames"
#endif /* ACE_DEFAULT_GLOBALNAME_A */ #endif /* ACE_DEFAULT_GLOBALNAME_A */
// ACE_DEFAULT_NAMESPACE_DIR is for legacy mode apps. A better
// way of doing this is something like ACE_Lib_Find::get_temp_dir, since
// this directory may not exist
#if defined (ACE_LEGACY_MODE)
# if defined (ACE_WIN32)
# define ACE_DEFAULT_NAMESPACE_DIR_A "C:\\temp"
# else /* ACE_WIN32 */
# define ACE_DEFAULT_NAMESPACE_DIR_A "/tmp"
# endif /* ACE_WIN32 */
# if defined (ACE_HAS_WCHAR)
# define ACE_DEFAULT_NAMESPACE_DIR_W ACE_TEXT_WIDE(ACE_DEFAULT_NAMESPACE_DIR_A)
# endif /* ACE_HAS_WCHAR */
# define ACE_DEFAULT_NAMESPACE_DIR ACE_TEXT(ACE_DEFAULT_NAMESPACE_DIR_A)
#endif /* ACE_LEGACY_MODE */
#if defined (ACE_HAS_WCHAR) #if defined (ACE_HAS_WCHAR)
# define ACE_DEFAULT_LOCALNAME_W ACE_TEXT_WIDE(ACE_DEFAULT_LOCALNAME_A) # define ACE_DEFAULT_LOCALNAME_W ACE_TEXT_WIDE(ACE_DEFAULT_LOCALNAME_A)
# define ACE_DEFAULT_GLOBALNAME_W ACE_TEXT_WIDE(ACE_DEFAULT_GLOBALNAME_A) # define ACE_DEFAULT_GLOBALNAME_W ACE_TEXT_WIDE(ACE_DEFAULT_GLOBALNAME_A)

4
dep/ACE_wrappers/ace/Dev_Poll_Reactor.cpp
View file

@ -1,4 +1,4 @@
// $Id: Dev_Poll_Reactor.cpp 91535 2010-08-27 18:16:14Z shuston $ // $Id: Dev_Poll_Reactor.cpp 92199 2010-10-11 11:58:35Z johnnyw $
#include "ace/OS_NS_errno.h" #include "ace/OS_NS_errno.h"
#include "ace/Dev_Poll_Reactor.h" #include "ace/Dev_Poll_Reactor.h"
@ -997,7 +997,7 @@ ACE_Dev_Poll_Reactor::handle_events (ACE_Time_Value *max_wait_time)
// //
// The destructor of this object will automatically compute how much // The destructor of this object will automatically compute how much
// time elapsed since this method was called. // time elapsed since this method was called.
ACE_MT (ACE_Countdown_Time countdown (max_wait_time)); ACE_Countdown_Time countdown (max_wait_time);
Token_Guard guard (this->token_); Token_Guard guard (this->token_);
int const result = guard.acquire_quietly (max_wait_time); int const result = guard.acquire_quietly (max_wait_time);

4
dep/ACE_wrappers/ace/Dump_T.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Dump_T.h * @file Dump_T.h
* *
* $Id: Dump_T.h 91064 2010-07-12 10:11:24Z johnnyw $ * $Id: Dump_T.h 91626 2010-09-07 10:59:20Z johnnyw $
* *
* @author Doug Schmidt * @author Doug Schmidt
*/ */
@ -44,7 +44,7 @@ public:
ACE_Dumpable_Adapter (const Concrete *t); ACE_Dumpable_Adapter (const Concrete *t);
~ACE_Dumpable_Adapter (void); ~ACE_Dumpable_Adapter (void);
/// Concrete dump method (simply delegates to the <dump> method of /// Concrete dump method (simply delegates to the dump() method of
/// <class Concrete>). /// <class Concrete>).
virtual void dump (void) const; virtual void dump (void) const;

4
dep/ACE_wrappers/ace/Dynamic_Service_Base.cpp
View file

@ -1,4 +1,4 @@
// $Id: Dynamic_Service_Base.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ // $Id: Dynamic_Service_Base.cpp 91813 2010-09-17 07:52:52Z johnnyw $
#include "ace/Dynamic_Service_Base.h" #include "ace/Dynamic_Service_Base.h"
#include "ace/ACE.h" #include "ace/ACE.h"
@ -78,7 +78,7 @@ ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo,
if (ACE::debug ()) if (ACE::debug ())
{ {
ACE_Guard <ACE_Log_Msg> log_guard (*ACE_Log_Msg::instance ()); ACE_GUARD_RETURN (ACE_Log_Msg, log_guard, *ACE_Log_Msg::instance (), 0);
if (repo->repo_ != repo_found->repo_) if (repo->repo_ != repo_found->repo_)
{ {

14
dep/ACE_wrappers/ace/Env_Value_T.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Env_Value_T.h * @file Env_Value_T.h
* *
* $Id: Env_Value_T.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: Env_Value_T.h 91626 2010-09-07 10:59:20Z johnnyw $
* *
* Template to encapsulate getting a value from an environment variable * Template to encapsulate getting a value from an environment variable
* and using a supplied default value if not in the environment. * and using a supplied default value if not in the environment.
@ -22,6 +22,7 @@
#include /**/ "ace/config-all.h" #include /**/ "ace/config-all.h"
#include "ace/Global_Macros.h" #include "ace/Global_Macros.h"
#include "ace/OS_NS_stdlib.h" #include "ace/OS_NS_stdlib.h"
#include "ace/Copy_Disabled.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE) #if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once # pragma once
@ -38,7 +39,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
* value. * value.
*/ */
template <class T> template <class T>
class ACE_Env_Value class ACE_Env_Value : private ACE_Copy_Disabled
{ {
public: public:
/** /**
@ -48,9 +49,8 @@ public:
*/ */
ACE_Env_Value (void); ACE_Env_Value (void);
/// Constructor that calls <open>. /// Constructor that calls open().
ACE_Env_Value (const ACE_TCHAR *varname, ACE_Env_Value (const ACE_TCHAR *varname, const T &vardefault);
const T &vardefault);
/// Destroy the value. /// Destroy the value.
~ACE_Env_Value (void); ~ACE_Env_Value (void);
@ -66,10 +66,6 @@ public:
const ACE_TCHAR *varname (void) const; const ACE_TCHAR *varname (void) const;
private: private:
/// Disallow copying and assignment.
ACE_UNIMPLEMENTED_FUNC (ACE_Env_Value(const ACE_Env_Value<T> &))
ACE_UNIMPLEMENTED_FUNC (ACE_Env_Value<T> operator=(const ACE_Env_Value<T> &))
void fetch_value (void); void fetch_value (void);
const ACE_TCHAR *varname_; const ACE_TCHAR *varname_;

13
dep/ACE_wrappers/ace/Event_Handler.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Event_Handler.h * @file Event_Handler.h
* *
* $Id: Event_Handler.h 91066 2010-07-12 11:05:04Z johnnyw $ * $Id: Event_Handler.h 92345 2010-10-24 12:39:33Z johnnyw $
* *
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu> * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
*/ */
@ -125,10 +125,10 @@ public:
/// Called when a process exits. /// Called when a process exits.
virtual int handle_exit (ACE_Process *); virtual int handle_exit (ACE_Process *);
/// Called when a <handle_*()> method returns -1 or when the /// Called when a handle_*() method returns -1 or when the
/// <remove_handler> method is called on an ACE_Reactor. The /// remove_handler() method is called on an ACE_Reactor. The
/// @a close_mask indicates which event has triggered the /// @a close_mask indicates which event has triggered the
/// <handle_close> method callback on a particular @a handle. /// handle_close() method callback on a particular @a handle.
virtual int handle_close (ACE_HANDLE handle, virtual int handle_close (ACE_HANDLE handle,
ACE_Reactor_Mask close_mask); ACE_Reactor_Mask close_mask);
@ -146,13 +146,14 @@ public:
/// The application takes responsibility of resuming the handler /// The application takes responsibility of resuming the handler
ACE_APPLICATION_RESUMES_HANDLER ACE_APPLICATION_RESUMES_HANDLER
}; };
/** /**
* Called to figure out whether the handler needs to resumed by the * Called to figure out whether the handler needs to resumed by the
* reactor or the application can take care of it. The default * reactor or the application can take care of it. The default
* value of 0 would be returned which would allow the reactor to * value of 0 would be returned which would allow the reactor to
* take care of resumption of the handler. The application can * take care of resumption of the handler. The application can
* return a value more than zero and decide to resume the handler * return a value more than zero and decide to resume the handler
* themseleves. * themselves.
* *
* @note This method has an affect only when used with the * @note This method has an affect only when used with the
* ACE_Dev_Poll_Reactor (and then, only on Linux) or the ACE_TP_Reactor. * ACE_Dev_Poll_Reactor (and then, only on Linux) or the ACE_TP_Reactor.
@ -368,7 +369,7 @@ public:
ACE_Notification_Buffer (ACE_Event_Handler *eh, ACE_Notification_Buffer (ACE_Event_Handler *eh,
ACE_Reactor_Mask mask); ACE_Reactor_Mask mask);
/// Default dtor. /// Default destructor.
~ACE_Notification_Buffer (void); ~ACE_Notification_Buffer (void);
/// Pointer to the Event_Handler that will be dispatched /// Pointer to the Event_Handler that will be dispatched

6
dep/ACE_wrappers/ace/Event_Handler_T.cpp
View file

@ -1,6 +1,6 @@
// Event_Handler_T.cpp // Event_Handler_T.cpp
// //
// $Id: Event_Handler_T.cpp 80826 2008-03-04 14:51:23Z wotte $ // $Id: Event_Handler_T.cpp 91626 2010-09-07 10:59:20Z johnnyw $
#ifndef ACE_EVENT_HANDLER_T_CPP #ifndef ACE_EVENT_HANDLER_T_CPP
#define ACE_EVENT_HANDLER_T_CPP #define ACE_EVENT_HANDLER_T_CPP
@ -11,8 +11,6 @@
# pragma once # pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */ #endif /* ACE_LACKS_PRAGMA_ONCE */
#if defined (ACE_HAS_TEMPLATE_TYPEDEFS)
#if !defined (__ACE_INLINE__) #if !defined (__ACE_INLINE__)
#include "ace/Event_Handler_T.inl" #include "ace/Event_Handler_T.inl"
#endif /* __ACE_INLINE__ */ #endif /* __ACE_INLINE__ */
@ -120,6 +118,4 @@ ACE_Event_Handler_T<T>::handle_signal (int signum, siginfo_t *s, ucontext_t *u)
ACE_END_VERSIONED_NAMESPACE_DECL ACE_END_VERSIONED_NAMESPACE_DECL
#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */
#endif /* ACE_EVENT_HANDLER_T_CPP */ #endif /* ACE_EVENT_HANDLER_T_CPP */

5
dep/ACE_wrappers/ace/Event_Handler_T.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Event_Handler_T.h * @file Event_Handler_T.h
* *
* $Id: Event_Handler_T.h 83891 2008-11-28 11:01:50Z johnnyw $ * $Id: Event_Handler_T.h 91626 2010-09-07 10:59:20Z johnnyw $
* *
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu> * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
*/ */
@ -20,8 +20,6 @@
# pragma once # pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */ #endif /* ACE_LACKS_PRAGMA_ONCE */
#if defined (ACE_HAS_TEMPLATE_TYPEDEFS)
ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL
/** /**
@ -186,6 +184,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#pragma implementation ("Event_Handler_T.cpp") #pragma implementation ("Event_Handler_T.cpp")
#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */
#include /**/ "ace/post.h" #include /**/ "ace/post.h"
#endif /* ACE_EVENT_HANDLER_H */ #endif /* ACE_EVENT_HANDLER_H */

3
dep/ACE_wrappers/ace/Event_Handler_T.inl
View file

@ -1,6 +1,5 @@
// -*- C++ -*- // -*- C++ -*-
// // $Id: Event_Handler_T.inl 91626 2010-09-07 10:59:20Z johnnyw $
// $Id: Event_Handler_T.inl 80826 2008-03-04 14:51:23Z wotte $
#include "ace/Global_Macros.h" #include "ace/Global_Macros.h"

2
dep/ACE_wrappers/ace/FIFO_Recv_Msg.inl
View file

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
// //
// $Id: FIFO_Recv_Msg.inl 82559 2008-08-07 20:23:07Z parsons $ // $Id: FIFO_Recv_Msg.inl 91813 2010-09-17 07:52:52Z johnnyw $
#include "ace/Min_Max.h" #include "ace/Min_Max.h"
#include "ace/OS_NS_stropts.h" #include "ace/OS_NS_stropts.h"

21
dep/ACE_wrappers/ace/FILE.h
View file

@ -4,7 +4,7 @@
/** /**
* @file FILE.h * @file FILE.h
* *
* $Id: FILE.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: FILE.h 91685 2010-09-09 09:35:14Z johnnyw $
* *
* @author Gerhard Lenzer * @author Gerhard Lenzer
*/ */
@ -22,19 +22,6 @@
#include "ace/FILE_Addr.h" #include "ace/FILE_Addr.h"
// The following is necessary since many C++ compilers don't support
// typedef'd types inside of classes used as formal template
// arguments... ;-(. Luckily, using the C++ preprocessor I can hide
// most of this nastiness!
#if defined (ACE_HAS_TEMPLATE_TYPEDEFS)
#define ACE_FILE_CONNECTOR ACE_FILE_Connector
#define ACE_FILE_STREAM ACE_FILE_IO
#else /* TEMPLATES are broken (must be a cfront-based compiler...) */
#define ACE_FILE_CONNECTOR ACE_FILE_Connector, ACE_FILE_Addr
#define ACE_FILE_STREAM ACE_FILE_IO, ACE_FILE_Addr
#endif /* ACE_TEMPLATE_TYPEDEFS */
ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL
/** /**
@ -85,13 +72,13 @@ public:
/** /**
* Sets the file pointer as follows: * Sets the file pointer as follows:
* o If <whence> is <SEEK_SET>, the pointer is set to @a offset * o If @ whence is @c SEEK_SET, the pointer is set to @a offset
* bytes. * bytes.
* *
* o If <whence> is <SEEK_CUR>, the pointer is set to its * o If @a whence> is @c SEEK_CUR, the pointer is set to its
* current location plus @a offset. * current location plus @a offset.
* *
* o If <whence> is <SEEK_END>, the pointer is set to the size * o If @a whence is @c SEEK_END, the pointer is set to the size
* of the file plus offset. * of the file plus offset.
*/ */
ACE_OFF_T seek (ACE_OFF_T offset, ACE_OFF_T seek (ACE_OFF_T offset,

6
dep/ACE_wrappers/ace/FILE_IO.h
View file

@ -4,7 +4,7 @@
/** /**
* @file FILE_IO.h * @file FILE_IO.h
* *
* $Id: FILE_IO.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: FILE_IO.h 92298 2010-10-21 11:15:17Z johnnyw $
* *
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu> * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
*/ */
@ -59,8 +59,8 @@ public:
/// Send n bytes, keep trying until n are sent. /// Send n bytes, keep trying until n are sent.
ssize_t send_n (const void *buf, size_t n) const; ssize_t send_n (const void *buf, size_t n) const;
/// Send all the @a message_blocks chained through their <next> and /// Send all the @a message_blocks chained through their next and
/// <cont> pointers. This call uses the underlying OS gather-write /// cont pointers. This call uses the underlying OS gather-write
/// operation to reduce the domain-crossing penalty. /// operation to reduce the domain-crossing penalty.
ssize_t send_n (const ACE_Message_Block *message_block, ssize_t send_n (const ACE_Message_Block *message_block,
const ACE_Time_Value *timeout = 0, const ACE_Time_Value *timeout = 0,

13
dep/ACE_wrappers/ace/Framework_Component.cpp
View file

@ -1,5 +1,4 @@
// Framework_Component.cpp // $Id: Framework_Component.cpp 92208 2010-10-13 06:20:39Z johnnyw $
// $Id: Framework_Component.cpp 91286 2010-08-05 09:04:31Z johnnyw $
#include "ace/Framework_Component.h" #include "ace/Framework_Component.h"
@ -13,8 +12,6 @@
#include "ace/Recursive_Thread_Mutex.h" #include "ace/Recursive_Thread_Mutex.h"
#include "ace/OS_NS_string.h" #include "ace/OS_NS_string.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_Framework_Component::~ACE_Framework_Component (void) ACE_Framework_Component::~ACE_Framework_Component (void)
@ -60,7 +57,7 @@ int
ACE_Framework_Repository::close (void) ACE_Framework_Repository::close (void)
{ {
ACE_TRACE ("ACE_Framework_Repository::close"); ACE_TRACE ("ACE_Framework_Repository::close");
ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
this->shutting_down_ = 1; this->shutting_down_ = 1;
@ -128,7 +125,7 @@ int
ACE_Framework_Repository::register_component (ACE_Framework_Component *fc) ACE_Framework_Repository::register_component (ACE_Framework_Component *fc)
{ {
ACE_TRACE ("ACE_Framework_Repository::register_component"); ACE_TRACE ("ACE_Framework_Repository::register_component");
ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
int i; int i;
// Check to see if it's already registered // Check to see if it's already registered
@ -155,7 +152,7 @@ int
ACE_Framework_Repository::remove_component (const ACE_TCHAR *name) ACE_Framework_Repository::remove_component (const ACE_TCHAR *name)
{ {
ACE_TRACE ("ACE_Framework_Repository::remove_component"); ACE_TRACE ("ACE_Framework_Repository::remove_component");
ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
int i; int i;
for (i = 0; i < this->current_size_; i++) for (i = 0; i < this->current_size_; i++)
@ -178,7 +175,7 @@ ACE_Framework_Repository::remove_dll_components (const ACE_TCHAR *dll_name)
if (this->shutting_down_) if (this->shutting_down_)
return this->remove_dll_components_i (dll_name); return this->remove_dll_components_i (dll_name);
ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
return this->remove_dll_components_i (dll_name); return this->remove_dll_components_i (dll_name);
} }

24
dep/ACE_wrappers/ace/Framework_Component.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Framework_Component.h * @file Framework_Component.h
* *
* $Id: Framework_Component.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: Framework_Component.h 92208 2010-10-13 06:20:39Z johnnyw $
* *
* A prototype mechanism that allows framework components, singletons * A prototype mechanism that allows framework components, singletons
* such as ACE_Reactor, ACE_Proactor, etc, to be registered with a * such as ACE_Reactor, ACE_Proactor, etc, to be registered with a
@ -45,6 +45,8 @@
#include "ace/os_include/os_signal.h" #include "ace/os_include/os_signal.h"
#include "ace/Thread_Mutex.h" #include "ace/Thread_Mutex.h"
#include "ace/Copy_Disabled.h"
#include "ace/Synch_Traits.h"
#define ACE_DEFAULT_FRAMEWORK_REPOSITORY_SIZE 1024 #define ACE_DEFAULT_FRAMEWORK_REPOSITORY_SIZE 1024
@ -56,7 +58,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
* @brief Base class that defines a uniform interface for all managed * @brief Base class that defines a uniform interface for all managed
* framework components. * framework components.
*/ */
class ACE_Export ACE_Framework_Component class ACE_Export ACE_Framework_Component : private ACE_Copy_Disabled
{ {
public: public:
friend class ACE_Framework_Repository; friend class ACE_Framework_Repository;
@ -73,11 +75,6 @@ protected:
/// Destructor. /// Destructor.
virtual ~ACE_Framework_Component (void); virtual ~ACE_Framework_Component (void);
private:
// No copy possible
ACE_Framework_Component (const ACE_Framework_Component &);
void operator= (const ACE_Framework_Component &);
private: private:
/// Pointer to the actual component. /// Pointer to the actual component.
const void *this_; const void *this_;
@ -98,7 +95,7 @@ private:
* destruction, framework components are destroyed in the reverse order * destruction, framework components are destroyed in the reverse order
* that they were added originally. * that they were added originally.
*/ */
class ACE_Export ACE_Framework_Repository class ACE_Export ACE_Framework_Repository : private ACE_Copy_Disabled
{ {
public: public:
// This is just to silence a compiler warning about no public ctors // This is just to silence a compiler warning about no public ctors
@ -166,10 +163,6 @@ private:
/// order. /// order.
void compact (void); void compact (void);
/// Disallow copying and assignment.
ACE_Framework_Repository (const ACE_Framework_Repository &);
ACE_Framework_Repository &operator= (const ACE_Framework_Repository &);
private: private:
/// Contains all the framework components. /// Contains all the framework components.
@ -190,11 +183,8 @@ private:
/// unload their components, e.g., ACE_DLL_Manager. /// unload their components, e.g., ACE_DLL_Manager.
static sig_atomic_t shutting_down_; static sig_atomic_t shutting_down_;
#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) /// Synchronization variable for the repository
/// Synchronization variable for the MT_SAFE Repository ACE_SYNCH_MUTEX lock_;
ACE_Thread_Mutex lock_;
#endif /* ACE_MT_SAFE */
}; };
ACE_END_VERSIONED_NAMESPACE_DECL ACE_END_VERSIONED_NAMESPACE_DECL

7
dep/ACE_wrappers/ace/Framework_Component.inl
View file

@ -1,6 +1,5 @@
// -*- C++ -*- // -*- C++ -*-
// // $Id: Framework_Component.inl 92208 2010-10-13 06:20:39Z johnnyw $
// $Id: Framework_Component.inl 80826 2008-03-04 14:51:23Z wotte $
#include "ace/ACE.h" #include "ace/ACE.h"
#include "ace/Guard_T.h" #include "ace/Guard_T.h"
@ -24,7 +23,7 @@ ACE_INLINE int
ACE_Framework_Repository::current_size (void) const ACE_Framework_Repository::current_size (void) const
{ {
ACE_TRACE ("ACE_Framework_Repository::current_size"); ACE_TRACE ("ACE_Framework_Repository::current_size");
ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, (ACE_Thread_Mutex &) this->lock_, -1)); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, const_cast <ACE_SYNCH_MUTEX&>(this->lock_), -1);
return this->current_size_; return this->current_size_;
} }
@ -32,7 +31,7 @@ ACE_INLINE int
ACE_Framework_Repository::total_size (void) const ACE_Framework_Repository::total_size (void) const
{ {
ACE_TRACE ("ACE_Framework_Repository::total_size"); ACE_TRACE ("ACE_Framework_Repository::total_size");
ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, (ACE_Thread_Mutex &) this->lock_, -1)); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, const_cast <ACE_SYNCH_MUTEX&>(this->lock_), -1);
return this->total_size_; return this->total_size_;
} }

8
dep/ACE_wrappers/ace/Framework_Component_T.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Framework_Component_T.h * @file Framework_Component_T.h
* *
* $Id: Framework_Component_T.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: Framework_Component_T.h 92208 2010-10-13 06:20:39Z johnnyw $
* *
* @author Don Hinton <dhinton@ieee.org> * @author Don Hinton <dhinton@ieee.org>
*/ */
@ -52,9 +52,9 @@ public:
ACE_END_VERSIONED_NAMESPACE_DECL ACE_END_VERSIONED_NAMESPACE_DECL
// This macro should be called in the instance() method /// This macro should be called in the instance() method
// of the Concrete class that will be managed. Along /// of the Concrete class that will be managed. Along
// with the appropriate template instantiation. /// with the appropriate template instantiation.
#define ACE_REGISTER_FRAMEWORK_COMPONENT(CLASS, INSTANCE) \ #define ACE_REGISTER_FRAMEWORK_COMPONENT(CLASS, INSTANCE) \
ACE_Framework_Repository::instance ()->register_component \ ACE_Framework_Repository::instance ()->register_component \
(new ACE_Framework_Component_T<CLASS> (INSTANCE)); (new ACE_Framework_Component_T<CLASS> (INSTANCE));

4
dep/ACE_wrappers/ace/Free_List.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Free_List.h * @file Free_List.h
* *
* $Id: Free_List.h 84619 2009-02-26 12:26:16Z johnnyw $ * $Id: Free_List.h 92298 2010-10-21 11:15:17Z johnnyw $
* *
* @author Darrell Brunsch (brunsch@cs.wustl.edu) * @author Darrell Brunsch (brunsch@cs.wustl.edu)
*/ */
@ -61,7 +61,7 @@ public:
* @brief Implements a free list. * @brief Implements a free list.
* *
* This class maintains a free list of nodes of type T. It * This class maintains a free list of nodes of type T. It
* depends on the type T having a <get_next> and <set_next> * depends on the type T having a get_next() and set_next()
* method. It maintains a mutex so the freelist can be used in * method. It maintains a mutex so the freelist can be used in
* a multithreaded program . * a multithreaded program .
*/ */

63
dep/ACE_wrappers/ace/Functor.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Functor.h * @file Functor.h
* *
* $Id: Functor.h 86698 2009-09-13 15:58:17Z johnnyw $ * $Id: Functor.h 92069 2010-09-28 11:38:59Z johnnyw $
* *
* Non-templatized classes and class template specializations for * Non-templatized classes and class template specializations for
* implementing function objects that are used in various places * implementing function objects that are used in various places
@ -121,67 +121,6 @@ public:
unsigned long operator () (unsigned char t) const; unsigned long operator () (unsigned char t) const;
}; };
#if 0
// @@ ADD HASHES FOR ACE TYPES
/**
* @brief Function object for hashing a 16-bit signed number
*/
template<>
class ACE_Export ACE_Hash<ACE_INT16>
{
public:
/// Simply returns t
unsigned long operator () (ACE_INT16 t) const;
};
/**
* @brief Function object for hashing a 16-bit unsigned number
*/
template<>
class ACE_Export ACE_Hash<ACE_UINT16>
{
public:
/// Simply returns t
unsigned long operator () (ACE_UINT16 t) const;
};
/**
* @brief Function object for hashing a 32-bit signed number
*/
template<>
class ACE_Export ACE_Hash<ACE_INT32>
{
public:
/// Simply returns t
unsigned long operator () (ACE_INT32 t) const;
};
/**
* @brief Function object for hashing a 32-bit unsigned number
*/
template<>
class ACE_Export ACE_Hash<ACE_UINT32>
{
public:
/// Simply returns t
unsigned long operator () (ACE_UINT32 t) const;
};
/**
* @brief Function object for hashing a 64-bit unsigned number
*/
template<>
class ACE_Export ACE_Hash<ACE_UINT64>
{
public:
/// Simply returns t
unsigned long operator () (ACE_UINT64 t) const;
};
// @@ DONE ADDING HASHES FOR ACE TYPES
#endif
/** /**
* @brief Function object for hashing a short number * @brief Function object for hashing a short number
*/ */

38
dep/ACE_wrappers/ace/Functor.inl
View file

@ -4,7 +4,7 @@
/** /**
* @file Functor.inl * @file Functor.inl
* *
* $Id: Functor.inl 80826 2008-03-04 14:51:23Z wotte $ * $Id: Functor.inl 92069 2010-09-28 11:38:59Z johnnyw $
* *
* Inlinable method definitions for non-templatized classes * Inlinable method definitions for non-templatized classes
* and template specializations implementing the GOF Command Pattern, * and template specializations implementing the GOF Command Pattern,
@ -71,42 +71,6 @@ ACE_Hash<unsigned char>::operator () (unsigned char t) const
return t; return t;
} }
#if 0
ACE_INLINE unsigned long
ACE_Hash<ACE_INT16>::operator () (ACE_INT16 t) const
{
return t;
}
ACE_INLINE unsigned long
ACE_Hash<ACE_UINT16>::operator () (ACE_UINT16 t) const
{
return t;
}
ACE_INLINE unsigned long
ACE_Hash<ACE_INT32>::operator () (ACE_INT32 t) const
{
return static_cast<unsigned long> (t);
}
ACE_INLINE unsigned long
ACE_Hash<ACE_UINT32>::operator () (ACE_UINT32 t) const
{
return t;
}
ACE_INLINE unsigned long
ACE_Hash<ACE_UINT64>::operator () (ACE_UINT64 t) const
{
#if (ACE_SIZEOF_LONG == 4)
return ACE_U64_TO_U32 (t);
#else
return static_cast<unsigned long> (t);
#endif /* ACE_SIZEOF_LONG */
}
#endif
ACE_INLINE unsigned long ACE_INLINE unsigned long
ACE_Hash<short>::operator () (short t) const ACE_Hash<short>::operator () (short t) const
{ {

22
dep/ACE_wrappers/ace/Future.cpp
View file

@ -1,4 +1,4 @@
// $Id: Future.cpp 91286 2010-08-05 09:04:31Z johnnyw $ // $Id: Future.cpp 91626 2010-09-07 10:59:20Z johnnyw $
#ifndef ACE_FUTURE_CPP #ifndef ACE_FUTURE_CPP
#define ACE_FUTURE_CPP #define ACE_FUTURE_CPP
@ -98,7 +98,7 @@ ACE_Future_Rep<T>::attach (ACE_Future_Rep<T>*& rep)
{ {
ACE_ASSERT (rep != 0); ACE_ASSERT (rep != 0);
// Use value_ready_mutex_ for both condition and ref count management // Use value_ready_mutex_ for both condition and ref count management
ACE_MT (ACE_Guard<ACE_Recursive_Thread_Mutex> r_mon (rep->value_ready_mutex_)); // ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, r_mon, rep->value_ready_mutex_, 0);
++rep->ref_count_; ++rep->ref_count_;
return rep; return rep;
} }
@ -108,7 +108,7 @@ ACE_Future_Rep<T>::detach (ACE_Future_Rep<T>*& rep)
{ {
ACE_ASSERT (rep != 0); ACE_ASSERT (rep != 0);
// Use value_ready_mutex_ for both condition and ref count management // Use value_ready_mutex_ for both condition and ref count management
ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, r_mon, rep->value_ready_mutex_)); ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, r_mon, rep->value_ready_mutex_);
if (rep->ref_count_-- == 0) if (rep->ref_count_-- == 0)
{ {
@ -126,7 +126,7 @@ ACE_Future_Rep<T>::assign (ACE_Future_Rep<T>*& rep, ACE_Future_Rep<T>* new_rep)
ACE_ASSERT (rep != 0); ACE_ASSERT (rep != 0);
ACE_ASSERT (new_rep != 0); ACE_ASSERT (new_rep != 0);
// Use value_ready_mutex_ for both condition and ref count management // Use value_ready_mutex_ for both condition and ref count management
ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, r_mon, rep->value_ready_mutex_)); ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, r_mon, rep->value_ready_mutex_);
ACE_Future_Rep<T>* old = rep; ACE_Future_Rep<T>* old = rep;
rep = new_rep; rep = new_rep;
@ -169,10 +169,10 @@ ACE_Future_Rep<T>::set (const T &r,
// If the value is already produced, ignore it... // If the value is already produced, ignore it...
if (this->value_ == 0) if (this->value_ == 0)
{ {
ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX,
ace_mon, ace_mon,
this->value_ready_mutex_, this->value_ready_mutex_,
-1)); -1);
// Otherwise, create a new result value. Note the use of the // Otherwise, create a new result value. Note the use of the
// Double-checked locking pattern to avoid multiple allocations. // Double-checked locking pattern to avoid multiple allocations.
@ -210,9 +210,9 @@ ACE_Future_Rep<T>::get (T &value,
// If the value is already produced, return it. // If the value is already produced, return it.
if (this->value_ == 0) if (this->value_ == 0)
{ {
ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon,
this->value_ready_mutex_, this->value_ready_mutex_,
-1)); -1);
// If the value is not yet defined we must block until the // If the value is not yet defined we must block until the
// producer writes to it. // producer writes to it.
@ -232,7 +232,7 @@ template <class T> int
ACE_Future_Rep<T>::attach (ACE_Future_Observer<T> *observer, ACE_Future_Rep<T>::attach (ACE_Future_Observer<T> *observer,
ACE_Future<T> &caller) ACE_Future<T> &caller)
{ {
ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->value_ready_mutex_, -1)); ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->value_ready_mutex_, -1);
// Otherwise, create a new result value. Note the use of the // Otherwise, create a new result value. Note the use of the
// Double-checked locking pattern to avoid corrupting the list. // Double-checked locking pattern to avoid corrupting the list.
@ -251,7 +251,7 @@ ACE_Future_Rep<T>::attach (ACE_Future_Observer<T> *observer,
template <class T> int template <class T> int
ACE_Future_Rep<T>::detach (ACE_Future_Observer<T> *observer) ACE_Future_Rep<T>::detach (ACE_Future_Observer<T> *observer)
{ {
ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->value_ready_mutex_, -1)); ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->value_ready_mutex_, -1);
// Remove all occurrences of the specified observer from this // Remove all occurrences of the specified observer from this
// objects hash map. // objects hash map.
@ -265,7 +265,7 @@ ACE_Future_Rep<T>::operator T ()
if (this->value_ == 0) if (this->value_ == 0)
{ {
// Constructor of ace_mon acquires the mutex. // Constructor of ace_mon acquires the mutex.
ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->value_ready_mutex_, 0)); ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->value_ready_mutex_, 0);
// If the value is not yet defined we must block until the // If the value is not yet defined we must block until the
// producer writes to it. // producer writes to it.

14
dep/ACE_wrappers/ace/Future.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Future.h * @file Future.h
* *
* $Id: Future.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: Future.h 91626 2010-09-07 10:59:20Z johnnyw $
* *
* @author Andres Kruse <Andres.Kruse@cern.ch> * @author Andres Kruse <Andres.Kruse@cern.ch>
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu> * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
@ -27,6 +27,7 @@
#if defined (ACE_HAS_THREADS) #if defined (ACE_HAS_THREADS)
#include "ace/Synch_Traits.h"
#include "ace/Recursive_Thread_Mutex.h" #include "ace/Recursive_Thread_Mutex.h"
#include "ace/Condition_Recursive_Thread_Mutex.h" #include "ace/Condition_Recursive_Thread_Mutex.h"
@ -107,7 +108,7 @@ private:
friend class ACE_Future<T>; friend class ACE_Future<T>;
/** /**
* Set the result value. The specified <caller> represents the * Set the result value. The specified @a caller represents the
* future that invoked this <set> method, which is used to notify * future that invoked this <set> method, which is used to notify
* the list of future observers. Returns 0 for success, -1 on error. * the list of future observers. Returns 0 for success, -1 on error.
* This function only has an effect the first time it is called for * This function only has an effect the first time it is called for
@ -214,8 +215,8 @@ private:
OBSERVER_COLLECTION observer_collection_; OBSERVER_COLLECTION observer_collection_;
// = Condition variable and mutex that protect the <value_>. // = Condition variable and mutex that protect the <value_>.
mutable ACE_Recursive_Thread_Mutex value_ready_mutex_; mutable ACE_SYNCH_RECURSIVE_MUTEX value_ready_mutex_;
mutable ACE_Condition_Recursive_Thread_Mutex value_ready_; mutable ACE_SYNCH_RECURSIVE_CONDITION value_ready_;
private: private:
@ -303,8 +304,7 @@ public:
* @retval 0 Success; @a value contains the value of the ACE_Future. * @retval 0 Success; @a value contains the value of the ACE_Future.
* @retval -1 Error; check ACE_OS::last_error() for an error code. * @retval -1 Error; check ACE_OS::last_error() for an error code.
*/ */
int get (T &value, int get (T &value, ACE_Time_Value *tv = 0) const;
ACE_Time_Value *tv = 0) const;
/** /**
* @deprecated Note that this method is going away in a subsequent * @deprecated Note that this method is going away in a subsequent
@ -364,7 +364,7 @@ public:
private: private:
// the ACE_Future_Rep /// The ACE_Future_Rep
/// Protect operations on the <Future>. /// Protect operations on the <Future>.
typedef ACE_Future_Rep<T> FUTURE_REP; typedef ACE_Future_Rep<T> FUTURE_REP;
FUTURE_REP *future_rep_; FUTURE_REP *future_rep_;

4
dep/ACE_wrappers/ace/Future_Set.cpp
View file

@ -1,4 +1,4 @@
// $Id: Future_Set.cpp 88128 2009-12-14 02:17:22Z schmidt $ // $Id: Future_Set.cpp 91626 2010-09-07 10:59:20Z johnnyw $
#ifndef ACE_FUTURE_SET_CPP #ifndef ACE_FUTURE_SET_CPP
#define ACE_FUTURE_SET_CPP #define ACE_FUTURE_SET_CPP
@ -83,7 +83,7 @@ ACE_Future_Set<T>::insert (ACE_Future<T> &future)
template <class T> void template <class T> void
ACE_Future_Set<T>::update (const ACE_Future<T> &future) ACE_Future_Set<T>::update (const ACE_Future<T> &future)
{ {
ACE_Message_Block *mb; ACE_Message_Block *mb = 0;
FUTURE &local_future = const_cast<ACE_Future<T> &> (future); FUTURE &local_future = const_cast<ACE_Future<T> &> (future);
ACE_NEW (mb, ACE_NEW (mb,

9
dep/ACE_wrappers/ace/Future_Set.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Future_Set.h * @file Future_Set.h
* *
* $Id: Future_Set.h 88128 2009-12-14 02:17:22Z schmidt $ * $Id: Future_Set.h 91626 2010-09-07 10:59:20Z johnnyw $
* *
* @author John Tucker <jtucker@infoglide.com> * @author John Tucker <jtucker@infoglide.com>
*/ */
@ -41,7 +41,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
* using the ACE_Future_Set::next_readable() method. * using the ACE_Future_Set::next_readable() method.
*/ */
template <class T> template <class T>
class ACE_Future_Set : public ACE_Future_Observer<T> class ACE_Future_Set : public ACE_Future_Observer<T>,
private ACE_Copy_Disabled
{ {
public: public:
// = Initialization and termination methods. // = Initialization and termination methods.
@ -99,10 +100,6 @@ public:
ACE_ALLOC_HOOK_DECLARE; ACE_ALLOC_HOOK_DECLARE;
private: private:
// = Disallow these operations.
ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Future_Set<T> &))
ACE_UNIMPLEMENTED_FUNC (ACE_Future_Set (const ACE_Future_Set<T> &))
typedef ACE_Future<T> FUTURE; typedef ACE_Future<T> FUTURE;
typedef ACE_Future_Rep<T> FUTURE_REP; typedef ACE_Future_Rep<T> FUTURE_REP;

126
dep/ACE_wrappers/ace/Global_Macros.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Global_Macros.h * @file Global_Macros.h
* *
* $Id: Global_Macros.h 91459 2010-08-25 09:51:01Z mcorino $ * $Id: Global_Macros.h 91685 2010-09-09 09:35:14Z johnnyw $
* *
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu> * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
* @author Jesper S. M|ller<stophph@diku.dk> * @author Jesper S. M|ller<stophph@diku.dk>
@ -106,9 +106,11 @@ ACE_END_VERSIONED_NAMESPACE_DECL
// ---------------------------------------------------------------- // ----------------------------------------------------------------
// FUZZ: disable check_for_ACE_Guard
// Convenient macro for testing for deadlock, as well as for detecting // Convenient macro for testing for deadlock, as well as for detecting
// when mutexes fail. // when mutexes fail.
/* WARNING: /* @warning
* Use of ACE_GUARD() is rarely correct. ACE_GUARD() causes the current * Use of ACE_GUARD() is rarely correct. ACE_GUARD() causes the current
* function to return if the lock is not acquired. Since merely returning * function to return if the lock is not acquired. Since merely returning
* (no value) almost certainly fails to handle the acquisition failure * (no value) almost certainly fails to handle the acquisition failure
@ -118,28 +120,45 @@ ACE_END_VERSIONED_NAMESPACE_DECL
* ACE_GUARD_REACTION() is better because it lets you specify error * ACE_GUARD_REACTION() is better because it lets you specify error
* handling code. * handling code.
*/ */
#if !defined (ACE_GUARD_ACTION)
#define ACE_GUARD_ACTION(MUTEX, OBJ, LOCK, ACTION, REACTION) \ #define ACE_GUARD_ACTION(MUTEX, OBJ, LOCK, ACTION, REACTION) \
ACE_Guard< MUTEX > OBJ (LOCK); \ ACE_Guard< MUTEX > OBJ (LOCK); \
if (OBJ.locked () != 0) { ACTION; } \ if (OBJ.locked () != 0) { ACTION; } \
else { REACTION; } else { REACTION; }
#endif /* !ACE_GUARD_ACTION */
#if !defined (ACE_GUARD_REACTION)
#define ACE_GUARD_REACTION(MUTEX, OBJ, LOCK, REACTION) \ #define ACE_GUARD_REACTION(MUTEX, OBJ, LOCK, REACTION) \
ACE_GUARD_ACTION(MUTEX, OBJ, LOCK, ;, REACTION) ACE_GUARD_ACTION(MUTEX, OBJ, LOCK, ;, REACTION)
#endif /* !ACE_GUARD_REACTION */
#if !defined (ACE_GUARD)
#define ACE_GUARD(MUTEX, OBJ, LOCK) \ #define ACE_GUARD(MUTEX, OBJ, LOCK) \
ACE_GUARD_REACTION(MUTEX, OBJ, LOCK, return) ACE_GUARD_REACTION(MUTEX, OBJ, LOCK, return)
#endif /* !ACE_GUARD */
#if !defined (ACE_GUARD_RETURN)
#define ACE_GUARD_RETURN(MUTEX, OBJ, LOCK, RETURN) \ #define ACE_GUARD_RETURN(MUTEX, OBJ, LOCK, RETURN) \
ACE_GUARD_REACTION(MUTEX, OBJ, LOCK, return RETURN) ACE_GUARD_REACTION(MUTEX, OBJ, LOCK, return RETURN)
#endif /* !ACE_GUARD_RETURN */
#if !defined (ACE_WRITE_GUARD)
# define ACE_WRITE_GUARD(MUTEX,OBJ,LOCK) \ # define ACE_WRITE_GUARD(MUTEX,OBJ,LOCK) \
ACE_Write_Guard< MUTEX > OBJ (LOCK); \ ACE_Write_Guard< MUTEX > OBJ (LOCK); \
if (OBJ.locked () == 0) return; if (OBJ.locked () == 0) return;
#endif /* !ACE_WRITE_GUARD */
#if !defined (ACE_WRITE_GUARD_RETURN)
# define ACE_WRITE_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \ # define ACE_WRITE_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \
ACE_Write_Guard< MUTEX > OBJ (LOCK); \ ACE_Write_Guard< MUTEX > OBJ (LOCK); \
if (OBJ.locked () == 0) return RETURN; if (OBJ.locked () == 0) return RETURN;
#endif /* ACE_WRITE_GUARD_RETURN */
#if !defined (ACE_READ_GUARD)
# define ACE_READ_GUARD(MUTEX,OBJ,LOCK) \ # define ACE_READ_GUARD(MUTEX,OBJ,LOCK) \
ACE_Read_Guard< MUTEX > OBJ (LOCK); \ ACE_Read_Guard< MUTEX > OBJ (LOCK); \
if (OBJ.locked () == 0) return; if (OBJ.locked () == 0) return;
#endif /* !ACE_READ_GUARD */
#if !defined (ACE_READ_GUARD_RETURN)
# define ACE_READ_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \ # define ACE_READ_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \
ACE_Read_Guard< MUTEX > OBJ (LOCK); \ ACE_Read_Guard< MUTEX > OBJ (LOCK); \
if (OBJ.locked () == 0) return RETURN; if (OBJ.locked () == 0) return RETURN;
#endif /* !ACE_READ_GUARD_RETURN */
// FUZZ: enable check_for_ACE_Guard
// ---------------------------------------------------------------- // ----------------------------------------------------------------
@ -908,15 +927,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
# define ACE_SEH_FINALLY if (1) # define ACE_SEH_FINALLY if (1)
#endif /* ACE_WIN32 */ #endif /* ACE_WIN32 */
// These should probably be put into a seperate header.
// The following is necessary since many C++ compilers don't support
// typedef'd types inside of classes used as formal template
// arguments... ;-(. Luckily, using the C++ preprocessor I can hide
// most of this nastiness!
# if defined (ACE_HAS_TEMPLATE_TYPEDEFS)
// Handle ACE_Message_Queue. // Handle ACE_Message_Queue.
# define ACE_SYNCH_DECL class _ACE_SYNCH # define ACE_SYNCH_DECL class _ACE_SYNCH
# define ACE_SYNCH_USE _ACE_SYNCH # define ACE_SYNCH_USE _ACE_SYNCH
@ -987,10 +997,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
# define ACE_UPIPE_CONNECTOR ACE_UPIPE_Connector # define ACE_UPIPE_CONNECTOR ACE_UPIPE_Connector
# define ACE_UPIPE_STREAM ACE_UPIPE_Stream # define ACE_UPIPE_STREAM ACE_UPIPE_Stream
// Handle ACE_FILE_*
# define ACE_FILE_CONNECTOR ACE_FILE_Connector
# define ACE_FILE_STREAM ACE_FILE_IO
// Handle ACE_*_Memory_Pool. // Handle ACE_*_Memory_Pool.
# define ACE_MMAP_MEMORY_POOL ACE_MMAP_Memory_Pool # define ACE_MMAP_MEMORY_POOL ACE_MMAP_Memory_Pool
# define ACE_LITE_MMAP_MEMORY_POOL ACE_Lite_MMAP_Memory_Pool # define ACE_LITE_MMAP_MEMORY_POOL ACE_Lite_MMAP_Memory_Pool
@ -999,96 +1005,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
# define ACE_LOCAL_MEMORY_POOL ACE_Local_Memory_Pool # define ACE_LOCAL_MEMORY_POOL ACE_Local_Memory_Pool
# define ACE_PAGEFILE_MEMORY_POOL ACE_Pagefile_Memory_Pool # define ACE_PAGEFILE_MEMORY_POOL ACE_Pagefile_Memory_Pool
# else /* TEMPLATES are broken in some form or another (i.e., most C++ compilers) */
// Handle ACE_Message_Queue.
# if defined (ACE_HAS_OPTIMIZED_MESSAGE_QUEUE)
# define ACE_SYNCH_DECL class _ACE_SYNCH_MUTEX_T, class _ACE_SYNCH_CONDITION_T, class _ACE_SYNCH_SEMAPHORE_T
# define ACE_SYNCH_USE _ACE_SYNCH_MUTEX_T, _ACE_SYNCH_CONDITION_T, _ACE_SYNCH_SEMAPHORE_T
# else
# define ACE_SYNCH_DECL class _ACE_SYNCH_MUTEX_T, class _ACE_SYNCH_CONDITION_T
# define ACE_SYNCH_USE _ACE_SYNCH_MUTEX_T, _ACE_SYNCH_CONDITION_T
# endif /* ACE_HAS_OPTIMIZED_MESSAGE_QUEUE */
# define ACE_SYNCH_MUTEX_T _ACE_SYNCH_MUTEX_T
# define ACE_SYNCH_CONDITION_T _ACE_SYNCH_CONDITION_T
# define ACE_SYNCH_SEMAPHORE_T _ACE_SYNCH_SEMAPHORE_T
// Handle ACE_Malloc*
# define ACE_MEM_POOL_1 class _ACE_MEM_POOL, class _ACE_MEM_POOL_OPTIONS
# define ACE_MEM_POOL_2 _ACE_MEM_POOL, _ACE_MEM_POOL_OPTIONS
# define ACE_MEM_POOL _ACE_MEM_POOL
# define ACE_MEM_POOL_OPTIONS _ACE_MEM_POOL_OPTIONS
// Handle ACE_Svc_Handler
# define ACE_PEER_STREAM_1 class _ACE_PEER_STREAM, class _ACE_PEER_ADDR
# define ACE_PEER_STREAM_2 _ACE_PEER_STREAM, _ACE_PEER_ADDR
# define ACE_PEER_STREAM _ACE_PEER_STREAM
# define ACE_PEER_STREAM_ADDR _ACE_PEER_ADDR
// Handle ACE_Acceptor
# define ACE_PEER_ACCEPTOR_1 class _ACE_PEER_ACCEPTOR, class _ACE_PEER_ADDR
# define ACE_PEER_ACCEPTOR_2 _ACE_PEER_ACCEPTOR, _ACE_PEER_ADDR
# define ACE_PEER_ACCEPTOR _ACE_PEER_ACCEPTOR
# define ACE_PEER_ACCEPTOR_ADDR _ACE_PEER_ADDR
// Handle ACE_Connector
# define ACE_PEER_CONNECTOR_1 class _ACE_PEER_CONNECTOR, class _ACE_PEER_ADDR
# define ACE_PEER_CONNECTOR_2 _ACE_PEER_CONNECTOR, _ACE_PEER_ADDR
# define ACE_PEER_CONNECTOR _ACE_PEER_CONNECTOR
# define ACE_PEER_CONNECTOR_ADDR _ACE_PEER_ADDR
# define ACE_PEER_CONNECTOR_ADDR_ANY ACE_PEER_CONNECTOR_ADDR::sap_any
// Handle ACE_SOCK_*
# define ACE_SOCK_ACCEPTOR ACE_SOCK_Acceptor, ACE_INET_Addr
# define ACE_SOCK_CONNECTOR ACE_SOCK_Connector, ACE_INET_Addr
# define ACE_SOCK_STREAM ACE_SOCK_Stream, ACE_INET_Addr
# define ACE_SOCK_DGRAM ACE_SOCK_Dgram, ACE_INET_Addr
# define ACE_SOCK_DGRAM_BCAST ACE_SOCK_Dgram_Bcast, ACE_INET_Addr
# define ACE_SOCK_DGRAM_MCAST ACE_SOCK_Dgram_Mcast, ACE_INET_Addr
// Handle ACE_SOCK_SEQPACK_*
# define ACE_SOCK_SEQPACK_ACCEPTOR ACE_SOCK_SEQPACK_Acceptor, ACE_Multihomed_INET_Addr
# define ACE_SOCK_SEQPACK_CONNECTOR ACE_SOCK_SEQPACK_Connector, ACE_Multihomed_INET_Addr
# define ACE_SOCK_SEQPACK_ASSOCIATION ACE_SOCK_SEQPACK_Association, ACE_Multihomed_INET_Addr
// Handle ACE_MEM_*
# define ACE_MEM_ACCEPTOR ACE_MEM_Acceptor, ACE_MEM_Addr
# define ACE_MEM_CONNECTOR ACE_MEM_Connector, ACE_INET_Addr
# define ACE_MEM_STREAM ACE_MEM_Stream, ACE_INET_Addr
// Handle ACE_LSOCK_*
# define ACE_LSOCK_ACCEPTOR ACE_LSOCK_Acceptor, ACE_UNIX_Addr
# define ACE_LSOCK_CONNECTOR ACE_LSOCK_Connector, ACE_UNIX_Addr
# define ACE_LSOCK_STREAM ACE_LSOCK_Stream, ACE_UNIX_Addr
// Handle ACE_TLI_*
# define ACE_TLI_ACCEPTOR ACE_TLI_Acceptor, ACE_INET_Addr
# define ACE_TLI_CONNECTOR ACE_TLI_Connector, ACE_INET_Addr
# define ACE_TLI_STREAM ACE_TLI_Stream, ACE_INET_Addr
// Handle ACE_SPIPE_*
# define ACE_SPIPE_ACCEPTOR ACE_SPIPE_Acceptor, ACE_SPIPE_Addr
# define ACE_SPIPE_CONNECTOR ACE_SPIPE_Connector, ACE_SPIPE_Addr
# define ACE_SPIPE_STREAM ACE_SPIPE_Stream, ACE_SPIPE_Addr
// Handle ACE_UPIPE_*
# define ACE_UPIPE_ACCEPTOR ACE_UPIPE_Acceptor, ACE_SPIPE_Addr
# define ACE_UPIPE_CONNECTOR ACE_UPIPE_Connector, ACE_SPIPE_Addr
# define ACE_UPIPE_STREAM ACE_UPIPE_Stream, ACE_SPIPE_Addr
// Handle ACE_FILE_*
# define ACE_FILE_CONNECTOR ACE_FILE_Connector, ACE_FILE_Addr
# define ACE_FILE_STREAM ACE_FILE_IO, ACE_FILE_Addr
// Handle ACE_*_Memory_Pool.
# define ACE_MMAP_MEMORY_POOL ACE_MMAP_Memory_Pool, ACE_MMAP_Memory_Pool_Options
# define ACE_LITE_MMAP_MEMORY_POOL ACE_Lite_MMAP_Memory_Pool, ACE_MMAP_Memory_Pool_Options
# define ACE_SBRK_MEMORY_POOL ACE_Sbrk_Memory_Pool, ACE_Sbrk_Memory_Pool_Options
# define ACE_SHARED_MEMORY_POOL ACE_Shared_Memory_Pool, ACE_Shared_Memory_Pool_Options
# define ACE_LOCAL_MEMORY_POOL ACE_Local_Memory_Pool, ACE_Local_Memory_Pool_Options
# define ACE_PAGEFILE_MEMORY_POOL ACE_Pagefile_Memory_Pool, ACE_Pagefile_Memory_Pool_Options
# endif /* ACE_HAS_TEMPLATE_TYPEDEFS */
// Work around compilers that don't like in-class static integral // Work around compilers that don't like in-class static integral
// constants. Constants in this case are meant to be compile-time // constants. Constants in this case are meant to be compile-time
// constants so that they may be used as template arguments, for // constants so that they may be used as template arguments, for

6
dep/ACE_wrappers/ace/Guard_T.cpp
View file

@ -1,8 +1,10 @@
// $Id: Guard_T.cpp 85141 2009-04-22 08:48:30Z johnnyw $ // $Id: Guard_T.cpp 92052 2010-09-27 14:20:22Z vzykov $
#ifndef ACE_GUARD_T_CPP #ifndef ACE_GUARD_T_CPP
#define ACE_GUARD_T_CPP #define ACE_GUARD_T_CPP
// FUZZ: disable check_for_ACE_Guard
#include "ace/Guard_T.h" #include "ace/Guard_T.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE) #if !defined (ACE_LACKS_PRAGMA_ONCE)
@ -32,7 +34,7 @@ ACE_Guard<ACE_LOCK>::dump (void) const
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("mutex_ = %x\n"), this->lock_)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("mutex_ = %x\n"), this->lock_));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_ = %d\n"), this->owner_)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_ = %d\n"), this->owner_));
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
#endif /* ACE_HAS_DUMP */ #endif /* ACE_HAS_DUMP */
} }

28
dep/ACE_wrappers/ace/Guard_T.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Guard_T.h * @file Guard_T.h
* *
* $Id: Guard_T.h 91459 2010-08-25 09:51:01Z mcorino $ * $Id: Guard_T.h 91626 2010-09-07 10:59:20Z johnnyw $
* *
* Moved from Synch.h. * Moved from Synch.h.
* *
@ -25,6 +25,8 @@
#include "ace/Global_Macros.h" #include "ace/Global_Macros.h"
#include "ace/OS_NS_Thread.h" #include "ace/OS_NS_Thread.h"
// FUZZ: disable check_for_ACE_Guard
ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL
/** /**
@ -38,7 +40,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
* the very least the <acquire>, <tryacquire>, <release>, and * the very least the <acquire>, <tryacquire>, <release>, and
* <remove> methods. * <remove> methods.
* *
* WARNING: A successfully constructed ACE_Guard does NOT mean that the * @warning A successfully constructed ACE_Guard does NOT mean that the
* lock was acquired! It is the caller's responsibility, after * lock was acquired! It is the caller's responsibility, after
* constructing an ACE_Guard, to check whether the lock was successfully * constructing an ACE_Guard, to check whether the lock was successfully
* acquired. Code like this is dangerous: * acquired. Code like this is dangerous:
@ -138,7 +140,7 @@ private:
* <ACE_LOCK> it is instantiated with must support the appropriate * <ACE_LOCK> it is instantiated with must support the appropriate
* API). * API).
* *
* WARNING: See important "WARNING" in comments at top of ACE_Guard. * @warning See important "WARNING" in comments at top of ACE_Guard.
*/ */
template <class ACE_LOCK> template <class ACE_LOCK>
class ACE_Write_Guard : public ACE_Guard<ACE_LOCK> class ACE_Write_Guard : public ACE_Guard<ACE_LOCK>
@ -184,7 +186,7 @@ public:
* <ACE_LOCK> it is instantiated with must support the appropriate * <ACE_LOCK> it is instantiated with must support the appropriate
* API). * API).
* *
* WARNING: See important "WARNING" in comments at top of ACE_Guard. * @warning See important "WARNING" in comments at top of ACE_Guard.
*/ */
template <class ACE_LOCK> template <class ACE_LOCK>
class ACE_Read_Guard : public ACE_Guard<ACE_LOCK> class ACE_Read_Guard : public ACE_Guard<ACE_LOCK>
@ -241,7 +243,7 @@ public:
* is released even if a thread exits via <thr_exit>! * is released even if a thread exits via <thr_exit>!
*/ */
template <class ACE_LOCK> template <class ACE_LOCK>
class ACE_TSS_Guard class ACE_TSS_Guard : private ACE_Copy_Disabled
{ {
public: public:
// = Initialization and termination methods. // = Initialization and termination methods.
@ -288,9 +290,9 @@ protected:
ACE_thread_key_t key_; ACE_thread_key_t key_;
private: private:
// = Prevent assignment and initialization. // FUZZ: disable check_for_ACE_Guard
ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS_Guard<ACE_LOCK> &)) typedef ACE_Guard<ACE_LOCK> Guard_Type;
ACE_UNIMPLEMENTED_FUNC (ACE_TSS_Guard (const ACE_TSS_Guard<ACE_LOCK> &)) // FUZZ: enable check_for_ACE_Guard
}; };
/** /**
@ -331,6 +333,11 @@ public:
// ACE_ALLOC_HOOK_DECLARE; // ACE_ALLOC_HOOK_DECLARE;
// Declare the dynamic allocation hooks. // Declare the dynamic allocation hooks.
private:
// FUZZ: disable check_for_ACE_Guard
typedef ACE_Guard<ACE_LOCK> Guard_Type;
typedef ACE_Write_Guard<ACE_LOCK> Write_Guard_Type;
// FUZZ: enable check_for_ACE_Guard
}; };
/** /**
@ -370,6 +377,11 @@ public:
// ACE_ALLOC_HOOK_DECLARE; // ACE_ALLOC_HOOK_DECLARE;
// Declare the dynamic allocation hooks. // Declare the dynamic allocation hooks.
private:
// FUZZ: disable check_for_ACE_Guard
typedef ACE_Guard<ACE_LOCK> Guard_Type;
typedef ACE_Read_Guard<ACE_LOCK> Read_Guard_Type;
// FUZZ: enable check_for_ACE_Guard
}; };
#endif /* !(defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) */ #endif /* !(defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) */

4
dep/ACE_wrappers/ace/Guard_T.inl
View file

@ -1,6 +1,8 @@
// -*- C++ -*- // -*- C++ -*-
// //
// $Id: Guard_T.inl 82723 2008-09-16 09:35:44Z johnnyw $ // $Id: Guard_T.inl 91626 2010-09-07 10:59:20Z johnnyw $
// FUZZ: disable check_for_ACE_Guard
#include "ace/RW_Thread_Mutex.h" #include "ace/RW_Thread_Mutex.h"

6
dep/ACE_wrappers/ace/Handle_Set.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Handle_Set.h * @file Handle_Set.h
* *
* $Id: Handle_Set.h 82723 2008-09-16 09:35:44Z johnnyw $ * $Id: Handle_Set.h 92298 2010-10-21 11:15:17Z johnnyw $
* *
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu> * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
*/ */
@ -196,10 +196,10 @@ public:
ACE_ALLOC_HOOK_DECLARE; ACE_ALLOC_HOOK_DECLARE;
private: private:
/// The <Handle_Set> we are iterating through. /// The Handle_Set we are iterating through.
const ACE_Handle_Set &handles_; const ACE_Handle_Set &handles_;
/// Index of the bit we're examining in the current <word_num_> word. /// Index of the bit we're examining in the current word_num_() word.
#if defined (ACE_WIN32) #if defined (ACE_WIN32)
u_int handle_index_; u_int handle_index_;
#elif !defined (ACE_HAS_BIG_FD_SET) #elif !defined (ACE_HAS_BIG_FD_SET)

10
dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.cpp
View file

@ -1,4 +1,4 @@
// $Id: Hash_Cache_Map_Manager_T.cpp 80826 2008-03-04 14:51:23Z wotte $ // $Id: Hash_Cache_Map_Manager_T.cpp 92097 2010-09-30 05:41:49Z msmit $
#ifndef ACE_HASH_CACHE_MAP_MANAGER_T_CPP #ifndef ACE_HASH_CACHE_MAP_MANAGER_T_CPP
#define ACE_HASH_CACHE_MAP_MANAGER_T_CPP #define ACE_HASH_CACHE_MAP_MANAGER_T_CPP
@ -54,7 +54,7 @@ ACE_Hash_Cache_Map_Manager<ACE_T2>::bind (const KEY &key,
{ {
int result = this->caching_strategy_.notify_bind (bind_result, int result = this->caching_strategy_.notify_bind (bind_result,
cache_value.second ()); cache_value.second);
if (result == -1) if (result == -1)
{ {
@ -164,7 +164,7 @@ ACE_Hash_Cache_Map_Manager<ACE_T2>::find (const KEY &key,
{ {
int result = this->caching_strategy_.notify_find (find_result, int result = this->caching_strategy_.notify_find (find_result,
entry->int_id_.second ()); entry->int_id_.second);
// Unless the find and notification operations go thru, this // Unless the find and notification operations go thru, this
// method is not successful. // method is not successful.
@ -189,7 +189,7 @@ ACE_Hash_Cache_Map_Manager<ACE_T2>::find (const KEY &key,
if (result != -1) if (result != -1)
{ {
value = entry->int_id_.first (); value = entry->int_id_.first;
} }
return result; return result;
@ -214,7 +214,7 @@ ACE_Hash_Cache_Map_Manager<ACE_T2>::unbind (CACHE_ENTRY *entry)
{ {
int result = this->caching_strategy_.notify_unbind (unbind_result, int result = this->caching_strategy_.notify_unbind (unbind_result,
entry->int_id_.second ()); entry->int_id_.second);
if (result == -1) if (result == -1)
unbind_result = -1; unbind_result = -1;

10
dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Hash_Cache_Map_Manager_T.h * @file Hash_Cache_Map_Manager_T.h
* *
* $Id: Hash_Cache_Map_Manager_T.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: Hash_Cache_Map_Manager_T.h 92097 2010-09-30 05:41:49Z msmit $
* *
* @author Kirthika Parameswaran <kirthika@cs.wustl.edu> * @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
*/ */
@ -33,9 +33,9 @@ class ACE_Allocator;
#define ACE_CACHE_MAP_MANAGER \ #define ACE_CACHE_MAP_MANAGER \
ACE_Cache_Map_Manager<KEY, \ ACE_Cache_Map_Manager<KEY, \
VALUE, \ VALUE, \
ACE_Hash_Map_Manager_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, \ ACE_Hash_Map_Manager_Ex<KEY, std::pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, \
ACE_Hash_Map_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, \ ACE_Hash_Map_Iterator_Ex<KEY, std::pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, \
ACE_Hash_Map_Reverse_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, \ ACE_Hash_Map_Reverse_Iterator_Ex<KEY, std::pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, \
CACHING_STRATEGY, \ CACHING_STRATEGY, \
ATTRIBUTES> ATTRIBUTES>
@ -71,7 +71,7 @@ class ACE_Hash_Cache_Map_Manager : public ACE_CACHE_MAP_MANAGER
* are used by the strategy and is transparent to the user of this * are used by the strategy and is transparent to the user of this
* class. * class.
*/ */
typedef ACE_Pair<VALUE, ATTRIBUTES> CACHE_VALUE; typedef std::pair<VALUE, ATTRIBUTES> CACHE_VALUE;
typedef ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> HASH_MAP; typedef ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> HASH_MAP;
typedef ACE_Hash_Map_Entry<KEY, CACHE_VALUE> CACHE_ENTRY; typedef ACE_Hash_Map_Entry<KEY, CACHE_VALUE> CACHE_ENTRY;
typedef KEY key_type; typedef KEY key_type;

22
dep/ACE_wrappers/ace/Hash_Map_Manager_T.h
View file

@ -1,10 +1,10 @@
// -*- C++ -*- // // -*- C++ -*-
//============================================================================= //=============================================================================
/** /**
* @file Hash_Map_Manager_T.h * @file Hash_Map_Manager_T.h
* *
* $Id: Hash_Map_Manager_T.h 84477 2009-02-16 13:30:38Z johnnyw $ * $Id: Hash_Map_Manager_T.h 91626 2010-09-07 10:59:20Z johnnyw $
* *
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu> * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
*/ */
@ -765,8 +765,8 @@ protected:
* ACE_Hash_Map_Manager_Ex it is iterating upon since locking is * ACE_Hash_Map_Manager_Ex it is iterating upon since locking is
* inherently inefficient and/or error-prone within an STL-style * inherently inefficient and/or error-prone within an STL-style
* iterator. If you require locking, you can explicitly use an * iterator. If you require locking, you can explicitly use an
* ACE_Guard or ACE_Read_Guard on the ACE_Hash_Map_Manager_Ex's * ACE_GUARD or ACE_READ_GUARD on the ACE_Hash_Map_Manager_Ex's
* internal lock, which is accessible via its <mutex> method. * internal lock, which is accessible via its mutex() method.
*/ */
template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK>
class ACE_Hash_Map_Iterator_Ex : public ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> class ACE_Hash_Map_Iterator_Ex : public ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
@ -835,8 +835,8 @@ public:
* ACE_Hash_Map_Manager_Ex it is iterating upon since locking is * ACE_Hash_Map_Manager_Ex it is iterating upon since locking is
* inherently inefficient and/or error-prone within an STL-style * inherently inefficient and/or error-prone within an STL-style
* iterator. If you require locking, you can explicitly use an * iterator. If you require locking, you can explicitly use an
* ACE_Guard or ACE_Read_Guard on the ACE_Hash_Map_Manager_Ex's * ACE_GUARD or ACE_READ_GUARD on the ACE_Hash_Map_Manager_Ex's
* internal lock, which is accessible via its <mutex> method. * internal lock, which is accessible via its mutex() method.
*/ */
template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK>
class ACE_Hash_Map_Const_Iterator_Ex : public ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> class ACE_Hash_Map_Const_Iterator_Ex : public ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
@ -894,8 +894,8 @@ public:
* ACE_Hash_Map_Manager_Ex it is iterating upon since locking is * ACE_Hash_Map_Manager_Ex it is iterating upon since locking is
* inherently inefficient and/or error-prone within an STL-style * inherently inefficient and/or error-prone within an STL-style
* iterator. If you require locking, you can explicitly use an * iterator. If you require locking, you can explicitly use an
* ACE_Guard or ACE_Read_Guard on the ACE_Hash_Map_Manager_Ex's * ACE_GUARD or ACE_READ_GUARD on the ACE_Hash_Map_Manager_Ex's
* internal lock, which is accessible via its <mutex> method. * internal lock, which is accessible via its mutex() method.
* *
* Note that a creation method for this new iterator cannot be added * Note that a creation method for this new iterator cannot be added
* to the hash map, since this would require adding explicit template * to the hash map, since this would require adding explicit template
@ -979,8 +979,8 @@ protected:
* ACE_Hash_Map_Manager_Ex it is iterating upon since locking is * ACE_Hash_Map_Manager_Ex it is iterating upon since locking is
* inherently inefficient and/or error-prone within an STL-style * inherently inefficient and/or error-prone within an STL-style
* iterator. If you require locking, you can explicitly use an * iterator. If you require locking, you can explicitly use an
* ACE_Guard or ACE_Read_Guard on the ACE_Hash_Map_Manager_Ex's * ACE_GUARD or ACE_READ_GUARD on the ACE_Hash_Map_Manager_Ex's
* internal lock, which is accessible via its <mutex> method. * internal lock, which is accessible via its mutex() method.
*/ */
template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK>
class ACE_Hash_Map_Reverse_Iterator_Ex : public ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> class ACE_Hash_Map_Reverse_Iterator_Ex : public ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
@ -1036,7 +1036,7 @@ public:
* ACE_Hash_Map_Manager_Ex it is iterating upon since locking is * ACE_Hash_Map_Manager_Ex it is iterating upon since locking is
* inherently inefficient and/or error-prone within an STL-style * inherently inefficient and/or error-prone within an STL-style
* iterator. If you require locking, you can explicitly use an * iterator. If you require locking, you can explicitly use an
* ACE_Guard or ACE_Read_Guard on the ACE_Hash_Map_Manager_Ex's * ACE_GUARD or ACE_READ_GUARD on the ACE_Hash_Map_Manager_Ex's
* internal lock, which is accessible via its <mutex> method. * internal lock, which is accessible via its <mutex> method.
*/ */
template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK>

2
dep/ACE_wrappers/ace/Hash_Map_With_Allocator_T.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Hash_Map_With_Allocator_T.h * @file Hash_Map_With_Allocator_T.h
* *
* $Id: Hash_Map_With_Allocator_T.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: Hash_Map_With_Allocator_T.h 91743 2010-09-13 18:24:51Z johnnyw $
* *
* @author Marina Spivak <marina@cs.wustl.edu> * @author Marina Spivak <marina@cs.wustl.edu>
* @author Irfan Pyarali <irfan@cs.wustl.edu> * @author Irfan Pyarali <irfan@cs.wustl.edu>

4
dep/ACE_wrappers/ace/Hash_Multi_Map_Manager_T.cpp
View file

@ -3,7 +3,7 @@
/** /**
* @file Hash_Multi_Map_Manager_T.cpp * @file Hash_Multi_Map_Manager_T.cpp
* *
* $Id: Hash_Multi_Map_Manager_T.cpp 80826 2008-03-04 14:51:23Z wotte $ * $Id: Hash_Multi_Map_Manager_T.cpp 91688 2010-09-09 11:21:50Z johnnyw $
* *
* @author Shanshan Jiang <shanshan.jiang@vanderbilt.edu> * @author Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
*/ */
@ -48,12 +48,10 @@ ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>::ACE_Hash_Multi_Map_Entry (const EXT_ID
{ {
} }
# if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
template <class EXT_ID, class INT_ID> template <class EXT_ID, class INT_ID>
ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>::~ACE_Hash_Multi_Map_Entry (void) ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>::~ACE_Hash_Multi_Map_Entry (void)
{ {
} }
# endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */
template <class EXT_ID, class INT_ID> EXT_ID & template <class EXT_ID, class INT_ID> EXT_ID &
ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>::key () ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>::key ()

19
dep/ACE_wrappers/ace/Hash_Multi_Map_Manager_T.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Hash_Multi_Map_Manager_T.h * @file Hash_Multi_Map_Manager_T.h
* *
* $Id: Hash_Multi_Map_Manager_T.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: Hash_Multi_Map_Manager_T.h 91693 2010-09-09 12:57:54Z johnnyw $
* *
* The code in Hash_Multi_Map_Manager_T.* was based on the code in * The code in Hash_Multi_Map_Manager_T.* was based on the code in
* Hash_Map_Manager_T.*. * Hash_Map_Manager_T.*.
@ -65,10 +65,8 @@ public:
ACE_Hash_Multi_Map_Entry (ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> *next, ACE_Hash_Multi_Map_Entry (ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> *next,
ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> *prev); ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> *prev);
# if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
/// Destructor. /// Destructor.
~ACE_Hash_Multi_Map_Entry (void); ~ACE_Hash_Multi_Map_Entry (void);
#endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */
/// Key accessor. /// Key accessor.
EXT_ID& key (void); EXT_ID& key (void);
@ -76,12 +74,13 @@ public:
/// Item accessor. /// Item accessor.
ACE_Unbounded_Set<INT_ID>& item (void); ACE_Unbounded_Set<INT_ID>& item (void);
public:
/// Key used to look up an entry. /// Key used to look up an entry.
/// @deprecated Use key() /// @todo Should be private
EXT_ID ext_id_; EXT_ID ext_id_;
/// The contents of the entry itself. /// The contents of the entry itself.
/// @deprecated Use item() /// @todo Should be private
ACE_Unbounded_Set<INT_ID> int_id_set_; ACE_Unbounded_Set<INT_ID> int_id_set_;
/// Pointer to the next item in the bucket of overflow nodes. /// Pointer to the next item in the bucket of overflow nodes.
@ -744,7 +743,7 @@ protected:
* @c ACE_Hash_Multi_Map_Manager it is iterating upon since locking is * @c ACE_Hash_Multi_Map_Manager it is iterating upon since locking is
* inherently inefficient and/or error-prone within an STL-style * inherently inefficient and/or error-prone within an STL-style
* iterator. If you require locking, you can explicitly use an * iterator. If you require locking, you can explicitly use an
* @c ACE_Guard or @c ACE_Read_Guard on the @c ACE_Hash_Multi_Map_Manager's * @c ACE_GUARD or @c ACE_READ_GUARD on the @c ACE_Hash_Multi_Map_Manager's
* internal lock, which is accessible via its @c mutex method. * internal lock, which is accessible via its @c mutex method.
*/ */
template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK>
@ -790,8 +789,8 @@ public:
* @c ACE_Hash_Multi_Map_Manager it is iterating upon since locking is * @c ACE_Hash_Multi_Map_Manager it is iterating upon since locking is
* inherently inefficient and/or error-prone within an STL-style * inherently inefficient and/or error-prone within an STL-style
* iterator. If you require locking, you can explicitly use an * iterator. If you require locking, you can explicitly use an
* @c ACE_Guard or @c ACE_Read_Guard on the @c ACE_Hash_Multi_Map_Manager's * @c ACE_GUARD or @c ACE_READ_GUARD on the @c ACE_Hash_Multi_Map_Manager's
* internal lock, which is accessible via its @c mutex method. * internal lock, which is accessible via its @c mutex() method.
*/ */
template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK>
class ACE_Hash_Multi_Map_Const_Iterator : public ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> class ACE_Hash_Multi_Map_Const_Iterator : public ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>
@ -838,7 +837,7 @@ public:
* @c ACE_Hash_Multi_Map_Manager it is iterating upon since locking is * @c ACE_Hash_Multi_Map_Manager it is iterating upon since locking is
* inherently inefficient and/or error-prone within an STL-style * inherently inefficient and/or error-prone within an STL-style
* iterator. If you require locking, you can explicitly use an * iterator. If you require locking, you can explicitly use an
* @c ACE_Guard or @c ACE_Read_Guard on the @c ACE_Hash_Multi_Map_Manager's * @c ACE_GUARD or @c ACE_READ_GUARD on the @c ACE_Hash_Multi_Map_Manager's
* internal lock, which is accessible via its @c mutex method. * internal lock, which is accessible via its @c mutex method.
* *
* Note that a creation method for this new iterator cannot be added * Note that a creation method for this new iterator cannot be added
@ -912,7 +911,7 @@ protected:
* @c ACE_Hash_Multi_Map_Manager it is iterating upon since locking is * @c ACE_Hash_Multi_Map_Manager it is iterating upon since locking is
* inherently inefficient and/or error-prone within an STL-style * inherently inefficient and/or error-prone within an STL-style
* iterator. If you require locking, you can explicitly use an * iterator. If you require locking, you can explicitly use an
* @c ACE_Guard or @c ACE_Read_Guard on the @c ACE_Hash_Multi_Map_Manager's * @c ACE_GUARD or @c ACE_READ_GUARD on the @c ACE_Hash_Multi_Map_Manager's
* internal lock, which is accessible via its @c mutex method. * internal lock, which is accessible via its @c mutex method.
*/ */
template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK>

7
dep/ACE_wrappers/ace/INET_Addr.cpp
View file

@ -1,4 +1,4 @@
// $Id: INET_Addr.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ // $Id: INET_Addr.cpp 91683 2010-09-09 09:07:49Z johnnyw $
// Defines the Internet domain address family address format. // Defines the Internet domain address family address format.
@ -871,10 +871,6 @@ ACE_INET_Addr::get_host_name_i (char hostname[], size_t len) const
} }
# endif /* ACE_HAS_IPV6 */ # endif /* ACE_HAS_IPV6 */
# if defined (DIGITAL_UNIX) && defined (__GNUC__)
hostent * const hp =
ACE_OS::gethostbyaddr (static_cast <char *> (addr), size, type);
# else
int h_error; // Not the same as errno! int h_error; // Not the same as errno!
hostent hentry; hostent hentry;
ACE_HOSTENT_DATA buf; ACE_HOSTENT_DATA buf;
@ -885,7 +881,6 @@ ACE_INET_Addr::get_host_name_i (char hostname[], size_t len) const
&hentry, &hentry,
buf, buf,
&h_error); &h_error);
# endif /* DIGITAL_UNIX */
if (hp == 0 || hp->h_name == 0) if (hp == 0 || hp->h_name == 0)
return -1; return -1;

12
dep/ACE_wrappers/ace/INET_Addr.h
View file

@ -4,7 +4,7 @@
/** /**
* @file INET_Addr.h * @file INET_Addr.h
* *
* $Id: INET_Addr.h 91064 2010-07-12 10:11:24Z johnnyw $ * $Id: INET_Addr.h 91626 2010-09-07 10:59:20Z johnnyw $
* *
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu> * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
*/ */
@ -133,7 +133,7 @@ public:
* are converted into network byte order, otherwise they are assumed to be * are converted into network byte order, otherwise they are assumed to be
* in network byte order already and are passed straight through. * in network byte order already and are passed straight through.
* *
* If <map> is non-zero and IPv6 support has been compiled in, * If @a map is non-zero and IPv6 support has been compiled in,
* then this address will be set to the IPv4-mapped IPv6 address of it. * then this address will be set to the IPv4-mapped IPv6 address of it.
*/ */
int set (u_short port_number, int set (u_short port_number,
@ -141,15 +141,15 @@ public:
int encode = 1, int encode = 1,
int map = 0); int map = 0);
/// Uses <getservbyname> to initialize an ACE_INET_Addr from a /// Uses getservbyname() to initialize an ACE_INET_Addr from a
/// <port_name>, the remote @a host_name, and the @a protocol. /// @a port_name, the remote @a host_name, and the @a protocol.
int set (const char port_name[], int set (const char port_name[],
const char host_name[], const char host_name[],
const char protocol[] = "tcp"); const char protocol[] = "tcp");
/** /**
* Uses <getservbyname> to initialize an ACE_INET_Addr from a * Uses getservbyname() to initialize an ACE_INET_Addr from a
* <port_name>, an @a ip_addr, and the @a protocol. This assumes that * @a port_name, an @a ip_addr, and the @a protocol. This assumes that
* @a ip_addr is already in network byte order. * @a ip_addr is already in network byte order.
*/ */
int set (const char port_name[], int set (const char port_name[],

9
dep/ACE_wrappers/ace/INET_Addr.inl
View file

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
// //
// $Id: INET_Addr.inl 88218 2009-12-17 12:32:14Z mcorino $ // $Id: INET_Addr.inl 91685 2010-09-09 09:35:14Z johnnyw $
#include "ace/OS_NS_string.h" #include "ace/OS_NS_string.h"
@ -71,14 +71,7 @@ ACE_INET_Addr::ip_addr_size (void) const
else else
return static_cast<int> (sizeof this->inet_addr_.in6_.sin6_addr); return static_cast<int> (sizeof this->inet_addr_.in6_.sin6_addr);
#else #else
// These _UNICOS changes were picked up from pre-IPv6 code in
// get_host_name_i... the IPv6 section above may need something
// similar, so keep an eye out for it.
# if !defined(_UNICOS)
return static_cast<int> (sizeof this->inet_addr_.in4_.sin_addr.s_addr); return static_cast<int> (sizeof this->inet_addr_.in4_.sin_addr.s_addr);
# else /* _UNICOS */
return static_cast<int> (sizeof this->inet_addr_.in4_.sin_addr);
# endif /* ! _UNICOS */
#endif /* ACE_HAS_IPV6 */ #endif /* ACE_HAS_IPV6 */
} }

10
dep/ACE_wrappers/ace/IOStream.h
View file

@ -4,7 +4,7 @@
/** /**
* @file IOStream.h * @file IOStream.h
* *
* $Id: IOStream.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: IOStream.h 92102 2010-09-30 08:14:15Z johnnyw $
* *
* @author James CE Johnson <jcej@lads.com> * @author James CE Johnson <jcej@lads.com>
* @author Jim Crossley <jim@lads.com> * @author Jim Crossley <jim@lads.com>
@ -64,14 +64,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
# endif /* ! ACE_HAS_STDCPP_STL_INCLUDES */ # endif /* ! ACE_HAS_STDCPP_STL_INCLUDES */
# endif /* ACE_WIN32 && defined (_MSC_VER) */ # endif /* ACE_WIN32 && defined (_MSC_VER) */
# if defined (__DECCXX_VER)
# if __DECCXX_VER < 50700000
# include /**/ <stl_macros>
# else
# include /**/ <stdcomp>
# endif /* __DECCXX_VER < 50700000 */
# endif /* __DECCXX_VER */
ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL
class ACE_Export ACE_Quoted_String : public ACE_IOStream_String class ACE_Export ACE_Quoted_String : public ACE_IOStream_String

46
dep/ACE_wrappers/ace/IO_Cntl_Msg.cpp
View file

@ -1,51 +1,7 @@
// $Id: IO_Cntl_Msg.cpp 91286 2010-08-05 09:04:31Z johnnyw $ // $Id: IO_Cntl_Msg.cpp 92069 2010-09-28 11:38:59Z johnnyw $
#include "ace/IO_Cntl_Msg.h" #include "ace/IO_Cntl_Msg.h"
#if !defined (__ACE_INLINE__) #if !defined (__ACE_INLINE__)
#include "ace/IO_Cntl_Msg.inl" #include "ace/IO_Cntl_Msg.inl"
#endif /* __ACE_INLINE__ */ #endif /* __ACE_INLINE__ */
#if 0
// This is not meant to be used, it's just a place holder...
#if !defined (__ACE_INLINE__)
#include "ace/Intrusive_List.inl"
#endif /* __ACE_INLINE__ */
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// Forward decl
template <class SYNCH> class ACE_Module;
/**
* @class ACE_Module_Link
*
* @brief Data structure used to link two modules together
*/
class ACE_Module_Link
{
public:
ACE_Module_Link (ACE_Module *m1, ACE_Module *m2): mod_upper_ (m1), mod_lower_ (m2), count_ (0) {}
ACE_Module *upper (void) { return this->mod_upper_; }
void upper (ACE_Module *u) { this->mod_upper_ = u; }
ACE_Module *lower (void) { return this->mod_lower_; }
void lower (ACE_Module *l) { this->mod_lower_ = l; }
int count (void) const { return this->count_; }
void count (int c) { this->count_ = c; }
private:
ACE_Module *mod_upper_;
ACE_Module *mod_lower_;
int count_;
};
ACE_END_VERSIONED_NAMESPACE_DECL
#endif

37
dep/ACE_wrappers/ace/Intrusive_List.cpp
View file

@ -1,4 +1,4 @@
// $Id: Intrusive_List.cpp 84273 2009-01-30 12:55:25Z johnnyw $ // $Id: Intrusive_List.cpp 92069 2010-09-28 11:38:59Z johnnyw $
#ifndef ACE_INTRUSIVE_LIST_CPP #ifndef ACE_INTRUSIVE_LIST_CPP
#define ACE_INTRUSIVE_LIST_CPP #define ACE_INTRUSIVE_LIST_CPP
@ -117,41 +117,6 @@ ACE_Intrusive_List<T>::unsafe_remove (T *node)
node->prev (0); node->prev (0);
} }
#if 0
template<class T> void
ACE_Intrusive_List_Node<T>::check_invariants (void)
{
ACE_ASSERT ((this->next () == 0) || (this->next ()->prev () == this));
ACE_ASSERT ((this->prev () == 0) || (this->prev ()->next () == this));
}
template<class T> void
ACE_Intrusive_List<T>::check_invariants (void)
{
ACE_ASSERT ((this->tail_ == 0) || (this->tail_->next () == 0));
ACE_ASSERT ((this->head_ == 0) || (this->head_->prev () == 0));
ACE_ASSERT (!((this->head_ == 0) ^ (this->tail_ == 0)));
int found_tail = 0;
for (T *i = this->head_; i != 0; i = i->next ())
{
if (i == this->tail_)
found_tail = 1;
i->check_invariants ();
}
ACE_ASSERT (this->tail_ == 0 || found_tail == 1);
int found_head = 0;
for (T *j = this->tail_; j != 0; j = j->prev ())
{
if (j == this->head_)
found_head = 1;
j->check_invariants ();
}
ACE_ASSERT (this->head_ == 0 || found_head == 1);
}
#endif /* 0 */
ACE_END_VERSIONED_NAMESPACE_DECL ACE_END_VERSIONED_NAMESPACE_DECL
#endif /* ACE_INTRUSIVE_LIST_CPP */ #endif /* ACE_INTRUSIVE_LIST_CPP */

6
dep/ACE_wrappers/ace/Intrusive_List.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Intrusive_List.h * @file Intrusive_List.h
* *
* $Id: Intrusive_List.h 83968 2008-12-04 08:11:41Z johnnyw $ * $Id: Intrusive_List.h 91688 2010-09-09 11:21:50Z johnnyw $
* *
* @author Carlos O'Ryan <coryan@uci.edu> * @author Carlos O'Ryan <coryan@uci.edu>
*/ */
@ -71,10 +71,6 @@ public:
/// Returns true if the container is empty, otherwise returns false. /// Returns true if the container is empty, otherwise returns false.
bool is_empty (void) const; bool is_empty (void) const;
/// Returns true if the container is empty, otherwise returns false.
/// @deprecated Use is_empty() instead.
bool empty (void) const;
/// Insert an element at the beginning of the list /// Insert an element at the beginning of the list
void push_front (T *node); void push_front (T *node);

8
dep/ACE_wrappers/ace/Intrusive_List.inl
View file

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
// //
// $Id: Intrusive_List.inl 83952 2008-12-02 20:01:24Z johnnyw $ // $Id: Intrusive_List.inl 91688 2010-09-09 11:21:50Z johnnyw $
#include <algorithm> #include <algorithm>
@ -12,12 +12,6 @@ ACE_Intrusive_List<T>::is_empty (void) const
return this->head_ == 0; return this->head_ == 0;
} }
template<class T> ACE_INLINE bool
ACE_Intrusive_List<T>::empty (void) const
{
return this->is_empty ();
}
template<class T> ACE_INLINE T * template<class T> ACE_INLINE T *
ACE_Intrusive_List<T>::head (void) const ACE_Intrusive_List<T>::head (void) const
{ {

8
dep/ACE_wrappers/ace/LSOCK_Stream.h
View file

@ -4,7 +4,7 @@
/** /**
* @file LSOCK_Stream.h * @file LSOCK_Stream.h
* *
* $Id: LSOCK_Stream.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: LSOCK_Stream.h 92140 2010-10-04 12:37:52Z johnnyw $
* *
* @author Doug Schmidt * @author Doug Schmidt
*/ */
@ -38,12 +38,12 @@ class ACE_Export ACE_LSOCK_Stream : public ACE_SOCK_Stream, public ACE_LSOCK
{ {
public: public:
// = Send/recv methods. // = Send/recv methods.
/// Send iovecs via <::writev>. /// Send iovecs via ::writev().
ssize_t send_msg (const iovec iov[], ssize_t send_msg (const iovec iov[],
size_t n, size_t n,
ACE_HANDLE handle); ACE_HANDLE handle);
/// Send iovecs via <::writev>. /// Send iovecs via ::writev().
ssize_t recv_msg (iovec iov[], ssize_t recv_msg (iovec iov[],
size_t n, size_t n,
ACE_HANDLE &handle); ACE_HANDLE &handle);
@ -51,7 +51,7 @@ public:
/// Get handle. /// Get handle.
ACE_HANDLE get_handle (void) const; ACE_HANDLE get_handle (void) const;
/// Overrides set_handle from the base classes. /// Overrides set_handle() from the base classes.
void set_handle (ACE_HANDLE fd); void set_handle (ACE_HANDLE fd);
// = Meta-type info // = Meta-type info

15
dep/ACE_wrappers/ace/Local_Name_Space_T.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Local_Name_Space_T.h * @file Local_Name_Space_T.h
* *
* $Id: Local_Name_Space_T.h 80826 2008-03-04 14:51:23Z wotte $ * $Id: Local_Name_Space_T.h 91688 2010-09-09 11:21:50Z johnnyw $
* *
* @author Prashant Jain <pjain@cs.wustl.edu> * @author Prashant Jain <pjain@cs.wustl.edu>
* @author Irfan Pyarali <irfan@wuerl.wustl.edu> and * @author Irfan Pyarali <irfan@wuerl.wustl.edu> and
@ -35,26 +35,13 @@ typedef ACE_Unbounded_Set<ACE_NS_WString> ACE_WSTRING_SET;
ACE_END_VERSIONED_NAMESPACE_DECL ACE_END_VERSIONED_NAMESPACE_DECL
// Simplify later usage by defining typedefs.
#if (1)
# include "ace/Hash_Map_Manager_T.h" # include "ace/Hash_Map_Manager_T.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL
typedef ACE_Hash_Map_Manager_Ex<ACE_NS_String, ACE_NS_Internal, ACE_Hash<ACE_NS_String>, ACE_Equal_To<ACE_NS_String>, ACE_Null_Mutex> MAP_MANAGER; typedef ACE_Hash_Map_Manager_Ex<ACE_NS_String, ACE_NS_Internal, ACE_Hash<ACE_NS_String>, ACE_Equal_To<ACE_NS_String>, ACE_Null_Mutex> MAP_MANAGER;
ACE_END_VERSIONED_NAMESPACE_DECL ACE_END_VERSIONED_NAMESPACE_DECL
#else
# include "ace/Map_Manager.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
typedef ACE_Map_Manager<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex> MAP_MANAGER;
ACE_END_VERSIONED_NAMESPACE_DECL
#endif /* 0 */
ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL
/// @deprecated Deprecated typedefs. Use the map's traits instead.
typedef MAP_MANAGER::ITERATOR MAP_ITERATOR;
typedef MAP_MANAGER::ENTRY MAP_ENTRY;
/** /**
* @class ACE_Name_Space_Map * @class ACE_Name_Space_Map
* *

6
dep/ACE_wrappers/ace/Local_Tokens.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Local_Tokens.h * @file Local_Tokens.h
* *
* $Id: Local_Tokens.h 84477 2009-02-16 13:30:38Z johnnyw $ * $Id: Local_Tokens.h 91626 2010-09-07 10:59:20Z johnnyw $
* *
* @author Karl-Heinz Dorn <kdorn@erlh.siemens.de> * @author Karl-Heinz Dorn <kdorn@erlh.siemens.de>
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu> * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
@ -34,7 +34,7 @@
* mechanisms, such as mutexes or semaphores. Instead, you should * mechanisms, such as mutexes or semaphores. Instead, you should
* use the ACE_Recursive_Thread_Mutex, ACE_Thread_Mutex, * use the ACE_Recursive_Thread_Mutex, ACE_Thread_Mutex,
* ACE_Thread_Semaphore, etc., that are defined in * ACE_Thread_Semaphore, etc., that are defined in
* $ACE_ROOT/ace/Synch.h and $ACE_ROOT/ace/Synch_T.h or the * $ACE_ROOT/ace/Synch.h or the
* ACE_Token that's defined in $ACE_ROOT/ace/Token.h. * ACE_Token that's defined in $ACE_ROOT/ace/Token.h.
* *
* *
@ -79,6 +79,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
* this class is necessary to fight the compiler with order of * this class is necessary to fight the compiler with order of
* declaration errors. * declaration errors.
*/ */
// FUZZ: disable check_for_ACE_Guard
namespace ACE_TOKEN_CONST namespace ACE_TOKEN_CONST
{ {
#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
@ -92,6 +93,7 @@ namespace ACE_TOKEN_CONST
typedef ACE_Guard<ACE_Null_Mutex> GUARD; typedef ACE_Guard<ACE_Null_Mutex> GUARD;
#endif /* ACE_HAS_THREADS */ #endif /* ACE_HAS_THREADS */
} }
// FUZZ: enable check_for_ACE_Guard
// Forward decl. // Forward decl.
class ACE_Token_Proxy; class ACE_Token_Proxy;

16
dep/ACE_wrappers/ace/Local_Tokens.inl
View file

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
// //
// $Id: Local_Tokens.inl 80826 2008-03-04 14:51:23Z wotte $ // $Id: Local_Tokens.inl 92069 2010-09-28 11:38:59Z johnnyw $
#if defined (ACE_HAS_TOKENS_LIBRARY) #if defined (ACE_HAS_TOKENS_LIBRARY)
@ -140,20 +140,6 @@ ACE_Tokens::name (void)
return this->token_name_; return this->token_name_;
} }
#if 0
ACE_INLINE ACE_Token_Proxy *
ACE_Tokens::current_owner (void)
{
ACE_TRACE ("ACE_Tokens::current_owner");
// ACE_GUARD_RETURN ???
if (this->owner () == 0)
return 0;
else
return this->owner ()->proxy ();
}
#endif /* 0 */
// ************************************************************ // ************************************************************
ACE_INLINE int ACE_INLINE int

46
dep/ACE_wrappers/ace/Log_Msg.cpp
View file

@ -1,4 +1,4 @@
// $Id: Log_Msg.cpp 91446 2010-08-24 14:16:37Z mhengstmengel $ // $Id: Log_Msg.cpp 92052 2010-09-27 14:20:22Z vzykov $
// We need this to get the status of ACE_NTRACE... // We need this to get the status of ACE_NTRACE...
#include "ace/config-all.h" #include "ace/config-all.h"
@ -40,6 +40,7 @@
#include "ace/Log_Record.h" #include "ace/Log_Record.h"
#include "ace/Recursive_Thread_Mutex.h" #include "ace/Recursive_Thread_Mutex.h"
#include "ace/Stack_Trace.h" #include "ace/Stack_Trace.h"
#include "ace/Atomic_Op.h"
#if !defined (__ACE_INLINE__) #if !defined (__ACE_INLINE__)
#include "ace/Log_Msg.inl" #include "ace/Log_Msg.inl"
@ -1728,24 +1729,9 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
ACE_OS::sprintf (bp, ACE_OS::sprintf (bp,
format, format,
static_cast <unsigned> (ACE_Thread::self ())); static_cast <unsigned> (ACE_Thread::self ()));
#elif defined (DIGITAL_UNIX)
ACE_OS::strcpy (fp, ACE_TEXT ("u"));
{
int id =
# if defined (ACE_HAS_THREADS)
pthread_getselfseq_np ();
# else
ACE_Thread::self ();
# endif /* ACE_HAS_THREADS */
if (can_check)
this_len = ACE_OS::snprintf (bp, bspace, format, id);
else
this_len = ACE_OS::sprintf (bp, format, id);
}
#else #else
ACE_hthread_t t_id; ACE_hthread_t t_id;
ACE_Thread::self (t_id); ACE_OS::thr_self (t_id);
# if defined (ACE_MVS) || defined (ACE_TANDEM_T1248_PTHREADS) # if defined (ACE_MVS) || defined (ACE_TANDEM_T1248_PTHREADS)
// MVS's pthread_t is a struct... yuck. So use the ACE 5.0 // MVS's pthread_t is a struct... yuck. So use the ACE 5.0
@ -2484,32 +2470,6 @@ ACE_Log_Msg::thr_desc (ACE_Thread_Descriptor *td)
td->acquire_release (); td->acquire_release ();
} }
#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) && defined(ACE_LEGACY_MODE)
ACE_SEH_EXCEPT_HANDLER
ACE_Log_Msg::seh_except_selector (void)
{
return ACE_OS_Object_Manager::seh_except_selector ();
}
ACE_SEH_EXCEPT_HANDLER
ACE_Log_Msg::seh_except_selector (ACE_SEH_EXCEPT_HANDLER n)
{
return ACE_OS_Object_Manager::seh_except_selector (n);
}
ACE_SEH_EXCEPT_HANDLER
ACE_Log_Msg::seh_except_handler (void)
{
return ACE_OS_Object_Manager::seh_except_handler ();
}
ACE_SEH_EXCEPT_HANDLER
ACE_Log_Msg::seh_except_handler (ACE_SEH_EXCEPT_HANDLER n)
{
return ACE_OS_Object_Manager::seh_except_handler (n);
}
#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS && ACE_LEGACY_MODE */
ACE_Log_Msg_Backend * ACE_Log_Msg_Backend *
ACE_Log_Msg::msg_backend (ACE_Log_Msg_Backend *b) ACE_Log_Msg::msg_backend (ACE_Log_Msg_Backend *b)
{ {

32
dep/ACE_wrappers/ace/Log_Msg.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Log_Msg.h * @file Log_Msg.h
* *
* $Id: Log_Msg.h 91446 2010-08-24 14:16:37Z mhengstmengel $ * $Id: Log_Msg.h 92298 2010-10-21 11:15:17Z johnnyw $
* *
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu> * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
*/ */
@ -24,7 +24,6 @@
#include "ace/Default_Constants.h" #include "ace/Default_Constants.h"
#include "ace/Log_Priority.h" #include "ace/Log_Priority.h"
#include "ace/os_include/os_limits.h" #include "ace/os_include/os_limits.h"
#include "ace/Atomic_Op.h"
#include "ace/Synch_Traits.h" #include "ace/Synch_Traits.h"
// The ACE_ASSERT macro used to be defined here, include ace/Assert.h // The ACE_ASSERT macro used to be defined here, include ace/Assert.h
@ -124,7 +123,6 @@
// that #define STDERR or THREAD (e.g. LynxOS). We simply #undef // that #define STDERR or THREAD (e.g. LynxOS). We simply #undef
// these macros as there is no way to save the macro definition using // these macros as there is no way to save the macro definition using
// the pre-processor. See Bugzilla Bug #299 for more info. // the pre-processor. See Bugzilla Bug #299 for more info.
#if defined (STDERR) #if defined (STDERR)
# undef STDERR # undef STDERR
#endif /* STDERR */ #endif /* STDERR */
@ -145,6 +143,7 @@ class ACE_Log_Msg_Backend;
// Forward declaration // Forward declaration
class ACE_Thread_Descriptor; class ACE_Thread_Descriptor;
class ACE_Log_Record; class ACE_Log_Record;
template<typename M, typename T> class ACE_Atomic_Op;
/** /**
* @class ACE_Log_Msg * @class ACE_Log_Msg
@ -184,7 +183,7 @@ public:
{ {
/// Write messages to stderr. /// Write messages to stderr.
STDERR = 1, STDERR = 1,
/// Write messages to the local client logger deamon. /// Write messages to the local client logger daemon.
LOGGER = 2, LOGGER = 2,
/// Write messages to the ostream * stored in thread-specific /// Write messages to the ostream * stored in thread-specific
/// storage. /// storage.
@ -405,27 +404,6 @@ public:
*/ */
void thr_desc (ACE_Thread_Descriptor *td); void thr_desc (ACE_Thread_Descriptor *td);
#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) && defined(ACE_LEGACY_MODE)
// These functions are disabled without ACE_LEGACY_MODE
// because the *semantics* have changed (the objects are no longer
// TSS).
/// Get TSS exception action.
/// @note The action is no longer TSS, they are global!
ACE_SEH_EXCEPT_HANDLER seh_except_selector (void);
/// Set TSS exception action.
/// @note The action is no longer TSS, they are global!
ACE_SEH_EXCEPT_HANDLER seh_except_selector (ACE_SEH_EXCEPT_HANDLER);
/// Get TSS exception handler.
/// @note The handler is no longer TSS, they are global!
ACE_SEH_EXCEPT_HANDLER seh_except_handler (void);
/// Set TSS exception handler.
/// @note The handler is no longer TSS, they are global!
ACE_SEH_EXCEPT_HANDLER seh_except_handler (ACE_SEH_EXCEPT_HANDLER);
#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS && ACE_LEGACY_MODE */
/// Stop tracing status on a per-thread basis... /// Stop tracing status on a per-thread basis...
void stop_tracing (void); void stop_tracing (void);
@ -765,10 +743,6 @@ ACE_TSS_CLEANUP_NAME (void *ptr);
# endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */ # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */
#endif /* ACE_MT_SAFE */ #endif /* ACE_MT_SAFE */
#if defined(ACE_LEGACY_MODE)
#include "ace/Log_Msg_Callback.h"
#endif /* ACE_LEGACY_MODE */
#if defined (__ACE_INLINE__) #if defined (__ACE_INLINE__)
#include "ace/Log_Msg.inl" #include "ace/Log_Msg.inl"
#endif /* __ACE_INLINE__ */ #endif /* __ACE_INLINE__ */

4
dep/ACE_wrappers/ace/Log_Record.cpp
View file

@ -1,4 +1,4 @@
// $Id: Log_Record.cpp 91286 2010-08-05 09:04:31Z johnnyw $ // $Id: Log_Record.cpp 91764 2010-09-14 13:04:37Z johnnyw $
#include "ace/Log_Record.h" #include "ace/Log_Record.h"
@ -21,8 +21,6 @@
#include "ace/OS_Memory.h" #include "ace/OS_Memory.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_ALLOC_HOOK_DEFINE(ACE_Log_Record) ACE_ALLOC_HOOK_DEFINE(ACE_Log_Record)

23
dep/ACE_wrappers/ace/Log_Record.h
View file

@ -4,7 +4,7 @@
/** /**
* @file Log_Record.h * @file Log_Record.h
* *
* $Id: Log_Record.h 91064 2010-07-12 10:11:24Z johnnyw $ * $Id: Log_Record.h 91764 2010-09-14 13:04:37Z johnnyw $
* *
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu> * @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
*/ */
@ -103,27 +103,6 @@ public:
/// IMPORTANT: @a name must be a statically allocated const ACE_TCHAR* /// 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.
*/
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.
*/
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; ACE_UINT32 type (void) const;

33
dep/ACE_wrappers/ace/Log_Record.inl
View file

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
// //
// $Id: Log_Record.inl 84183 2009-01-19 08:50:16Z johnnyw $ // $Id: Log_Record.inl 91764 2010-09-14 13:04:37Z johnnyw $
#include "ace/Global_Macros.h" #include "ace/Global_Macros.h"
#include "ace/os_include/arpa/os_inet.h" #include "ace/os_include/arpa/os_inet.h"
@ -16,37 +16,6 @@ ACE_Log_Record::~ACE_Log_Record (void)
delete [] this->msg_data_; delete [] this->msg_data_;
} }
ACE_INLINE void
ACE_Log_Record::encode (void)
{
ACE_TRACE ("ACE_Log_Record::encode");
this->length_ = ACE_HTONL (this->length_);
this->type_ = ACE_HTONL (this->type_);
// Make sure we don't enclose the sec() and usec() fields until
// they've been normalized.
// secs_ is commented out because it can be 64 bits. This method is
// deprecated; use the CDR operations instead.
// this->secs_ = ACE_HTONL (this->secs_);
this->usecs_ = ACE_HTONL (this->usecs_);
this->pid_ = ACE_HTONL (this->pid_);
}
ACE_INLINE void
ACE_Log_Record::decode (void)
{
ACE_TRACE ("ACE_Log_Record::decode");
#if !defined (ACE_LACKS_NTOHL)
ACE_Time_Value tv (this->secs_,
ntohl (this->usecs_));
this->secs_ = tv.sec ();
this->usecs_ = tv.usec ();
this->type_ = ntohl (this->type_);
this->pid_ = ntohl (this->pid_);
this->length_ = ntohl (this->length_);
#endif /* ACE_LACKS_NTOHL */
}
ACE_INLINE ACE_UINT32 ACE_INLINE ACE_UINT32
ACE_Log_Record::type (void) const ACE_Log_Record::type (void) const
{ {

6
dep/ACE_wrappers/ace/MEM_Acceptor.h
View file

@ -4,7 +4,7 @@
/** /**
* @file MEM_Acceptor.h * @file MEM_Acceptor.h
* *
* $Id: MEM_Acceptor.h 84834 2009-03-16 12:28:51Z johnnyw $ * $Id: MEM_Acceptor.h 91688 2010-09-09 11:21:50Z johnnyw $
* *
* @author Nanbor Wang <nanbor@cs.wustl.edu> * @author Nanbor Wang <nanbor@cs.wustl.edu>
*/ */
@ -120,10 +120,6 @@ public:
/// Returns 0 if successful, else -1. /// Returns 0 if successful, else -1.
int get_local_addr (ACE_MEM_Addr &) const; int get_local_addr (ACE_MEM_Addr &) const;
/// Accessor to the mmap options.
/// @deprecated This method has been deprecated.
ACE_MEM_SAP::MALLOC_OPTIONS& malloc_options (void);
// = Meta-type info // = Meta-type info
typedef ACE_MEM_Addr PEER_ADDR; typedef ACE_MEM_Addr PEER_ADDR;
typedef ACE_MEM_Stream PEER_STREAM; typedef ACE_MEM_Stream PEER_STREAM;

11
dep/ACE_wrappers/ace/MEM_Acceptor.inl
View file

@ -1,6 +1,6 @@
// -*- C++ -*- // -*- C++ -*-
// //
// $Id: MEM_Acceptor.inl 82723 2008-09-16 09:35:44Z johnnyw $ // $Id: MEM_Acceptor.inl 91688 2010-09-09 11:21:50Z johnnyw $
ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@ -91,13 +91,4 @@ ACE_MEM_Acceptor::init_buffer_size (ACE_OFF_T bytes)
this->malloc_options_.minimum_bytes_ = bytes; this->malloc_options_.minimum_bytes_ = bytes;
} }
ACE_INLINE ACE_MEM_SAP::MALLOC_OPTIONS &
ACE_MEM_Acceptor::malloc_options (void)
{
// @@ This function has been deprecated and will be removed in the
// future.
return this->malloc_options_;
}
ACE_END_VERSIONED_NAMESPACE_DECL ACE_END_VERSIONED_NAMESPACE_DECL

Some files were not shown because too many files have changed in this diff Show more