diff options
| author | Steve Huston <shuston@riverace.com> | 2013-06-11 02:08:40 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2013-06-11 02:08:40 +0000 |
| commit | 6a7b1f8101bfe9d914b56a371fa0527d2293e353 (patch) | |
| tree | f5ac117d9509cb3423d0348bbfd825cb61e21a66 | |
| parent | 6fbe6c5a5158404c979f4a654750dee1bcbd7d83 (diff) | |
| download | ATCD-6a7b1f8101bfe9d914b56a371fa0527d2293e353.tar.gz | |
Set up Riverace ACE 6.2 branch
81 files changed, 662 insertions, 2215 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index ab065f6ca70..ff740f76495 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,101 +1,3 @@ -Fri Jun 7 14:39:01 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> - - * tests/SOCK_Dgram_Test.cpp: - - Potential fix for a warning on the wchar scoreboard. - -Thu Jun 6 17:02:06 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> - - * include/makeinclude/rules.lib.GNU: - - The rule for generating versioned_so=2 style libraries would create - names such as "-6.2.0.so" in cases where the SHLIB was reset to empty, - for instance if a precondition isn't met. As an example, ACE_TkReactor - should skip the build if macro tk=1 isn't set. but with versioned_so=2 - the VSHLIB target was non-empty so the build was attempted. Now the - VSHLIB and related targets are modified only if the source libname - is not empty. - -Wed Jun 5 20:09:59 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> - - * tests/FlReactor_Test.cpp: - * tests/QtReactor_Test.cpp: - - Fixed wchar build compile errors - -Fri May 31 14:02:11 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/ETCL/ETCL_Constraint.inl: - Fixed coverity warning - -Thu May 30 18:50:44 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Malloc_Allocator.h: - * ace/Shared_Memory_Pool.h: - Doxygen changes - - * ace/Shared_Memory_Pool.cpp: - Fixed Coverity 300041 Dereference after null check - -Wed May 29 03:35:59 UTC 2013 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Connector.h: Used reinterpret_cast<const - peer_addr_type&>(peer_addr_type::sap_any) instead of C cast to - avoid a warning when compiling with -Wcast-qual. Thanks to - Milan Cvetkovic <milan dot cvetkovic at mpathix dot com> for - reporting this. - -Wed May 29 13:57:15 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/auto_run_tests.pl: - * tests/run_test.pl: - Commented out setting of the Coverity environment variables - seperately for each test, that looks to cause a huge additonal - resource usage - -Wed May 29 06:58:53 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-sunos5.7.h: - Fixed possible redefinition warning - - * docs/ACE-development-process.html: - Extended bczar instructions, updated link - - * tests/Compiler_Features_20_DLL.h: - * tests/Compiler_Features_20_DLL.cpp: - * tests/Compiler_Features_20_DLL_Export.h: - * tests/tests.mpc: - New C++11 compiler feature test - -Tue May 28 09:12:20 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> - - * docs/Download.html: - * etc/index.html: - Make x.2.0 links available to the public - -Mon May 27 17:46:40 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> - - * debian/libtao-orbsvcs-2.2.0.install: - * debian/libtao-orbsvcs-dev.install: - Added new libTAO_Async_ImR_Client_IDL - -Mon May 27 12:46:56 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> - - * debian/libtao-2.2.0.install: - * debian/libtao-dev.install: - Added new Async IOR Table, needed to build prebuild packages - -Mon May 27 10:18:26 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> - - * NEWS: - * bin/diff-builds-and-group-fixed-tests-only.sh: - * debian/debian.changelog: - * docs/bczar/bczar.html: - Updates in preparation of releasing x.2.0 - - * bin/make_release.py: - Fixed generation of ace.dsc file - Mon May 27 10:09:24 CEST 2013 Johnny Willemsen <jwillemsen@remedy.nl> * ACE version 6.2.0 released. @@ -1,11 +1,6 @@ -USER VISIBLE CHANGES BETWEEN ACE-6.2.0 and ACE-6.2.1 -==================================================== - USER VISIBLE CHANGES BETWEEN ACE-6.1.9 and ACE-6.2.0 ==================================================== -. None - USER VISIBLE CHANGES BETWEEN ACE-6.1.8 and ACE-6.1.9 ==================================================== diff --git a/ACE/ace/Connector.h b/ACE/ace/Connector.h index efb64786ec1..a5e77d8c875 100644 --- a/ACE/ace/Connector.h +++ b/ACE/ace/Connector.h @@ -216,7 +216,7 @@ public: const typename PEER_CONNECTOR::PEER_ADDR &remote_addr, const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults, const typename PEER_CONNECTOR::PEER_ADDR &local_addr - = reinterpret_cast<const peer_addr_type &>(peer_addr_type::sap_any), + = (peer_addr_type &) peer_addr_type::sap_any, int reuse_addr = 0, int flags = O_RDWR, int perms = 0); @@ -236,7 +236,7 @@ public: const typename PEER_CONNECTOR::PEER_ADDR &remote_addr, const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults, const typename PEER_CONNECTOR::PEER_ADDR &local_addr - = reinterpret_cast<const peer_addr_type &>(peer_addr_type::sap_any), + = (peer_addr_type &) peer_addr_type::sap_any, int reuse_addr = 0, int flags = O_RDWR, int perms = 0); diff --git a/ACE/ace/ETCL/ETCL_Constraint.inl b/ACE/ace/ETCL/ETCL_Constraint.inl index 9e8f4cdc5c1..99878b78f2f 100644 --- a/ACE/ace/ETCL/ETCL_Constraint.inl +++ b/ACE/ace/ETCL/ETCL_Constraint.inl @@ -309,8 +309,7 @@ ETCL_Binary_Expr::lhs (void) const ACE_INLINE ETCL_Preference::ETCL_Preference (void) - : type_ (0), - subexpr_ (0) + : subexpr_ (0) {} ACE_INLINE diff --git a/ACE/ace/Malloc_Allocator.h b/ACE/ace/Malloc_Allocator.h index f721d80c60f..1ac2f9d55ee 100644 --- a/ACE/ace/Malloc_Allocator.h +++ b/ACE/ace/Malloc_Allocator.h @@ -44,8 +44,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * This class uses the new/delete operators to allocate and free up * memory. Please note that the only methods that are supported are - * malloc(), calloc(), and free(). All other methods are no-ops that - * return -1 and set @c errno to @c ENOTSUP. If you require this + * <malloc>, <calloc>, and <free>. All other methods are no-ops that + * return -1 and set @c errno to <ENOTSUP>. If you require this * functionality, please use: ACE_Allocator_Adapter <ACE_Malloc * <ACE_LOCAL_MEMORY_POOL, MUTEX> >, which will allow you to use the * added functionality of bind/find/etc. while using the new/delete @@ -88,11 +88,11 @@ private: * @brief Defines a class that provided a highly optimized memory * management scheme for allocating memory statically. * - * This class manages a fixed-size @c POOL_SIZE of memory. Every - * time malloc()/calloc() is called, it simply moves an internal + * This class manages a fixed-size <POOL_SIZE> of memory. Every + * time <malloc>/<calloc> is called, it simply moves an internal * index forward and returns a pointer to the requested chunk. * All memory is allocated statically (typically via the - * ACE_Static_Allocator template) and free() is a no-op. This + * ACE_Static_Allocator template) and <free> is a no-op. This * behavior is useful for use-cases where all the memory * allocation needs are known in advance and no deletions ever * occur. diff --git a/ACE/ace/Shared_Memory_Pool.cpp b/ACE/ace/Shared_Memory_Pool.cpp index 4c6a4e10af8..cb55c6dd202 100644 --- a/ACE/ace/Shared_Memory_Pool.cpp +++ b/ACE/ace/Shared_Memory_Pool.cpp @@ -144,39 +144,37 @@ ACE_Shared_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, return 0; } -/// Handle SIGSEGV and SIGBUS signals to remap shared memory properly. +// Handle SIGSEGV and SIGBUS signals to remap shared memory properly. + int -ACE_Shared_Memory_Pool::handle_signal (int, siginfo_t *siginfo, ucontext_t *) +ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) { ACE_TRACE ("ACE_Shared_Memory_Pool::handle_signal"); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("signal %S occurred\n"), signum)); // While FreeBSD 5.X has a siginfo_t struct with a si_addr field, // it does not define SEGV_MAPERR. #if defined (ACE_HAS_SIGINFO_T) && !defined (ACE_LACKS_SI_ADDR) && \ (defined (SEGV_MAPERR) || defined (SEGV_MEMERR)) - if (siginfo == 0) - return -1; - ACE_OFF_T offset; - // Make sure that the pointer causing the problem is within the // range of the backing store. - // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %u\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr)); - size_t counter = 0; - if (this->in_use (offset, counter) == -1) - { - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("in_use"))); - } - else if (!(siginfo->si_code == SEGV_MAPERR - && siginfo->si_addr < (((char *) this->base_addr_) + offset) - && siginfo->si_addr >= ((char *) this->base_addr_))) + + if (siginfo != 0) { - ACELIB_ERROR_RETURN ((LM_ERROR, - "(%P|%t) address %u out of range\n", - siginfo->si_addr), - -1); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %u\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr)); + size_t counter; + if (this->in_use (offset, counter) == -1) + ACELIB_ERROR ((LM_ERROR, + ACE_TEXT ("(%P|%t) %p\n"), + ACE_TEXT ("in_use"))); + else if (!(siginfo->si_code == SEGV_MAPERR + && siginfo->si_addr < (((char *) this->base_addr_) + offset) + && siginfo->si_addr >= ((char *) this->base_addr_))) + ACELIB_ERROR_RETURN ((LM_ERROR, + "(%P|%t) address %u out of range\n", + siginfo->si_addr), + -1); } // The above if case will check to see that the address is in the @@ -184,7 +182,8 @@ ACE_Shared_Memory_Pool::handle_signal (int, siginfo_t *siginfo, ucontext_t *) // pointer wants to point into. Find the segment that someone else // has used and attach to it (flabar@vais.net) - counter = 0; // ret value to get shmid from the st table. + size_t counter; // ret value to get shmid from the st table. + if (this->find_seg (siginfo->si_addr, offset, counter) == -1) ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), diff --git a/ACE/ace/Shared_Memory_Pool.h b/ACE/ace/Shared_Memory_Pool.h index 344d2ce92b0..27c113b1c0f 100644 --- a/ACE/ace/Shared_Memory_Pool.h +++ b/ACE/ace/Shared_Memory_Pool.h @@ -142,7 +142,7 @@ protected: /** * Commits a new shared memory segment if necessary after an - * acquire() or a signal. @a offset is set to the new offset into + * <acquire> or a signal. @a offset is set to the new offset into * the backing store. */ virtual int commit_backing_store_name (size_t rounded_bytes, @@ -198,7 +198,7 @@ protected: /// Handle SIGSEGV and SIGBUS signals to remap shared memory /// properly. - virtual int handle_signal (int, siginfo_t *siginfo, ucontext_t *); + virtual int handle_signal (int signum, siginfo_t *, ucontext_t *); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/config-sunos5.7.h b/ACE/ace/config-sunos5.7.h index c2001b07093..38476485251 100644 --- a/ACE/ace/config-sunos5.7.h +++ b/ACE/ace/config-sunos5.7.h @@ -51,9 +51,7 @@ #define ACE_HAS_SOCKLEN_T #if defined (__sparcv9) -#if !defined (_LP64) -# define _LP64 -#endif /* _LP64 */ +#define _LP64 #define ACE_SIZEOF_LONG 8 /* Needed to circumvent compiler bug #4294969 */ #endif /* __sparcv9 */ diff --git a/ACE/bin/auto_run_tests.pl b/ACE/bin/auto_run_tests.pl index af901ae17a4..10b38b0b9a1 100755 --- a/ACE/bin/auto_run_tests.pl +++ b/ACE/bin/auto_run_tests.pl @@ -176,9 +176,9 @@ foreach my $test_lst (@file_list) { if (! $is_ace_test) { print "auto_run_tests: $test\n"; - #$ENV{COVERITY_TEST_NAME} = $test; - #$ENV{COVERITY_SUITE_NAME} = $test_lst; - #$ENV{COVERITY_TEST_SOURCE} = "$directory/$program"; + $ENV{COVERITY_TEST_NAME} = $test; + $ENV{COVERITY_SUITE_NAME} = $test_lst; + $ENV{COVERITY_TEST_SOURCE} = "$directory/$program"; } my($orig_dir) = $directory; diff --git a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh index 3fe4b18d115..caf064e809f 100755 --- a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh +++ b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh @@ -3,7 +3,7 @@ if test -z $1; then newdate=`date -u +%Y_%m_%d`; else newdate=$1; fi if test -z $2; then prefix=`date -u +%Y%m%d%a`; else prefix=$2; fi -if test -z $3; then olddate=2013_05_27; else olddate=$3; fi +if test -z $3; then olddate=2013_05_13; else olddate=$3; fi if test -z $ACE_ROOT; then ACE_ROOT=..; fi if test -z $TAO_ROOT; then TAO_ROOT=${ACE_ROOT}/TAO; fi if test -z $CIAO_ROOT; then CIAO_ROOT=${TAO_ROOT}/CIAO; fi diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py index 555e5aaab9e..0ef26368f22 100755 --- a/ACE/bin/make_release.py +++ b/ACE/bin/make_release.py @@ -434,7 +434,7 @@ Version: %s Binary: ace Maintainer: Johnny Willemsen <jwillemsen@remedy.nl> Architecture: any -Build-Depends: gcc, make, g++, debhelper (>= 5), dpkg-dev, libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev, zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz, libfox-1.6-dev, libzzip-dev, libbz2-dev +Build-Depends: gcc, make, g++, debhelper (>= 5), libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.4.7), zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz Files: 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO+CIAO-src-%s.tar.gz diff --git a/ACE/debian/ace.dsc b/ACE/debian/ace.dsc index 50548cb25a0..0786f7d437b 100644 --- a/ACE/debian/ace.dsc +++ b/ACE/debian/ace.dsc @@ -4,7 +4,7 @@ Version: 2.2.0 Binary: ace Maintainer: Johnny Willemsen <jwillemsen@remedy.nl> Architecture: any -Build-Depends: gcc, make, g++, debhelper (>= 5), dpkg-dev, libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev, zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz, libfox-1.6-dev, libzzip-dev, libbz2-dev +Build-Depends: gcc, make, g++, debhelper (>= 5), libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.4.7), zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz Files: 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO+CIAO-src-6.2.0.tar.gz diff --git a/ACE/debian/debian.changelog b/ACE/debian/debian.changelog index 3934e84dd39..a5915950023 100644 --- a/ACE/debian/debian.changelog +++ b/ACE/debian/debian.changelog @@ -1,9 +1,3 @@ -ace (6.2.0-1) experimental; urgency=low - - * New upstream release. - - -- Johnny Willemsen <jwillemsen@remedy.nl> Mon, 27 May 2013 19:01:01 +0200 - ace (6.1.9-1) experimental; urgency=low * New upstream release. diff --git a/ACE/debian/libtao-2.2.0.install b/ACE/debian/libtao-2.2.0.install index a9643d351fb..a80041c6986 100644 --- a/ACE/debian/libtao-2.2.0.install +++ b/ACE/debian/libtao-2.2.0.install @@ -14,7 +14,6 @@ usr/lib/libTAO_IFR_Client_skel-*.so usr/lib/libTAO_IORInterceptor-*.so usr/lib/libTAO_IORManip-*.so usr/lib/libTAO_IORTable-*.so -usr/lib/libTAO_Async_IORTable-*.so usr/lib/libTAO_Messaging-*.so usr/lib/libTAO_ObjRefTemplate-*.so usr/lib/libTAO_PI-*.so diff --git a/ACE/debian/libtao-dev.install b/ACE/debian/libtao-dev.install index f476a8b23c4..7b09d87f5cd 100644 --- a/ACE/debian/libtao-dev.install +++ b/ACE/debian/libtao-dev.install @@ -34,7 +34,6 @@ usr/include/tao/IORManipulation usr/lib/libTAO_IORManip.so usr/include/tao/IORTable usr/lib/libTAO_IORTable.so -usr/lib/libTAO_Async_IORTable.so usr/include/tao/Messaging usr/lib/libTAO_Messaging.so usr/include/tao/ObjRefTemplate @@ -100,7 +99,6 @@ usr/lib/pkgconfig/TAO_Monitor.pc usr/lib/pkgconfig/TAO_Compression.pc usr/lib/pkgconfig/TAO_Strategies.pc usr/lib/pkgconfig/TAO_IORTable.pc -usr/lib/pkgconfig/TAO_Async_IORTable.pc usr/lib/pkgconfig/TAO_CSD_ThreadPool.pc usr/lib/pkgconfig/TAO_CodecFactory.pc usr/lib/pkgconfig/TAO_EndpointPolicy.pc diff --git a/ACE/debian/libtao-orbsvcs-2.2.0.install b/ACE/debian/libtao-orbsvcs-2.2.0.install index 270eb6a9174..e0e491e9095 100644 --- a/ACE/debian/libtao-orbsvcs-2.2.0.install +++ b/ACE/debian/libtao-orbsvcs-2.2.0.install @@ -63,7 +63,6 @@ usr/lib/libTAO_CosTime_Skel-*.so usr/lib/libTAO_Catior_i-*.so usr/lib/libTAO_ImR_Locator_IDL-*.so usr/lib/libTAO_ImR_Activator-*.so -usr/lib/libTAO_Async_ImR_Client_IDL-*.so usr/lib/libTAO_ReplicationManagerLib-*.so usr/lib/libTAO_ImR_Activator_IDL-*.so usr/lib/libTAO_ImR_Locator-*.so diff --git a/ACE/debian/libtao-orbsvcs-dev.install b/ACE/debian/libtao-orbsvcs-dev.install index ae70d23c13f..d324341efca 100644 --- a/ACE/debian/libtao-orbsvcs-dev.install +++ b/ACE/debian/libtao-orbsvcs-dev.install @@ -65,7 +65,6 @@ usr/lib/libTAO_CosTime_Skel.so usr/lib/libTAO_Catior_i.so usr/lib/libTAO_ReplicationManagerLib.so usr/lib/libTAO_ImR_Activator.so -usr/lib/libTAO_Async_ImR_Client_IDL.so usr/lib/libTAO_ImR_Locator.so usr/lib/libTAO_ImR_Locator_IDL.so usr/lib/libTAO_ImR_Activator_IDL.so diff --git a/ACE/docs/ACE-development-process.html b/ACE/docs/ACE-development-process.html index e964c1a4037..fb4ad9f2700 100644 --- a/ACE/docs/ACE-development-process.html +++ b/ACE/docs/ACE-development-process.html @@ -101,15 +101,15 @@ A bug should typically follow this life cycle:<p> At all times, we'll have a build czar. The role may be shared by multiple people. The build czar is responsible for ensuring that the next kits are clean, <em>i.e.</em>, it builds and runs cleanly on all -platforms. The status of all ACE+TAO+CIAO+DAnCE builds is tracked automatically -<A HREF="www.dre.vanderbilt.edu/scoreboard"</A>online</A>.<p> +platforms. The status of all ACE+TAO builds is tracked automatically +<A HREF="http://tao.doc.wustl.edu/scoreboard/"</A>online</A>.<p> A comprehensive summary of the build czar's role is available <A HREF="bczar/bczar.html">here</A>. This role is briefly summarized below:<p> <ul> <li>Remind people to check build logs. Developers are still responsible for verifying that their changes are clean. - <li>Trigger other developers to fix problems caused by compilation errors. All + <li>Fix minor problems caused by compilation errors. More complex problems should be fixed by the developers who caused them. The build czar should help track down the guilty parties. <li>Freeze the source repository when it's decided to no more @@ -131,22 +131,22 @@ violator. This is also intentional, desirable, beneficial, and the Right Thing[TM] to do.<p> <p><hr> -<H3>The ACE+TAO+CIAO+DAnCE Release Process</H3> +<H3>The ACE+TAO+CIAO Release Process</H3> <P> -Minor releases of ACE+TAO+CIAO+DAnCE occur periodically, typically twice a +Minor releases of ACE+TAO+CIAO occur periodically, typically twice a year. Minor releases have two-digit numbers, <EM>e.g.,</EM> 5.3. Major releases are released infrequently, typically once a year. Major releases are 1-digit numbers, <EM>e.g.,</EM>5, that include substantially new functionality. Both major and minor releases are carefully tested on all platforms the ACE+TAO run on. In particular, -we do not put out major or minor releases of ACE+TAO+CIAO+DAnCE until all the +we do not put out major or minor releases of ACE+TAO+CIAO until all the compilations and regression tests work successful on all the platform we support. <P> Between major/minor releases, we release micro releases periodically, -<EM>e.g.,</EM> 3-4 times per year, so that ACE+TAO+CIAO+DAnCE users can -download and test our latest work in progress. ACE+TAO+CIAO+DAnCE micro +<EM>e.g.,</EM> 3-4 times per year, so that ACE+TAO+CIAO users can +download and test our latest work in progress. ACE+TAO+CIAO micro release kits have three-digit numbers, <EM>e.g.,</EM> 5.3.1. Micro releases often contain important fixes that aren't in the major/minor releases and will compile cleanly and pass most tests on most diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html index 4d752517cb6..7e5678e27d4 100644 --- a/ACE/docs/Download.html +++ b/ACE/docs/Download.html @@ -101,261 +101,261 @@ of the ACE, TAO, and CIAO micro release kit is available for <TR><TH>Filename</TH><TH>Description</TH><TH>Full</TH><TH>Sources only</TH></TR> <TR><TD>ACE+TAO+CIAO.tar.gz</TD> <TD>ACE+TAO+CIAO (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.2.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.2.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.9.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.9.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.2.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.2.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.9.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.9.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO+CIAO.tar.bz2</TD> <TD>ACE+TAO+CIAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.2.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.2.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.9.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.9.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.2.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.2.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.9.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.9.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO+CIAO.zip</TD> <TD>ACE+TAO+CIAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.2.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.2.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.9.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.9.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.2.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.2.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.9.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.9.zip">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO+DAnCE.tar.gz</TD> <TD>ACE+TAO+DAnCE (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.2.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.2.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.9.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.9.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.2.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.2.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.9.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.9.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO+DAnCE.tar.bz2</TD> <TD>ACE+TAO+DAnCE (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.2.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.2.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.9.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.9.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.2.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.2.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.9.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.9.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO+DAnCE.zip</TD> <TD>ACE+TAO+DAnCE (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.2.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.2.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.9.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.9.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.2.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.2.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.9.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.9.zip">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO.tar.gz</TD> <TD>ACE+TAO (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.2.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.2.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.9.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.9.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.2.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.2.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.9.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.9.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO.tar.bz2</TD> <TD>ACE+TAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.2.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.2.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.9.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.9.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.2.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.2.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.9.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.9.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO.zip</TD> <TD>ACE+TAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.2.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.2.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.9.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.9.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.2.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.2.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.9.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.9.zip">FTP</A>] </TD> </TR> <TR><TD>ACE-html.tar.gz</TD> <TD>Doxygen documentation for ACE+TAO+CIAO (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.2.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.2.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.9.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.9.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE-html.tar.bz2</TD> <TD>Doxygen documentation for ACE+TAO+CIAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.2.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.2.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.9.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.9.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE-html.zip</TD> <TD>Doxygen documentation for ACE+TAO+CIAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.2.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.2.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.9.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.9.zip">FTP</A>] </TD> </TR> <TR><TD>ACE.tar.gz</TD> <TD>ACE only (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.2.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.2.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.9.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.9.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.2.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.2.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.9.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.9.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE.tar.bz2</TD> <TD>ACE only (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.2.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.2.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.9.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.9.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.2.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.2.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.9.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.9.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE.zip</TD> <TD>ACE only (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.2.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.2.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.9.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.9.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.2.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.2.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.9.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.9.zip">FTP</A>] </TD> </TR> </TABLE> -<LI> <B>Latest Release.</B> The latest release is ACE 6.2.0, TAO 2.2.0, CIAO 1.2.0, and DAnCE 1.2.0 -(ACE+TAO+CIAO+DAnCE x.2.0), please use the links below to download it.<P> +<LI> <B>Latest Release.</B> The latest release is ACE 6.1.0, TAO 2.1.0, CIAO 1.1.0, and DAnCE 1.1.0 +(ACE+TAO+CIAO+DAnCE x.1.0), please use the links below to download it.<P> <TABLE BORDER="4"> <TR><TH>Filename</TH><TH>Description</TH><TH>Full</TH><TH>Sources only</TH></TR> - <TR><TD>ACE+TAO+CIAO-6.2.0.tar.gz</TD> + <TR><TD>ACE+TAO+CIAO-6.1.0.tar.gz</TD> <TD>ACE+TAO+CIAO (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.2.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.2.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.0.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.2.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.2.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.0.tar.gz">FTP</A>] </TD> </TR> - <TR><TD>ACE+TAO+CIAO-6.2.0.tar.bz2</TD> + <TR><TD>ACE+TAO+CIAO-6.1.0.tar.bz2</TD> <TD>ACE+TAO+CIAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.2.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.2.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.0.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.2.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.2.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.0.tar.bz2">FTP</A>] </TD> </TR> - <TR><TD>ACE+TAO+CIAO-6.2.0.zip</TD> + <TR><TD>ACE+TAO+CIAO-6.1.0.zip</TD> <TD>ACE+TAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.2.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.2.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.0.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.2.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.2.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.0.zip">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO+DAnCE.tar.gz</TD> <TD>ACE+TAO+DAnCE (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.2.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.2.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.0.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.2.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.2.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.0.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO+DAnCE.tar.bz2</TD> <TD>ACE+TAO+DAnCE (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.2.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.2.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.0.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.2.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.2.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.0.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO+DAnCE.zip</TD> <TD>ACE+TAO+DAnCE (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.2.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.2.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.0.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.2.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.2.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.0.zip">FTP</A>] </TD> </TR> - <TR><TD>ACE+TAO-6.2.0.tar.gz</TD> + <TR><TD>ACE+TAO-6.1.0.tar.gz</TD> <TD>ACE+TAO (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.2.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.2.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.0.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.2.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.2.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.0.tar.gz">FTP</A>] </TD> </TR> - <TR><TD>ACE+TAO-6.2.0.tar.bz2</TD> + <TR><TD>ACE+TAO-6.1.0.tar.bz2</TD> <TD>ACE+TAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.2.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.2.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.0.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.2.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.2.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.0.tar.bz2">FTP</A>] </TD> </TR> - <TR><TD>ACE+TAO-6.2.0.zip</TD> + <TR><TD>ACE+TAO-6.1.0.zip</TD> <TD>ACE+TAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.2.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.2.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.0.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.2.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.2.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.0.zip">FTP</A>] </TD> </TR> - <TR><TD>ACE-html-6.2.0.tar.gz</TD> + <TR><TD>ACE-html-6.1.0.tar.gz</TD> <TD>Doxygen documentation for ACE+TAO (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.2.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.2.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.0.tar.gz">FTP</A>] </TD> </TR> - <TR><TD>ACE-html-6.2.0.tar.bz2</TD> + <TR><TD>ACE-html-6.1.0.tar.bz2</TD> <TD>Doxygen documentation for ACE+TAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.2.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.2.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.0.tar.bz2">FTP</A>] </TD> </TR> - <TR><TD>ACE-html-6.2.0.zip</TD> + <TR><TD>ACE-html-6.1.0.zip</TD> <TD>Doxygen documentation for ACE+TAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.2.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.2.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.0.zip">FTP</A>] </TD> </TR> - <TR><TD>ACE-6.2.0.tar.gz</TD> + <TR><TD>ACE-6.1.0.tar.gz</TD> <TD>ACE only (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.2.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.2.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.0.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.2.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.2.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.0.tar.gz">FTP</A>] </TD> </TR> - <TR><TD>ACE-6.2.0.tar.bz2</TD> + <TR><TD>ACE-6.1.0.tar.bz2</TD> <TD>ACE only (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.2.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.2.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.0.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.2.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.2.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.0.tar.bz2">FTP</A>] </TD> </TR> - <TR><TD>ACE-6.2.0.zip</TD> + <TR><TD>ACE-6.1.0.zip</TD> <TD>ACE only (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.2.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.2.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.0.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.2.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.2.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.0.zip">FTP</A>] </TD> </TR> </TABLE> diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html index 636eca8c284..6c08cd7b481 100644 --- a/ACE/docs/bczar/bczar.html +++ b/ACE/docs/bczar/bczar.html @@ -31,7 +31,7 @@ guy</a> knows most of the information. Ask him to help you out with known problems. <li> - Keep an eye on the <a href="http://atcdstats.theaceorb.nl/index.shtml">footprint and + Keep an eye on the <a href="http://www.dre.vanderbilt.edu/Stats">footprint and performance</a> stats. Any abnormal changes should be brought to the attention of the developer responsible for it or to the <a href="mailto:devo-group@list.isis.vanderbilt.edu"> devo group</a>. @@ -65,12 +65,6 @@ <p>Pro-active involvement by the build czar is necessary. Being a pro-active build czar requires monitoring the subversion archive carefully and responding quickly to suspected changes to keep the repo stays stable.</p> - <p>After an email from the Coverity scan project check the Coverity project and - check that there are no new errors reported. If so, contact the person who - introduced the error.</p> - <p>Check the daily test statistics email to determine any drop in test failures. - Do note that when there are a lot of compile errors the test results are really - unusable.</p> <hr> <h2>Recipe for Cutting a Beta/Minor Kit</h2> <P> @@ -118,7 +112,7 @@ </ul> If you want to perform a full build with qt support, than run: <ul> - <li><code>yum install rubygems clang make patch libcgroup-devel ant setuptool system-config-network-tui system-config-firewall-tui lcov gnuplot java-1.7.0-openjdk git-svn perl svn screen pysvn automake doxygen bzip2 tar gzip openssh graphviz zip libtool gcc-c++ boost-devel valgrind openssl-devel gcc qt4 fltk-devel bzip2-devel rsync openssl lzo-devel zziplib-devel acpid acpi nfs-utils java xerces-c xerces-c-devel mc qt qt-devel icecream ruby ruby-devel lksctp-tools-devel git glibc.i686 libstdc++.i686 ncurses-libs.i686 zlib.i686 telnet GitPython NetworkManager wget mailx</code></li> + <li><code>yum install clang make patch libcgroup-devel ant setuptool system-config-network-tui system-config-firewall-tui lcov gnuplot java-1.7.0-openjdk git-svn perl svn screen pysvn automake doxygen bzip2 tar gzip openssh graphviz zip libtool gcc-c++ boost-devel valgrind openssl-devel gcc qt4 fltk-devel bzip2-devel rsync openssl lzo-devel zziplib-devel acpid acpi nfs-utils java xerces-c xerces-c-devel mc qt qt-devel icecream ruby ruby-devel lksctp-tools-devel git glibc.i686 libstdc++.i686 ncurses-libs.i686 zlib.i686 telnet GitPython NetworkManager wget mailx</code></li> </ul> </li> <li> @@ -322,10 +316,10 @@ mkdir doxygen<br> cd doxygen<br> wget https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/ACE/docs/svn/config?view=co -O $HOME/.subversion/config<br> - svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_2_0/ACE ACE_wrappers<br> - svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_2_0/TAO ACE_wrappers/TAO<br> - svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_2_0/CIAO ACE_wrappers/TAO/CIAO<br> - svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_2_0/DAnCE ACE_wrappers/TAO/DAnCE<br> + svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_9/ACE ACE_wrappers<br> + svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_9/TAO ACE_wrappers/TAO<br> + svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_9/CIAO ACE_wrappers/TAO/CIAO<br> + svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_9/DAnCE ACE_wrappers/TAO/DAnCE<br> cd ACE_wrappers<br> export ACE_ROOT=$PWD<br> export TAO_ROOT=$ACE_ROOT/TAO<br> diff --git a/ACE/etc/index.html b/ACE/etc/index.html index 7b89ba8102b..d002d6655ac 100644 --- a/ACE/etc/index.html +++ b/ACE/etc/index.html @@ -35,7 +35,6 @@ <hr> We do have the documentation for previous releases <ul> - <LI><P><A HREF="6.2.0/html">6.2.0</A></P></LI> <LI><P><A HREF="6.1.9/html">6.1.9</A></P></LI> <LI><P><A HREF="6.1.8/html">6.1.8</A></P></LI> <LI><P><A HREF="6.1.7/html">6.1.7</A></P></LI> diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU index 77f6b862268..f1269e63d52 100644 --- a/ACE/include/makeinclude/rules.lib.GNU +++ b/ACE/include/makeinclude/rules.lib.GNU @@ -36,7 +36,7 @@ ifneq ($(versioned_so),0) ifeq ($(SONAME),) ifeq ($(versioned_so),1) SONAME = $(SHLIB)$(SOVERSION) - else + else ifeq ($(versioned_so),2) SONAME = $(patsubst %.$(SOEXT),%,$(SHLIB))$(SOVERSION).$(SOEXT) endif @@ -66,9 +66,9 @@ ifneq ($(versioned_so),2) CLEANUP_VSHLIB = $(CLEANUP_VSHLIB_NO_VER:%=%$(SOVERSION)) SHLIB_WITH_VER = $(SHLIB:%=%$(SOVERSION)) else - VSHLIB = $(if $(VSHLIB_NO_VER), $(patsubst %.$(SOEXT),%,$(VSHLIB_NO_VER))$(SOVERSION).$(SOEXT)) - CLEANUP_VSHLIB = $(if $(CLEANUP_VSHLIB_NO_VER), $(patsubst %.$(SOEXT),%,$(CLEANUP_VSHLIB_NO_VER))$(SOVERSION).$(SOEXT)) - SHLIB_WITH_VER = $(if $(SHLIB), $(patsubst %.$(SOEXT),%,$(SHLIB))$(SOVERSION).$(SOEXT)) + VSHLIB = $(patsubst %.$(SOEXT),%,$(VSHLIB_NO_VER))$(SOVERSION).$(SOEXT) + CLEANUP_VSHLIB = $(patsubst %.$(SOEXT),%,$(CLEANUP_VSHLIB_NO_VER))$(SOVERSION).$(SOEXT) + SHLIB_WITH_VER = $(patsubst %.$(SOEXT),%,$(SHLIB))$(SOVERSION).$(SOEXT) endif SHLIBA ?= diff --git a/ACE/tests/Compiler_Features_20_DLL.cpp b/ACE/tests/Compiler_Features_20_DLL.cpp deleted file mode 100644 index 053a9788c30..00000000000 --- a/ACE/tests/Compiler_Features_20_DLL.cpp +++ /dev/null @@ -1,10 +0,0 @@ - -//============================================================================= -/** - * $Id$ - */ -//============================================================================= - - -#include "Compiler_Features_20_DLL.h" - diff --git a/ACE/tests/Compiler_Features_20_DLL.h b/ACE/tests/Compiler_Features_20_DLL.h deleted file mode 100644 index a749abb240b..00000000000 --- a/ACE/tests/Compiler_Features_20_DLL.h +++ /dev/null @@ -1,30 +0,0 @@ - -//============================================================================= -/** - * @file Compiler_Features_20_DLL.h - * - * $Id$ - * - * Test DLL export with default constructor - */ -//============================================================================= - - -#ifndef ACE_TESTS_COMPILER_FEATURES_20_DLL_H -#define ACE_TESTS_COMPILER_FEATURES_20_DLL_H - -#include "test_config.h" - -#if defined (ACE_HAS_CPP11) - -#include "Compiler_Features_20_DLL_Export.h" - -class COMPILER_FEATURES_20_DLL_Export UtcT -{ -public: - ~UtcT (void) = default; -}; - -#endif - -#endif /* ACE_TESTS_COMPILER_FEATURES_20_DLL_H */ diff --git a/ACE/tests/Compiler_Features_20_DLL_Export.h b/ACE/tests/Compiler_Features_20_DLL_Export.h deleted file mode 100644 index 7dae763c831..00000000000 --- a/ACE/tests/Compiler_Features_20_DLL_Export.h +++ /dev/null @@ -1,54 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl COMPILER_FEATURES_20_DLL -// ------------------------------ -#ifndef COMPILER_FEATURES_20_DLL_EXPORT_H -#define COMPILER_FEATURES_20_DLL_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (COMPILER_FEATURES_20_DLL_HAS_DLL) -# define COMPILER_FEATURES_20_DLL_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ! TEST_HAS_DLL */ - -#if !defined (COMPILER_FEATURES_20_DLL_HAS_DLL) -# define COMPILER_FEATURES_20_DLL_HAS_DLL 1 -#endif /* ! COMPILER_FEATURES_20_DLL_HAS_DLL */ - -#if defined (COMPILER_FEATURES_20_DLL_HAS_DLL) && (COMPILER_FEATURES_20_DLL_HAS_DLL == 1) -# if defined (COMPILER_FEATURES_20_DLL_BUILD_DLL) -# define COMPILER_FEATURES_20_DLL_Export ACE_Proper_Export_Flag -# define COMPILER_FEATURES_20_DLL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define COMPILER_FEATURES_20_DLL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* COMPILER_FEATURES_20_DLL_BUILD_DLL */ -# define COMPILER_FEATURES_20_DLL_Export ACE_Proper_Import_Flag -# define COMPILER_FEATURES_20_DLL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define COMPILER_FEATURES_20_DLL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* COMPILER_FEATURES_20_DLL_BUILD_DLL */ -#else /* COMPILER_FEATURES_20_DLL_HAS_DLL == 1 */ -# define COMPILER_FEATURES_20_DLL_Export -# define COMPILER_FEATURES_20_DLL_SINGLETON_DECLARATION(T) -# define COMPILER_FEATURES_20_DLL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* COMPILER_FEATURES_20_DLL_HAS_DLL == 1 */ - -// Set COMPILER_FEATURES_20_DLL_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (COMPILER_FEATURES_20_DLL_NTRACE) -# if (ACE_NTRACE == 1) -# define COMPILER_FEATURES_20_DLL_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define COMPILER_FEATURES_20_DLL_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !COMPILER_FEATURES_20_DLL_NTRACE */ - -#if (COMPILER_FEATURES_20_DLL_NTRACE == 1) -# define COMPILER_FEATURES_20_DLL_TRACE(X) -#else /* (COMPILER_FEATURES_20_DLL_NTRACE == 1) */ -# define COMPILER_FEATURES_20_DLL_TRACE(X) ACE_TRACE_IMPL(X) -#endif /* (COMPILER_FEATURES_20_DLL_NTRACE == 1) */ - -#endif /* COMPILER_FEATURES_20_DLL_EXPORT_H */ - -// End of auto generated file. diff --git a/ACE/tests/FlReactor_Test.cpp b/ACE/tests/FlReactor_Test.cpp index f529c9ec6d1..655a7af680d 100644 --- a/ACE/tests/FlReactor_Test.cpp +++ b/ACE/tests/FlReactor_Test.cpp @@ -27,7 +27,6 @@ #include "ace/FlReactor/FlReactor.h" #include "ace/Event_Handler.h" #include "ace/Acceptor.h" -#include "ace/Argv_Type_Converter.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Connector.h" #include "ace/Service_Config.h" @@ -178,8 +177,7 @@ Connection_Handler::open (void*) from.addr_to_string (buf, bufsiz, 0); static char msg[256]; - ACE_OS::sprintf (msg, "connection from <%s>\n", - ACE_TEXT_ALWAYS_CHAR (buf)); + ACE_OS::sprintf (msg, "connection from <%s>\n", buf); this->box_->label (msg); this->box_->redraw (); @@ -261,17 +259,13 @@ int run_main (int argc, ACE_TCHAR *argv[]) address.addr_to_string (buf, bufsiz, 0); char msg[2 * bufsiz]; - ACE_OS::sprintf (msg, "Listening on <%s>\n", - ACE_TEXT_ALWAYS_CHAR (buf)); + ACE_OS::sprintf (msg, "Listening on <%s>\n", buf); box->label (msg); box->redraw (); window.end (); - - ACE_Argv_Type_Converter ct (argc, argv); - - window.show (argc, ct.get_ASCII_argv ()); + window.show (argc, argv); tw.show (); int const retval = Fl::run (); diff --git a/ACE/tests/QtReactor_Test.cpp b/ACE/tests/QtReactor_Test.cpp index 09ffbca3ffa..f07b56aacfc 100644 --- a/ACE/tests/QtReactor_Test.cpp +++ b/ACE/tests/QtReactor_Test.cpp @@ -46,7 +46,6 @@ #include "ace/Time_Value.h" #include "ace/QtReactor/QtReactor.h" #include "ace/Event_Handler.h" -#include "ace/Argv_Type_Converter.h" #include "ace/Acceptor.h" #include "ace/Connector.h" #include "ace/SOCK_Acceptor.h" @@ -892,9 +891,7 @@ void testQtReactor (int argc, ACE_TCHAR *argv[]) // Qt specific code ACE_DEBUG ((LM_INFO, ACE_TEXT ("Testing QtReactor\n"))); - ACE_Argv_Type_Converter ct (argc, argv); - QTestApplication app (argc, ct.get_ASCII_argv ()); - + QTestApplication app (argc, argv); ACE_QtReactor qtReactor (&app); ACE_Reactor reactor (&qtReactor); HandlersRegister handlersRegister (&reactor); diff --git a/ACE/tests/SOCK_Dgram_Test.cpp b/ACE/tests/SOCK_Dgram_Test.cpp index 0cd5aa57f34..7b4399484c9 100644 --- a/ACE/tests/SOCK_Dgram_Test.cpp +++ b/ACE/tests/SOCK_Dgram_Test.cpp @@ -111,7 +111,7 @@ client (void *arg) } else { - buf[rcv_siz/sizeof (ACE_TCHAR)] = '\0'; + buf[rcv_siz] = '\0'; if (ACE_OS::strncmp (buf, TEST_DATA, ACE_OS::strlen (TEST_DATA))) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) recv string should be %s; ") diff --git a/ACE/tests/run_test.pl b/ACE/tests/run_test.pl index e03e3d808e0..cace3612950 100755 --- a/ACE/tests/run_test.pl +++ b/ACE/tests/run_test.pl @@ -115,7 +115,7 @@ sub run_program ($@) ## if the executable doesn't exist, the error will show ## up as part of the previous test. print "auto_run_tests: tests/$path $arguments\n"; - #$ENV{COVERITY_TEST_NAME} = "tests/$path"; + $ENV{COVERITY_TEST_NAME} = "tests/$path"; my ($program, $dir, $suffix) = fileparse($path); my $start_dir = getcwd (); diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc index c11c786c3d8..704010d4130 100644 --- a/ACE/tests/tests.mpc +++ b/ACE/tests/tests.mpc @@ -36,6 +36,7 @@ project(Framework Component DLL) : acelib { } } + project(DLL Test Parent Lib) : acelib { libout = . sharedname = DLL_Test_Parent @@ -679,23 +680,6 @@ project(Compiler_Features_19_Test) : acetest { } } -project(Compiler_Features_20_Test) : acelib { - libout = . - sharedname = Compiler_Features_20 - dynamicflags += COMPILER_FEATURES_20_DLL_BUILD_DLL - - Source_Files { - Compiler_Features_20_DLL.cpp - } - Header_Files { - Compiler_Features_20_DLL.h - Compiler_Features_20_DLL_Export.h - } - Resource_Files { - } -} - - project(Config Test) : acetest { avoids += ace_for_tao exename = Config_Test diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 55df45421a2..de5839233d1 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,13 +1,3 @@ -Thu May 30 15:31:48 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/CIF/Events/client.cpp: - Removed dead code - -Mon May 27 10:18:33 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> - - * NEWS: - Updates in preparation of releasing x.2.0 - Mon May 27 10:09:24 CEST 2013 Johnny Willemsen <jwillemsen@remedy.nl> * CIAO version 1.2.0 released. diff --git a/CIAO/NEWS b/CIAO/NEWS index 61892504c4d..c64f0036d24 100644 --- a/CIAO/NEWS +++ b/CIAO/NEWS @@ -1,11 +1,6 @@ -USER VISIBLE CHANGES BETWEEN CIAO-1.2.0 and CIAO-1.2.1 -======================================================= - USER VISIBLE CHANGES BETWEEN CIAO-1.1.9 and CIAO-1.2.0 ======================================================= -. None - USER VISIBLE CHANGES BETWEEN CIAO-1.1.8 and CIAO-1.1.9 ======================================================= diff --git a/CIAO/tests/CIF/Events/client.cpp b/CIAO/tests/CIF/Events/client.cpp index c89c9768450..51c246f70ba 100644 --- a/CIAO/tests/CIF/Events/client.cpp +++ b/CIAO/tests/CIF/Events/client.cpp @@ -1716,6 +1716,8 @@ run_test (::Components::Events_ptr source, ++ret; } return ret; + + return ret; } int diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog index 49dcbff0566..c7889177974 100644 --- a/DAnCE/ChangeLog +++ b/DAnCE/ChangeLog @@ -1,8 +1,3 @@ -Mon May 27 10:18:36 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> - - * NEWS: - Updates in preparation of releasing x.2.0 - Mon May 27 10:09:24 CEST 2013 Johnny Willemsen <jwillemsen@remedy.nl> * DAnCE version 1.2.0 released. diff --git a/DAnCE/NEWS b/DAnCE/NEWS index cbd075b2322..8b08c8ef09b 100644 --- a/DAnCE/NEWS +++ b/DAnCE/NEWS @@ -1,11 +1,6 @@ -USER VISIBLE CHANGES BETWEEN DAnCE-1.2.0 and DAnCE-1.2.1 -======================================================= - USER VISIBLE CHANGES BETWEEN DAnCE-1.1.9 and DAnCE-1.2.0 ======================================================= -. None - USER VISIBLE CHANGES BETWEEN DAnCE-1.1.8 and DAnCE-1.1.9 ======================================================= diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a6810f718a8..c308c78e5e7 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,185 +1,3 @@ -Mon Jun 10 21:03:58 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> - - * orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp: - - Fix an ambiguity tripping up the OpenVMS build. - -Fri Jun 7 13:26:15 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> - - * tests/IPV6/run_test.pl: - - Added verbose debugging to suspect client too in case the problem is - in parsing the constructed address. - -Thu Jun 6 23:19:04 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> - - * tao/IIOP_Endpoint.cpp: - - Fix for an old bug that occurred when a client is using - -ORBPreferIPv6Interfaces 1, and the supplied IOR contains - only a single IPv4 endpoint. - - * tests/IPV6/run_test.pl: - - Add a regression test for the above. Also an intemediate patch to - make one of the regression tests dump verbose logging to see why the - test fails on the nightly build host. - -Thu Jun 6 12:38:36 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> - - * performance-tests/Cubit/TAO/MT_Cubit/server.cpp: - - Another wchar build fix. - -Thu Jun 6 12:10:48 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> - - * orbsvcs/orbsvcs/Trader/Offer_Database.cpp: - Fixed Coverity warning - - * orbsvcs/orbsvcs/Trader/Trading_Loader.h: - Fixed Coverity warning and doxygen changes - -Wed Jun 5 20:11:23 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> - - * examples/AMI/FL_Callback/progress.cpp: - - * orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp: - - * performance-tests/Cubit/TAO/MT_Cubit/server.cpp: - - * tests/FL_Cube/server.cpp: - - * tests/QtTests/client.cpp: - * tests/QtTests/server.cpp: - - Fixed wchar build compile errors - -Tue Jun 4 19:30:32 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> - - * orbsvcs/ImplRepo_Service/LiveCheck.cpp: - - Clean up an error at shutdown time. - -Mon Jun 3 21:16:43 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> - - * bin/tao_other_tests.lst: - - Add new test to suite. - - * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: - * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: - - Add more high-verbosity logging output. - - * orbsvcs/ImplRepo_Service/LiveCheck.h: - * orbsvcs/ImplRepo_Service/LiveCheck.cpp: - - Add code to guard against server termination while waiting - for a ping response. This can happen if the target POA gets - shutdown while another thread was handling a ping request from - the IMR. If the POA's server_is_shutting_down call gets back - to the ImR before the ping reply. The ImR was not properly - cleaning up the callback object, this would lead to a call - to a deleted object triggering the crash. - - * orbsvcs/tests/ImplRepo/ping_interrupt/README: - * orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.h: - * orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp: - * orbsvcs/tests/ImplRepo/ping_interrupt/Test.idl: - * orbsvcs/tests/ImplRepo/ping_interrupt/Test_i.h: - * orbsvcs/tests/ImplRepo/ping_interrupt/Test_i.cpp: - * orbsvcs/tests/ImplRepo/ping_interrupt/ping_interrupt.mpc: - * orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl: - * orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp: - * orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h: - * orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp: - - Added a test to simulate the above by using a server interceptor - to trigger the POA shutdown before sending the ping result. - -Thu May 30 18:52:55 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> - - * orbsvcs/tests/Trading/colocated_test.cpp: - * orbsvcs/tests/Trading/export_test.cpp: - * orbsvcs/tests/Trading/import_test.cpp: - Wchar fixes - -Thu May 30 17:39:37 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> - - * orbsvcs/ImplRepo_Service/LiveCheck.h: - * orbsvcs/ImplRepo_Service/LiveCheck.cpp: - - removed a redundant experimental member value and more code style - cleanup. - -Wed May 29 21:32:51 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> - - * orbsvcs/ImplRepo_Service/AsyncListManager.h: - * orbsvcs/ImplRepo_Service/AsyncListManager.cpp: - - Add in the "jacorb" prefix for JacORB based server identifiers. - Also add the testing of initial status to avoid waiting for non- - pingable servers. Add some higher verbosity level debug output. - - * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: - - Minor code style fix. - - * orbsvcs/ImplRepo_Service/LiveCheck.h: - * orbsvcs/ImplRepo_Service/LiveCheck.cpp: - - Support the initial setting of of state when a listener is added. - - Prevent redundant timeout registrations by deferring a timer schedule - if one is currently being processed. This could happen if a ping - required a non-blocking connect, allowing a new request to be received. - Subsequent pings may still be requested, but only the next closest - time will be schheduled after a current handle timeout is completed. - - -Wed May 29 19:27:35 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> - - * orbsvcs/tests/Trading/Offer_Exporter.cpp: - * orbsvcs/tests/Trading/Service_Type_Exporter.cpp: - Attempt to fix windows warnings - -Wed May 29 13:44:23 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> - - * tao/Bounded_Basic_String_Sequence_T.h: - * tao/Bounded_Object_Reference_Sequence_T.h: - * tao/Bounded_Value_Sequence_T.h: - * tao/Unbounded_Basic_String_Sequence_T.h: - * tao/Unbounded_Object_Reference_Sequence_T.h: - Doxygen doesn't support copydoc with templates, maybe in - the future, so just made them general C++ comments so that - we easily could add this in the future - -Wed May 29 07:00:03 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> - - * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp: - * orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp: - * orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp: - * orbsvcs/tests/Trading/Offer_Exporter.cpp: - * orbsvcs/tests/Trading/Offer_Importer.cpp: - * orbsvcs/tests/Trading/Service_Type_Exporter.h: - * orbsvcs/tests/Trading/Service_Type_Exporter.cpp: - * orbsvcs/tests/Trading/TT_Info.cpp: - * orbsvcs/tests/Trading/colocated_test.cpp: - * orbsvcs/tests/Trading/export_test.cpp: - * orbsvcs/tests/Trading/import_test.cpp: - Fixed several memory leaks in the trading service and - also extensions to the unit test. Thanks to Rudy Pot - <rpot at aweta dot nl> for delivering the patches. This - fixed bugzilla 4100 - - * tao/PortableServer/Operation_Table_Dynamic_Hash.h: - Doxygen fix - -Mon May 27 10:18:30 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> - - * NEWS: - Updates in preparation of releasing x.2.0 - Mon May 27 10:09:24 CEST 2013 Johnny Willemsen <jwillemsen@remedy.nl> * TAO version 2.2.0 released. @@ -1,6 +1,3 @@ -USER VISIBLE CHANGES BETWEEN TAO-2.2.0 and TAO-2.2.1 -==================================================== - USER VISIBLE CHANGES BETWEEN TAO-2.1.9 and TAO-2.2.0 ==================================================== diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst index 4f9322f3b99..3d95906e13f 100644 --- a/TAO/bin/tao_other_tests.lst +++ b/TAO/bin/tao_other_tests.lst @@ -141,7 +141,6 @@ TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: !ST !MINIMUM TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -delay 20 -imr_start: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -hide_server -imr_start: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -multistart: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS TAO/orbsvcs/examples/ImR/Combined_Service/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ST !ACE_FOR_TAO !LynxOS TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO !WCHAR TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !NO_MESSAGING !ACE_FOR_TAO !LynxOS diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp index a2ebfb494da..341b6af910f 100644 --- a/TAO/examples/AMI/FL_Callback/progress.cpp +++ b/TAO/examples/AMI/FL_Callback/progress.cpp @@ -73,7 +73,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) window.end (); - char* targv[] = { ACE_TEXT_ALWAYS_CHAR (argv[0]) }; + char* targv[] = { argv[0] }; window.show (1, targv); sw.show (); diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp index a37a5e62f9a..5ccef1c12d2 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp @@ -23,13 +23,6 @@ AsyncAccessManager::AsyncAccessManager (const Server_Info &info, lock_() { this->info_ = new Server_Info (info); - if (ImR_Locator_i::debug () > 4) - { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager::ctor server = %s\n"), - this->info_->name.c_str())); - } - } AsyncAccessManager::~AsyncAccessManager (void) @@ -57,12 +50,6 @@ AsyncAccessManager::add_interest (ImR_ResponseHandler *rh) ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); this->rh_list_.push_back (rh); } - if (ImR_Locator_i::debug () > 4) - { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager::add_interest\n"))); - } - if (this->info_->activation_mode == ImplementationRepository::PER_CLIENT) { @@ -202,12 +189,6 @@ void AsyncAccessManager::server_is_running (const char *partial_ior, ImplementationRepository::ServerObject_ptr ref) { - if (ImR_Locator_i::debug () > 4) - { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager::server_is_running\n"))); - } - this->status (AAM_WAIT_FOR_ALIVE); this->info_->partial_ior = partial_ior; this->info_->server = ImplementationRepository::ServerObject::_duplicate (ref); @@ -257,13 +238,6 @@ AsyncAccessManager::notify_child_death (void) void AsyncAccessManager::ping_replied (LiveStatus server) { - if (ImR_Locator_i::debug () > 4) - { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager::ping_replied %s\n"), - LiveEntry::status_name (server))); - } - switch (server) { case LS_ALIVE: @@ -295,12 +269,6 @@ AsyncAccessManager::ping_replied (LiveStatus server) bool AsyncAccessManager::send_start_request (void) { - if (ImR_Locator_i::debug () > 4) - { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager::send_start_request\n"))); - } - if (this->info_->activation_mode == ImplementationRepository::MANUAL && !this->manual_start_) { diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp index 3682be1f289..ad4bf4347eb 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp @@ -161,15 +161,8 @@ AsyncListManager::list_i (CORBA::ULong start, CORBA::ULong how_many) it.advance (); Server_Info_Ptr info = entry->int_id_; - if (info->jacorb_server) - { - ACE_CString jacorb_name (ACE_TEXT ("JACORB:") + info->name); - this->server_list_[i].server = jacorb_name.c_str (); - } - else - { - this->server_list_[i].server = info->name.c_str (); - } + + this->server_list_[i].server = info->name.c_str (); this->server_list_[i].startup.command_line = info->cmdline.c_str (); this->server_list_[i].startup.environment = info->env_vars; this->server_list_[i].startup.working_directory = info->dir.c_str (); @@ -194,10 +187,7 @@ AsyncListManager::list_i (CORBA::ULong start, CORBA::ULong how_many) } else { - if (!evaluate_status (i,l->status())) - { - this->waiters_++; - } + this->waiters_++; } } } @@ -207,7 +197,7 @@ AsyncListManager::list_i (CORBA::ULong start, CORBA::ULong how_many) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) AsyncListManager::list_i, %d waiters") ACE_TEXT (" out of %d regsitered servers\n"), - this->waiters_, len)); + this->waiters_, (this->pinger_ != 0))); } if (this->waiters_ == 0) @@ -216,10 +206,10 @@ AsyncListManager::list_i (CORBA::ULong start, CORBA::ULong how_many) } } -bool -AsyncListManager::evaluate_status (CORBA::ULong index, LiveStatus status) + +void +AsyncListManager::ping_replied (CORBA::ULong index, LiveStatus status) { - bool is_final = true; switch (status) { case LS_ALIVE: @@ -236,26 +226,16 @@ AsyncListManager::evaluate_status (CORBA::ULong index, LiveStatus status) ImplementationRepository::ACTIVE_NO; break; default: - is_final = false; - } - return is_final; -} - -void -AsyncListManager::ping_replied (CORBA::ULong index, LiveStatus status) -{ - if (evaluate_status (index, status)) - { - this->waiters_--; - this->final_state(); + if (ImR_Locator_i::debug() > 4) + { + ORBSVCS_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) AsyncListManager::ping_replied, index = %d ") + ACE_TEXT ("status = %d\n"))); + } return; } - if (ImR_Locator_i::debug() > 4) - { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncListManager::ping_replied, index = %d ") - ACE_TEXT ("status = %d\n"))); - } + this->waiters_--; + this->final_state(); } AsyncListManager * @@ -292,8 +272,7 @@ ListLiveListener::ListLiveListener (const char *server, owner_ (owner->_add_ref ()), pinger_ (pinger), status_ (LS_UNKNOWN), - index_ (index), - started_ (false) + index_ (index) { } @@ -305,16 +284,9 @@ bool ListLiveListener::start (void) { bool rtn = this->pinger_.add_poll_listener (this); - this->started_ = true; return rtn; } -LiveStatus -ListLiveListener::status (void) -{ - return this->status_; -} - bool ListLiveListener::status_changed (LiveStatus status) { @@ -325,8 +297,7 @@ ListLiveListener::status_changed (LiveStatus status) } else { - if (this->started_) - this->owner_->ping_replied (this->index_, status); + this->owner_->ping_replied (this->index_, status); } return true; } diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h index b31ebe984ea..9aa5799b86e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h @@ -53,7 +53,6 @@ class AsyncListManager CORBA::ULong list (ImplementationRepository::AMH_ServerInformationIteratorResponseHandler_ptr _tao_rh, CORBA::ULong start, CORBA::ULong count); - bool evaluate_status (CORBA::ULong index, LiveStatus status); void ping_replied (CORBA::ULong index, LiveStatus status); AsyncListManager *_add_ref (void); @@ -91,7 +90,7 @@ class ListLiveListener : public LiveListener virtual ~ListLiveListener (void); bool start (void); - LiveStatus status (void); + bool status_changed (LiveStatus status); private: @@ -99,7 +98,6 @@ class ListLiveListener : public LiveListener LiveCheck &pinger_; LiveStatus status_; CORBA::ULong index_; - bool started_; }; diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index b7e34b9a29b..bf24cc46296 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -554,7 +554,7 @@ ImR_Locator_i::activate_server_i (UpdateableServerInfo& info, ACE_NEW (aam_raw, AsyncAccessManager (*info, manual_start, *this)); aam = aam_raw; this->aam_set_.insert_tail (aam); - } + } else { aam = this->find_aam (info->name.c_str()); @@ -1005,21 +1005,9 @@ ImR_Locator_i::server_is_running AsyncAccessManager_ptr aam(this->find_aam (name.c_str())); if (!aam.is_nil()) - { - if (ImR_Locator_i::debug () > 4) - { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) ImR_Locator_i::send_start_request aam is not nil\n"))); - } - aam->server_is_running (partial_ior, s.in()); - } + aam->server_is_running (partial_ior, s.in()); else { - if (ImR_Locator_i::debug () > 4) - { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) ImR_Locator_i::send_start_request aam is nil\n"))); - } if (info->activation_mode != ImplementationRepository::PER_CLIENT) { AsyncAccessManager *aam_raw; diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp index fffa9de359a..e93571dcb0d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp @@ -11,9 +11,9 @@ #include "ace/High_Res_Timer.h" LiveListener::LiveListener (const char *server) - : server_ (server), - refcount_ (1), - lock_ () + : server_(server), + refcount_(1), + lock_() { } @@ -123,33 +123,12 @@ LiveEntry::LiveEntry (LiveCheck *owner, max_retry_ (LiveEntry::reping_limit_), may_ping_ (may_ping), listeners_ (), - lock_ (), - callback_ (0) + lock_ () { - if (ImR_Locator_i::debug () > 4) - { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) LiveEntry::ctor server = %s, may_ping = %d\n"), - server, may_ping)); - } } LiveEntry::~LiveEntry (void) { - if (this->callback_.in () != 0) - { - PingReceiver *rec = dynamic_cast<PingReceiver *>(this->callback_.in()); - if (rec != 0) - { - rec->cancel (); - } - } -} - -void -LiveEntry::release_callback (void) -{ - this->callback_ = 0; } void @@ -170,25 +149,13 @@ LiveEntry::reset_status (void) this->repings_ = 0; this->next_check_ = ACE_High_Res_Timer::gettimeofday_hr(); } - if (ImR_Locator_i::debug () > 2) - { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) LiveEntry::reset_status this = %x, ") - ACE_TEXT ("server = %C status = %s\n"), - this, this->server_.c_str(), - status_name (this->liveliness_))); - } - } LiveStatus LiveEntry::status (void) const { if (!this->may_ping_) - { - return LS_ALIVE; - } - + return LS_ALIVE; if ( this->liveliness_ == LS_ALIVE && this->owner_->ping_interval() != ACE_Time_Value::zero ) @@ -269,12 +236,6 @@ LiveEntry::next_check (void) const return this->next_check_; } -const char * -LiveEntry::server_name (void) const -{ - return this->server_.c_str(); -} - bool LiveEntry::validate_ping (bool &want_reping, ACE_Time_Value& next) { @@ -282,7 +243,7 @@ LiveEntry::validate_ping (bool &want_reping, ACE_Time_Value& next) this->liveliness_ == LS_DEAD || this->listeners_.size () == 0) { - if (ImR_Locator_i::debug () > 4) + if (ImR_Locator_i::debug () > 5) { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveEntry::validate_ping, status ") @@ -339,14 +300,6 @@ LiveEntry::validate_ping (bool &want_reping, ACE_Time_Value& next) } ACE_Time_Value next (ms / 1000, (ms % 1000) * 1000); this->next_check_ = now + next; - if (ImR_Locator_i::debug () > 4) - { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) LiveEntry::validate_ping, ") - ACE_TEXT ("transient, reping in %d ms, ") - ACE_TEXT ("server %C\n"), - ms, this->server_.c_str())); - } } else { @@ -379,15 +332,11 @@ LiveEntry::validate_ping (bool &want_reping, ACE_Time_Value& next) void LiveEntry::do_ping (PortableServer::POA_ptr poa) { - this->callback_ = new PingReceiver (this, poa); - PortableServer::ObjectId_var oid = poa->activate_object (this->callback_.in()); + PortableServer::ServantBase_var callback = new PingReceiver (this, poa); + PortableServer::ObjectId_var oid = poa->activate_object (callback.in()); CORBA::Object_var obj = poa->id_to_reference (oid.in()); ImplementationRepository::AMI_ServerObjectHandler_var cb = ImplementationRepository::AMI_ServerObjectHandler::_narrow (obj.in()); - { - ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); - this->liveliness_ = LS_PING_AWAY; - } try { this->ref_->sendc_ping (cb.in()); @@ -397,6 +346,8 @@ LiveEntry::do_ping (PortableServer::POA_ptr poa) ACE_TEXT ("(%P|%t) LiveEntry::do_ping, ") ACE_TEXT ("sendc_ping returned OK\n"))); } + ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); + this->liveliness_ = LS_PING_AWAY; } catch (CORBA::Exception &ex) { @@ -424,45 +375,9 @@ PingReceiver::~PingReceiver (void) } void -PingReceiver::cancel (void) -{ - if (ImR_Locator_i::debug () > 4) - { - const char *server = "<not available>"; - if (this->entry_ != 0) - { - server = this->entry_->server_name (); - } - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) PingReceiver::cancel server = %s\n"), - server)); - } - - this->entry_ = 0; - try - { - PortableServer::ObjectId_var oid = this->poa_->servant_to_id (this); - poa_->deactivate_object (oid.in()); - } - catch (CORBA::Exception &ex) - { - if (ImR_Locator_i::debug () > 4) - { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) PingReceiver::cancel caught %C\n"), - ex._name ())); - } - } -} - -void PingReceiver::ping (void) { - if (this->entry_ != 0) - { - this->entry_->status (LS_ALIVE); - this->entry_->release_callback (); - } + this->entry_->status (LS_ALIVE); PortableServer::ObjectId_var oid = this->poa_->servant_to_id (this); poa_->deactivate_object (oid.in()); } @@ -482,38 +397,22 @@ PingReceiver::ping_excep (Messaging::ExceptionHolder * excep_holder) case TAO_POA_DISCARDING: case TAO_POA_HOLDING: { - if (this->entry_ != 0) - { - this->entry_->status (LS_TRANSIENT); - this->entry_->release_callback (); - } + this->entry_->status (LS_TRANSIENT); break; } default: //case TAO_INVOCATION_SEND_REQUEST_MINOR_CODE: { - if (this->entry_ != 0) - { - this->entry_->status (LS_DEAD); - this->entry_->release_callback (); - } + this->entry_->status (LS_DEAD); } } } catch (CORBA::TIMEOUT &) { - if (this->entry_ != 0) - { - this->entry_->status (LS_TIMEDOUT); - this->entry_->release_callback (); - } + this->entry_->status (LS_TIMEDOUT); } catch (CORBA::Exception &) { - if (this->entry_ != 0) - { - this->entry_->status (LS_DEAD); - this->entry_->release_callback (); - } + this->entry_->status (LS_DEAD); } PortableServer::ObjectId_var oid = this->poa_->servant_to_id (this); @@ -523,74 +422,10 @@ PingReceiver::ping_excep (Messaging::ExceptionHolder * excep_holder) //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- -LC_TimeoutGuard::LC_TimeoutGuard (LiveCheck *owner, int token) - :owner_ (owner), - token_ (token), - blocked_ (owner->handle_timeout_busy_ == 0) -{ - if (!blocked_) - { - --owner_->handle_timeout_busy_; - } -} - -LC_TimeoutGuard::~LC_TimeoutGuard (void) -{ - if (blocked_) - { - return; - } - - ++owner_->handle_timeout_busy_; - if (owner_->want_timeout_) - { - ACE_Time_Value delay = ACE_Time_Value::zero; - if (owner_->deferred_timeout_ != ACE_Time_Value::zero) - { - ACE_Time_Value now (ACE_High_Res_Timer::gettimeofday_hr()); - if (owner_->deferred_timeout_ > now) - delay = owner_->deferred_timeout_ - now; - } - ++owner_->token_; - if (ImR_Locator_i::debug () > 2) - { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) LC_TimeoutGuard(%d)::dtor,") - ACE_TEXT ("scheduling new timeout(%d), delay = %d,%d\n"), - this->token_, owner_->token_, delay.sec(), delay.usec())); - } - owner_->reactor()->schedule_timer (owner_, - reinterpret_cast<void *>(owner_->token_), - delay); - owner_->want_timeout_ = false; - } - else - { - if (ImR_Locator_i::debug () > 3) - { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) LC_TimeoutGuard(%d)::dtor,") - ACE_TEXT ("no pending timeouts requested\n"), - this->token_)); - } - } -} - -bool LC_TimeoutGuard::blocked (void) -{ - return this->blocked_; -} - -//--------------------------------------------------------------------------- -//--------------------------------------------------------------------------- - LiveCheck::LiveCheck () :ping_interval_(), running_ (false), - token_ (100), - handle_timeout_busy_ (1), - want_timeout_ (false), - deferred_timeout_ (0,0) + token_ (100) { } @@ -650,17 +485,15 @@ LiveCheck::handle_timeout (const ACE_Time_Value &, if (!this->running_) return -1; - LC_TimeoutGuard tg (this, static_cast<int>(token)); - if (tg.blocked ()) - return 0; - + bool want_reping = false; + ACE_Time_Value next; LiveEntryMap::iterator le_end = this->entry_map_.end(); for (LiveEntryMap::iterator le = this->entry_map_.begin(); le != le_end; ++le) { LiveEntry *entry = le->item (); - if (entry->validate_ping (this->want_timeout_, this->deferred_timeout_)) + if (entry->validate_ping (want_reping, next)) { entry->do_ping (poa_.in ()); if (ImR_Locator_i::debug () > 2) @@ -691,7 +524,7 @@ LiveCheck::handle_timeout (const ACE_Time_Value &, LiveEntry *entry = *pe; if (entry != 0) { - if (entry->validate_ping (this->want_timeout_, this->deferred_timeout_)) + if (entry->validate_ping (want_reping, next)) { entry->do_ping (poa_.in ()); } @@ -703,6 +536,22 @@ LiveCheck::handle_timeout (const ACE_Time_Value &, } } + + if (want_reping) + { + ACE_Time_Value now (ACE_High_Res_Timer::gettimeofday_hr()); + ACE_Time_Value delay = next - now; + ++this->token_; + if (ImR_Locator_i::debug () > 2) + { + ORBSVCS_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) LiveCheck::handle_timeout(%d),") + ACE_TEXT (" want reping(%d), delay = %d,%d\n"), + token, this->token_, delay.sec(), delay.usec())); + } + this->reactor()->schedule_timer (this, reinterpret_cast<void *>(this->token_), delay); + } + return 0; } @@ -765,18 +614,10 @@ LiveCheck::add_per_client_listener (LiveListener *l, { entry->add_listener (l); - if (this->handle_timeout_busy_ > 0) - { - ++this->token_; - this->reactor()->schedule_timer (this, - reinterpret_cast<void *>(this->token_), - ACE_Time_Value::zero); - } - else - { - this->want_timeout_ = true; - this->deferred_timeout_ = ACE_Time_Value::zero; - } + ++this->token_; + this->reactor()->schedule_timer (this, + reinterpret_cast<void *>(this->token_), + ACE_Time_Value::zero); return true; } return false; @@ -798,7 +639,6 @@ LiveCheck::add_poll_listener (LiveListener *l) entry->add_listener (l); entry->reset_status (); - l->status_changed (entry->status()); return this->schedule_ping (entry); } @@ -834,38 +674,34 @@ LiveCheck::schedule_ping (LiveEntry *entry) ACE_Time_Value now (ACE_High_Res_Timer::gettimeofday_hr()); ACE_Time_Value next = entry->next_check (); - - if (this->handle_timeout_busy_ > 0) + ++this->token_; + if (next <= now) { - ACE_Time_Value delay = ACE_Time_Value::zero; - if (next > now) - { - delay = next - now; - } - ++this->token_; if (ImR_Locator_i::debug () > 2) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) LiveCheck::schedule_ping (%d),") - ACE_TEXT (" delay = %d,%d\n"), - this->token_, delay.sec(), delay.usec())); + ACE_TEXT ("(%P|%t) LiveCheck::Schdedule_ping(%d),") + ACE_TEXT (" immediate\n"), + this->token_)); } + this->reactor()->schedule_timer (this, reinterpret_cast<void *>(this->token_), - delay); + ACE_Time_Value::zero); } else { + ACE_Time_Value delay = next - now; if (ImR_Locator_i::debug () > 2) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) LiveCheck::schedule_ping deferred"))); - } - if (!this->want_timeout_ || next < this->deferred_timeout_) - { - this->want_timeout_ = true; - this->deferred_timeout_ = next; + ACE_TEXT ("(%P|%t) LiveCheck::Schdedule_ping(%d),") + ACE_TEXT (" delay = %d,%d\n"), + this->token_, delay.sec(), delay.usec())); } + this->reactor()->schedule_timer (this, + reinterpret_cast<void *>(this->token_), + delay); } return true; } diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h index 293c215e9f2..005ae3a3005 100644 --- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h +++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h @@ -27,7 +27,6 @@ class LiveCheck; class LiveEntry; -class PingReceiver; //--------------------------------------------------------------------------- /* @@ -93,6 +92,7 @@ class Locator_Export LiveListener protected: ACE_CString server_; + const LiveEntry *entry_; private: int refcount_; @@ -121,7 +121,6 @@ class Locator_Export LiveEntry ImplementationRepository::ServerObject_ptr ref); ~LiveEntry (void); - void release_callback (void); void add_listener (LiveListener *ll); LiveStatus status (void) const; void status (LiveStatus l); @@ -138,7 +137,6 @@ class Locator_Export LiveEntry bool reping_available (void); int next_reping (void); void max_retry_msec (int max); - const char *server_name (void) const; private: LiveCheck *owner_; @@ -153,8 +151,6 @@ class Locator_Export LiveEntry typedef ACE_Unbounded_Set<LiveListener_ptr> Listen_Set; Listen_Set listeners_; TAO_SYNCH_MUTEX lock_; - PortableServer::ServantBase_var callback_; - static const int reping_msec_ []; static int reping_limit_; @@ -176,14 +172,7 @@ class Locator_Export PingReceiver : PingReceiver (LiveEntry * entry, PortableServer::POA_ptr poa); virtual ~PingReceiver (void); - /// Called by the entry if it is no longer interested in the result of - /// a ping. - void cancel (void); - - /// Called when an anticipated ping reply is received void ping (void); - - /// Called when an anticipated ping raises an exception void ping_excep (Messaging::ExceptionHolder * excep_holder); private: @@ -191,40 +180,6 @@ class Locator_Export PingReceiver : LiveEntry * entry_; }; - -//--------------------------------------------------------------------------- -/* - * @class LC_TimeoutGuard - * - * @brief A helper object to avoid reentrancy in the handle_timout method - * - * The LiveCheck::handle_timeout may be called reentrantly on a single thread - * if the sending of a ping uses non-blocking connection establishment. If a - * connection must be established before the ping can be sent, that may involve - * waiting in the reactor, possibly handing other requests, and possibly even - * subsequent timeouts. - * */ - -class Locator_Export LC_TimeoutGuard -{ - public: - /// construct a new stack-based guard. This sets a flag in the owner that will - /// be cleared on destruction. - LC_TimeoutGuard (LiveCheck *owner, int token); - - /// releases the flag. If the LiveCheck received any requests for an immediate - /// or defered ping during this time, schedule it now. - ~LC_TimeoutGuard (void); - - /// Returns true if the busy flag in the owner was already set. - bool blocked (void); - - private: - LiveCheck *owner_; - int token_; - bool blocked_; -}; - //--------------------------------------------------------------------------- /* * @class LiveCheck @@ -239,8 +194,6 @@ class Locator_Export LC_TimeoutGuard class Locator_Export LiveCheck : public ACE_Event_Handler { public: - friend class LC_TimeoutGuard; - LiveCheck (); ~LiveCheck (void); @@ -288,9 +241,6 @@ class Locator_Export LiveCheck : public ACE_Event_Handler ACE_Time_Value ping_interval_; bool running_; int token_; - int handle_timeout_busy_; - bool want_timeout_; - ACE_Time_Value deferred_timeout_; }; #endif /* IMR_LIVECHECK_H_ */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp index 2eb72025297..fe4e3b5184a 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp @@ -753,8 +753,8 @@ operator () (TAO_DynSequence_i& dyn_any, int return_value = 0; try { - CORBA::String_var value = dyn_any.get_string (); - return_value = (ACE_OS::strcmp (value.in(), element) == 0); + const char* value = dyn_any.get_string (); + return_value = (ACE_OS::strcmp (value, element) == 0); } catch (const CORBA::Exception&){} return return_value; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp index d964707da75..be521123e22 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp @@ -224,8 +224,6 @@ lookup_offer (const char* type, CORBA::ULong id) template <class LOCK_TYPE> TAO_Offer_Id_Iterator* TAO_Offer_Database<LOCK_TYPE>::retrieve_all_offer_ids (void) { - ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->db_lock_, 0); - // Fill an TAO_Offer_Id_Iterator with the offer_ids of all offers // exported to the TAO_Offer_Database. Iterates through the entire // map, cramming offer_id strings into a newly constructed @@ -234,6 +232,7 @@ TAO_Offer_Database<LOCK_TYPE>::retrieve_all_offer_ids (void) ACE_NEW_RETURN (id_iterator, TAO_Offer_Id_Iterator (), 0); + ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->db_lock_, 0); for (typename Offer_Database::iterator type_iter (this->offer_db_); ! type_iter.done (); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp index 43fdd82e222..4de1e115937 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp @@ -2,6 +2,8 @@ #include "orbsvcs/Trader/Offer_Iterators.h" + + TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Offer_Iterator::TAO_Offer_Iterator (const TAO_Property_Filter& pfilter) @@ -232,24 +234,45 @@ CORBA::Boolean TAO_Offer_Id_Iterator::next_n (CORBA::ULong n, CosTrading::OfferIdSeq_out _ids) { - // Calculate the number of Ids to be returned. + // Calculate the number of Ids to be returned in this. CORBA::ULong items_left = static_cast<CORBA::ULong> (this->ids_.size()); int difference = items_left - n; CORBA::ULong returnable_items = (difference >= 0) ? n : items_left; CORBA::Boolean return_value = (CORBA::Boolean) (difference > 0); - // Allocate result sequence. - ACE_NEW_RETURN (_ids, - CosTrading::OfferIdSeq(returnable_items), - (items_left > 0)); - _ids->length(returnable_items); - - // Transfer OfferIds chunk. - for (CORBA::ULong i = 0; i < returnable_items; i++) + if (returnable_items == 0) + ACE_NEW_RETURN (_ids, + CosTrading::OfferIdSeq, + return_value); + else { - CosTrading::OfferId offer_id = 0; - this->ids_.dequeue_head (offer_id); - (*_ids)[i] = offer_id; + // Allocate space for the returned OfferIds. + CosTrading::OfferId* id_buf = + CosTrading::OfferIdSeq::allocbuf (returnable_items); + + if (id_buf != 0) + { + // Copy in those ids! + for (CORBA::ULong i = 0; i < returnable_items; i++) + { + CosTrading::OfferId offer_id = 0; + + this->ids_.dequeue_head (offer_id); + id_buf[i] = offer_id; + } + + // Place them into an OfferIdSeq. + ACE_NEW_RETURN (_ids, + CosTrading::OfferIdSeq (returnable_items, + returnable_items, + id_buf, + 1), + return_value); + } + else + ACE_NEW_RETURN (_ids, + CosTrading::OfferIdSeq, + return_value); } // Return true only if there are items left to be returned in diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp index 39868924521..73b26dc42d6 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp @@ -155,17 +155,15 @@ list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes { ACE_READ_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); - CORBA::ULong const length = static_cast<CORBA::ULong>(this->type_map_.current_size ()); - CORBA::ULong found = 0; - // Initial allocate a result seq for maximum expected results. - CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq_var types; - ACE_NEW_RETURN (types, - CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq(length), - 0); - types->length(this->type_map_.current_size ()); + CORBA::ULong i = 0; + CORBA::ULong length = static_cast<CORBA::ULong> (this->type_map_.current_size ()); + CosTrading::ServiceTypeName *types = + CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq::allocbuf (length); + + if (types == 0) + return 0; - bool const all = which_types._d () == CosTradingRepos::ServiceTypeRepository::all; - // FIXME: && (which_types.all_ () == true) ? + int all = which_types._d () == CosTradingRepos::ServiceTypeRepository::all; CosTradingRepos::ServiceTypeRepository::IncarnationNumber num = which_types.incarnation (); @@ -180,13 +178,21 @@ list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes if (all || num < type_info->type_struct_.incarnation) { - (*types)[found++] = CORBA::string_dup (type_name); + CORBA::string_free (types[i]); + types[i++] = CORBA::string_dup (type_name); } } - // Truncate to results we have found. - types->length(found); - return types._retn(); + CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq *tmp = 0; + + ACE_NEW_RETURN (tmp, + CosTradingRepos::ServiceTypeRepository:: + ServiceTypeNameSeq (length, + i, + types, + 1), + 0); + return tmp; } CosTradingRepos::ServiceTypeRepository::TypeStruct * diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h index aab21dbcb97..53f1082de0e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h @@ -34,73 +34,79 @@ class TAO_Trading_Serv_Export TAO_Trading_Loader : public TAO_Object_Loader { public: - /// Constructor + TAO_Trading_Loader (void); + // Constructor - /// Destructor ~TAO_Trading_Loader (void); + // Destructor - /// Called by the Service Configurator framework to initialize the - /// Event Service. Defined in <ace/Service_Config.h> virtual int init (int argc, ACE_TCHAR *argv[]); + // Called by the Service Configurator framework to initialize the + // Event Service. Defined in <ace/Service_Config.h> - /// Called by the Service Configurator framework to remove the - /// Event Service. Defined in <ace/Service_Config.h> virtual int fini (void); + // Called by the Service Configurator framework to remove the + // Event Service. Defined in <ace/Service_Config.h> - /// Run the Trading Service int run (void); + // Run the Trading Service - /// This function call initializes the Trading Service given a reference to the - /// ORB and the command line parameters. CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv[]); + // This function call initializes the Trading Service given a reference to the + // ORB and the command line parameters. protected: - /// Enable the Trading Service to answer multicast requests for its - /// IOR. int init_multicast_server (void); + // Enable the Trading Service to answer multicast requests for its + // IOR. - /// Bootstrap to another trader, and attach to its trader network. int bootstrap_to_federation (void); + // Bootstrap to another trader, and attach to its trader network. - /// Parses the command line arguments int parse_args (int &argc, ACE_TCHAR *argv []); + // Parses the command line arguments - /// The ORB manager. TAO_ORB_Manager orb_manager_; + // The ORB manager. - /// Pointer to the linked trader. auto_ptr<TAO_Trader_Factory::TAO_TRADER> trader_; + // Pointer to the linked trader. - /// Service Type Repository used by the trading service. TAO_Service_Type_Repository type_repos_; + // Service Type Repository used by the trading service. - /// IOR of the trader kept around for handiness purposes. CORBA::String_var ior_; + // IOR of the trader kept around for handiness purposes. - /// Flag indicating whether this trader should join the federation. CORBA::Boolean federate_; + // Flag indicating whether this trader should join the federation. - /// File to output the Naming Service IOR. FILE *ior_output_file_; + // File to output the Naming Service IOR. - /// Name of this trading service: "hostname:pid". CORBA::String_var name_; + // Name of this trading service: "hostname:pid". - /// Event handler that responds to resolve_initial_references - /// requests. TAO_IOR_Multicast ior_multicast_; + // Event handler that responds to resolve_initial_references + // requests. - /// Flag inidicating whether we're the trader others are bootstrapping to. CORBA::Boolean bootstrapper_; + // Flag inidicating whether we're the trader others are bootstrapping to. + + CORBA::Boolean dumpior_; + // Flag indication whether to dump the ior to standard output private: + // Disallow copying and assignment. TAO_Trading_Loader (const TAO_Trading_Loader &); TAO_Trading_Loader &operator= (const TAO_Trading_Loader &); + }; ACE_FACTORY_DECLARE (TAO_Trading_Serv, TAO_Trading_Loader) diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/README b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/README deleted file mode 100644 index 3bbc70e0d48..00000000000 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/README +++ /dev/null @@ -1,7 +0,0 @@ -$Id$ - -This test runs checks the behavior of the IMR when a server shuts down -while it is in the middle of handling a ping request from the ImR -Locator. This scenario could happen in an MT server, although to avoid -a race, an interceptor is used. The test succeeds if the ImR Locator -does not crash. diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp deleted file mode 100644 index e1325a2aa8b..00000000000 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp +++ /dev/null @@ -1,53 +0,0 @@ -// -*- C++ -*- -// -// $Id$ -// - -#include "Server_ORBInitializer.h" -#include "server_interceptor.h" - -Server_ORBInitializer::Server_ORBInitializer (int *counter) - : counter_ (counter), - intr_ (0) -{ -} - -void -Server_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr) -{ -} - -void -Server_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info) -{ - if (this->intr_ != 0) - { - return; - } - - PortableInterceptor::ServerRequestInterceptor_ptr interceptor = - PortableInterceptor::ServerRequestInterceptor::_nil (); - - // Install the Echo server request interceptor - ACE_NEW_THROW_EX (this->intr_, - Ping_Death_Request_Interceptor (this->counter_), - CORBA::NO_MEMORY ()); - - PortableInterceptor::ServerRequestInterceptor_var - server_interceptor = interceptor; - - info->add_server_request_interceptor (this->intr_); //server_interceptor.in ()); -} - -void -Server_ORBInitializer::set_poa (PortableServer::POA_ptr poa) -{ - if (this->intr_ == 0) - { - return; - } - - this->intr_->set_poa (poa); -} diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.h b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.h deleted file mode 100644 index c1d0a17a924..00000000000 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.h +++ /dev/null @@ -1,51 +0,0 @@ -// -*- C++ -*- -// -// $Id$ -// - -#ifndef TAO_SERVER_ORB_INITIALIZER_H -#define TAO_SERVER_ORB_INITIALIZER_H -#include /**/ "ace/pre.h" - -#include "tao/PI/PI.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" -#include "server_interceptor.h" - -// This is to remove "inherits via dominance" warnings from MSVC. -// MSVC is being a little too paranoid. -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -/// Server ORB initializer. -class Server_ORBInitializer : - public virtual PortableInterceptor::ORBInitializer, - public virtual ::CORBA::LocalObject -{ -public: - /// Constructor - Server_ORBInitializer (int *counter); - - void set_poa (PortableServer::POA_ptr poa); - - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); - -private: - int *counter_; - Ping_Death_Request_Interceptor *intr_; -}; - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#include /**/ "ace/post.h" -#endif /* TAO_SERVER_ORB_INITIALIZER_H */ diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test.idl b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test.idl deleted file mode 100644 index c05ecbf1d64..00000000000 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test.idl +++ /dev/null @@ -1,10 +0,0 @@ -// $Id$ - -interface Test -{ - - // Return the number of the server after a delay - short get_server_num (in short delay_secs); - -}; - diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test_i.cpp deleted file mode 100644 index 0582552fdce..00000000000 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test_i.cpp +++ /dev/null @@ -1,21 +0,0 @@ -/* -*- C++ -*- $Id$ */ - -#include "Test_i.h" -#include "ace/OS_NS_unistd.h" - -Test_i::Test_i (CORBA::Short server_num) - : server_num_ (server_num) -{ -} - -Test_i::~Test_i () -{ -} - -CORBA::Short -Test_i::get_server_num (const CORBA::Short delay_secs) -{ - ACE_OS::sleep (delay_secs); - return this->server_num_; -} - diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test_i.h deleted file mode 100644 index 9693977cc8c..00000000000 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test_i.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -*- C++ -*- $Id$ */ - -#ifndef TEST_I_H_ -#define TEST_I_H_ - -#include "TestS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class Test_i : public virtual POA_Test -{ -public: - Test_i (short server_num); - virtual ~Test_i (); - - virtual CORBA::Short get_server_num (CORBA::Short delay_secs); - -private: - CORBA::Short server_num_; -}; - -#endif /* TEST_I_H_ */ diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/ping_interrupt.mpc b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/ping_interrupt.mpc deleted file mode 100644 index 158a6f6408e..00000000000 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/ping_interrupt.mpc +++ /dev/null @@ -1,25 +0,0 @@ -// $Id$ - -project(*idl): taoidldefaults { - IDL_Files { - Test.idl - } - - custom_only = 1 -} - -project(*server): portableserver, orbsvcsexe, avoids_minimum_corba, iortable, imr_client, avoids_corba_e_micro, threads, pi_server, interceptors { - after += *idl - exename = server - IDL_Files { - } - Source_Files { - Test_i.cpp - Server_ORBInitializer.cpp - server_interceptor.cpp - server.cpp - TestC.cpp - TestS.cpp - } -} - diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl deleted file mode 100755 index fdb71282609..00000000000 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl +++ /dev/null @@ -1,231 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -############################################################################### -use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::TestTarget; - -$status = 0; -$imr_debug = ""; - -if ($#ARGV >= 0) { - for (my $i = 0; $i <= $#ARGV; $i++) { - if ($ARGV[$i] eq '-debug') { - $imr_debug = "-d 5 -ORBDebugLevel 10 -ORBVerboseLogging 1 -ORBLogFile imr_loc.log"; - $i++; - } - else { - usage(); - exit 1; - } - } -} - -#$ENV{ACE_TEST_VERBOSE} = "1"; - -my $tgt_num = 0; -my $imr = PerlACE::TestTarget::create_target (++$tgt_num) || die "Create target $tgt_num failed\n"; -my $act = PerlACE::TestTarget::create_target (++$tgt_num) || die "Create target $tgt_num failed\n"; -my $ti = PerlACE::TestTarget::create_target (++$tgt_num) || die "Create target $tgt_num failed\n"; -my $srv = PerlACE::TestTarget::create_target (++$tgt_num) || die "Create target $tgt_num failed\n"; - -my $refstyle = " -ORBobjrefstyle URL"; -my $obj_count = 1; -my $port = 9876; - -my $objprefix = "TestObject_0"; -my $client_wait_time = 10; - -$imriorfile = "imr_locator.ior"; -$actiorfile = "imr_activator.ior"; -$persistxml = "persist.xml"; -$persistdat = "persist.dat"; - -my $imr_imriorfile = $imr->LocalFile ($imriorfile); -my $act_imriorfile = $act->LocalFile ($imriorfile); -my $ti_imriorfile = $ti->LocalFile ($imriorfile); -my $act_actiorfile = $act->LocalFile ($actiorfile); -my $imr_persistxml = $imr->LocalFile ($persistxml); -my $imr_persistdat = $imr->LocalFile ($persistdat); - -$IMR = $imr->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator"); -$ACT = $act->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_activator"); -$TI = $ti->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_imr"); - -# Make sure the files are gone, so we can wait on them. -$imr->DeleteFile ($imriorfile); -$act->DeleteFile ($imriorfile); -$ti->DeleteFile ($imriorfile); -$act->DeleteFile ($actiorfile); -$imr->DeleteFile ($persistxml); -$imr->DeleteFile ($persistdat); - -my $stdout_file = "test.out"; -my $stderr_file = "test.err"; -my $ti_stdout_file = $ti->LocalFile ($stdout_file); -my $ti_stderr_file = $ti->LocalFile ($stderr_file); - -# Clean up after exit call -END -{ - $imr->DeleteFile ($imriorfile); - $act->DeleteFile ($imriorfile); - $ti->DeleteFile ($imriorfile); - $act->DeleteFile ($actiorfile); - $imr->DeleteFile ($persistxml); - $imr->DeleteFile ($persistdat); - - $ti->DeleteFile ($stdout_file); - $ti->DeleteFile ($stderr_file); - - # Remove any stray server status files caused by aborting services - unlink <*.status>; -} - -sub redirect_output() -{ - open(OLDOUT, ">&", \*STDOUT) or die "Can't dup STDOUT: $!"; - open(OLDERR, ">&", \*STDERR) or die "Can't dup STDERR: $!"; - open STDERR, '>', $ti_stderr_file; - open STDOUT, '>', $ti_stdout_file; -} - -sub restore_output() -{ - open(STDERR, ">&OLDERR") or die "Can't dup OLDERR: $!"; - open(STDOUT, ">&OLDOUT") or die "Can't dup OLDOUT: $!"; -} - -sub server_setup () -{ - print "initializing activator\n"; - - $ACT->Arguments ("-d 0 -l -o $act_actiorfile -ORBInitRef ImplRepoService=file://$act_imriorfile"); - - $ACT_status = $ACT->Spawn (); - if ($ACT_status != 0) { - print STDERR "ERROR: ImR Activator returned $ACT_status\n"; - return 1; - } - if ($act->WaitForFileTimed ($actiorfile,$act->ProcessStartWaitInterval()) == -1) { - print STDERR "ERROR: cannot find file <$act_imriorfile>\n"; - $ACT->Kill (); $ACT->TimedWait (1); - $IMR->Kill (); $IMR->TimedWait (1); - return 1; - } - - my $SRV = $srv->CreateProcess ("server"); - my $server_cmd = $SRV->Executable(); - my $srv_server_cmd = $imr->LocalFile ($server_cmd); - - ##### Add servers to activator ##### - print "adding server\n"; - my $status_file_name = $objprefix . ".status"; - - $act->DeleteFile ($status_file_name); - $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ". - "add $objprefix -c \"$srv_server_cmd -ORBUseIMR 1 ". - "-ORBInitRef ImplRepoService=file://$imr_imriorfile\""); - - $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval()); - if ($TI_status != 0) { - print STDERR "ERROR: tao_imr returned $TI_status\n"; - $ACT->Kill (); $ACT->TimedWait (1); - $IMR->Kill (); $IMR->TimedWait (1); - return 1; - } - - - $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ". - "start $objprefix"); - - $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval()); - if ($TI_status != 0 && $TI_status != 4) { - print STDERR "ERROR: tao_imr returned $TI_status\n"; - $ACT->Kill (); $ACT->TimedWait (1); - $IMR->Kill (); $IMR->TimedWait (1); - return 1; - } - $TI_status = 0; -} - - -sub interrupt_ping_test -{ - print "Running interrupt ping test.\n"; - - my $result = 0; - my $start_time = time(); - - $IMR->Arguments ("-i $imr_debug -o $imr_imriorfile -orbendpoint iiop://:$port"); - - ##### Start ImplRepo ##### - $IMR_status = $IMR->Spawn (); - if ($IMR_status != 0) { - print STDERR "ERROR: ImplRepo Service returned $IMR_status\n"; - return 1; - } - if ($imr->WaitForFileTimed ($imriorfile, $imr->ProcessStartWaitInterval()) == -1) { - print STDERR "ERROR: cannot find file <$imr_imriorfile>\n"; - $IMR->Kill (); $IMR->TimedWait (1); - return 1; - } - if ($imr->GetFile ($imriorfile) == -1) { - print STDERR "ERROR: cannot retrieve file <$imr_imriorfile>\n"; - $IMR->Kill (); $IMR->TimedWait (1); - return 1; - } - if ($act->PutFile ($imriorfile) == -1) { - print STDERR "ERROR: cannot set file <$act_imriorfile>\n"; - $IMR->Kill (); $IMR->TimedWait (1); - return 1; - } - if ($ti->PutFile ($imriorfile) == -1) { - print STDERR "ERROR: cannot set file <$ti_imriorfile>\n"; - $IMR->Kill (); $IMR->TimedWait (1); - return 1; - } - if ($srv->PutFile ($imriorfile) == -1) { - print STDERR "ERROR: cannot set file <$srv_imriorfile>\n"; - $IMR->Kill (); $IMR->TimedWait (1); - return 1; - } - - server_setup(); - - sleep (2); - - my $ACT_status = $ACT->TerminateWaitKill ($act->ProcessStopWaitInterval()); - if ($ACT_status != 0) { - print STDERR "ERROR: IMR Activator returned $ACT_status\n"; - $status = 1; - } - - my $IMR_status = $IMR->TerminateWaitKill ($imr->ProcessStopWaitInterval()); - if ($IMR_status != 0) { - print STDERR "ERROR: IMR returned $IMR_status\n"; - $status = 1; - } - - my $test_time = time() - $start_time; - - print "\nFinished. The test took $test_time seconds.\n"; - - return $status; -} - -sub usage() { - print "Usage: run_test.pl ". - "[-debug]\n"; -} - -############################################################################### -############################################################################### - -my $ret = interrupt_ping_test(); - -exit $ret; diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp deleted file mode 100644 index ab5da467c1c..00000000000 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp +++ /dev/null @@ -1,157 +0,0 @@ -// $Id$ - -// server.cpp -// This version uses the Implementation Repository. - -#include "Test_i.h" -#include "Server_ORBInitializer.h" - -#include "tao/IORTable/IORTable.h" -#include "tao/PortableServer/Root_POA.h" -#include "tao/ImR_Client/ImR_Client.h" -#include "tao/ORBInitializer_Registry.h" - -#include "ace/streams.h" -#include "ace/OS_NS_strings.h" -#include "ace/OS_NS_unistd.h" - -namespace -{ - ACE_CString toStr(int n) - { - char buf[20]; - return ACE_OS::itoa(n, buf, 10); - } -} - -PortableServer::POA_ptr -createPOA (PortableServer::POA_ptr root_poa, - bool share_mgr, - const char* poa_name) -{ - PortableServer::LifespanPolicy_var life = - root_poa->create_lifespan_policy(PortableServer::PERSISTENT); - - PortableServer::IdAssignmentPolicy_var assign = - root_poa->create_id_assignment_policy(PortableServer::USER_ID); - - CORBA::PolicyList pols; - pols.length(2); - pols[0] = PortableServer::LifespanPolicy::_duplicate(life.in()); - pols[1] = PortableServer::IdAssignmentPolicy::_duplicate(assign.in()); - - PortableServer::POAManager_var mgr = PortableServer::POAManager::_nil(); - if (share_mgr) - { - mgr = root_poa->the_POAManager(); - } - PortableServer::POA_var poa = - root_poa->create_POA(poa_name, mgr.in(), pols); - - life->destroy(); - assign->destroy(); - - return poa._retn(); -} - -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - try - { - int server_num = 0; - int die_on_ping = 1; - int ping_count = 0; - - for (int i = 1; i < argc; i++) - { - ACE_TCHAR *c = argv[i]; - if (ACE_OS::strcasecmp (ACE_TEXT ("-n"), c) == 0) - { - server_num = ACE_OS::atoi (argv[++i]); - } - else if (ACE_OS::strcasecmp (ACE_TEXT ("-?"),c) == 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("usage: %C ") - ACE_TEXT ("-n Number of the server\n"), - argv[0])); - return 1; - } - } - - Server_ORBInitializer * temp_initializer; - - ACE_NEW_RETURN (temp_initializer, - Server_ORBInitializer (&ping_count), - -1); // No exceptions yet! - PortableInterceptor::ORBInitializer_var initializer = - temp_initializer; - - PortableInterceptor::register_orb_initializer (initializer.in ()); - - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); - - CORBA::Object_var obj = orb->resolve_initial_references("RootPOA"); - PortableServer::POA_var root_poa = PortableServer::POA::_narrow(obj.in()); - - PortableServer::POAManager_var mgr = root_poa->the_POAManager(); - - ACE_CString poa_name_base = ACE_CString("TestObject_") + toStr (server_num); - PortableServer::POA_var test_poa; - test_poa = createPOA(root_poa.in (), true, poa_name_base.c_str ()); - temp_initializer->set_poa (test_poa.in()); - - mgr->activate(); - - PortableServer::Servant_var<Test_i> test_servant = - new Test_i(server_num); - - PortableServer::ObjectId_var object_id = - PortableServer::string_to_ObjectId("test_object"); - - // - // Activate the servant with the test POA, - // obtain its object reference, and get a - // stringified IOR. - // - test_poa->activate_object_with_id(object_id.in(), test_servant.in()); - - // - // Create binding between "TestService" and - // the test object reference in the IOR Table. - // Use a TAO extension to get the non imrified poa - // to avoid forwarding requests back to the ImR. - - TAO_Root_POA* tpoa = dynamic_cast<TAO_Root_POA*>(test_poa.in()); - obj = tpoa->id_to_reference_i(object_id.in(), false); - CORBA::String_var test_ior = orb->object_to_string(obj.in()); - obj = orb->resolve_initial_references("IORTable"); - IORTable::Table_var table = IORTable::Table::_narrow(obj.in()); - table->bind(poa_name_base.c_str (), test_ior.in()); - - ACE_DEBUG ((LM_DEBUG, "Started Server %s \n", - poa_name_base.c_str())); - - { - ACE_CString status_file = poa_name_base + ACE_CString(".status"); - ofstream out(status_file.c_str ()); - out << "started" << endl; - } - - while (ping_count < die_on_ping) - { - orb->perform_work (); - } - - root_poa->destroy(1,1); - orb->destroy(); - - } - catch(const CORBA::Exception& ex) { - ex._tao_print_exception ("Server main()"); - return 1; - } - - return 0; -} diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp deleted file mode 100644 index 7ea73ac5f3e..00000000000 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp +++ /dev/null @@ -1,98 +0,0 @@ -// $Id$ - -#include "server_interceptor.h" -#include "tao/OctetSeqC.h" - -#include "ace/Log_Msg.h" -#include "ace/OS_NS_string.h" - -Ping_Death_Request_Interceptor::Ping_Death_Request_Interceptor (int *counter) - : myname_ ("Ping_Death_Interceptor"), - counter_ (counter), - poa_ (PortableServer::POA::_nil()) -{ -} - -Ping_Death_Request_Interceptor::~Ping_Death_Request_Interceptor (void) -{ -} - -void -Ping_Death_Request_Interceptor::set_poa (PortableServer::POA_ptr poa) -{ - poa_ = PortableServer::POA::_duplicate (poa); -} - -char * -Ping_Death_Request_Interceptor::name (void) -{ - return CORBA::string_dup (this->myname_); -} - -void -Ping_Death_Request_Interceptor::destroy (void) -{ -} - -void -Ping_Death_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri) -{ - CORBA::String_var operation = ri->operation (); - - if (ACE_OS::strcmp (operation.in(), "ping") != 0) - { - return; - } - - if (this->counter_ != 0) - { - ++(*counter_); - } - if (CORBA::is_nil(this->poa_.in())) - { - return; - } - try - { - this->poa_->destroy (1,1); - } - catch (CORBA::Exception &ex) - { - ACE_DEBUG ((LM_DEBUG, "(%P) deactivate raised %s\n", - ex._name())); - } - throw ::CORBA::TRANSIENT - ( CORBA::SystemException::_tao_minor_code (TAO_POA_HOLDING, 1), - CORBA::COMPLETED_NO); - -} - - -void -Ping_Death_Request_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr) -{ - // Do nothing -} - -void -Ping_Death_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr) -{ - // Do Nothing -} - -void -Ping_Death_Request_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr) -{ - // Do Nothing -} - -void -Ping_Death_Request_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr) -{ - // Do Nothing -} diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h deleted file mode 100644 index 934b92a2264..00000000000 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h +++ /dev/null @@ -1,62 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -#ifndef TAO_SERVER_INTERCEPTOR_H -#define TAO_SERVER_INTERCEPTOR_H - -#include "tao/PI_Server/PI_Server.h" -#include "tao/PortableInterceptorC.h" -#include "tao/PortableServer/POAC.h" -#include "tao/LocalObject.h" -#include "tao/ORB.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -class Ping_Death_Request_Interceptor - : public virtual PortableInterceptor::ServerRequestInterceptor, - public virtual ::CORBA::LocalObject -{ - // = Server-side echo interceptor. For checking interceptor visually only. -public: - Ping_Death_Request_Interceptor (int *counter); - // cotr. - - ~Ping_Death_Request_Interceptor (); - // dotr. - void set_poa (PortableServer::POA_ptr poa); - - virtual char * name (void); - // Canonical name of the interceptor. - - virtual void destroy (void); - - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); - - virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr); - - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri); - - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri); - - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr); - -private: - const char *myname_; - int *counter_; - PortableServer::POA_var poa_; -}; - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#endif /* TAO_SERVER_INTERCEPTOR_H */ diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp index 273e74a2f94..670a64a50e2 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp @@ -4,6 +4,8 @@ #include "ace/INET_Addr.h" #include "ace/OS_NS_stdio.h" + + TAO_Offer_Exporter:: TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if, CORBA::Boolean verbose) @@ -32,7 +34,6 @@ TAO_Offer_Exporter::export_offers (void) { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Exporting offers.\n")); - // Set the PROPERTY_NAMES - TRADER_NAME. for (int i = 0; i < NUM_OFFERS; i++) { this->props_plotters_[i][4].value <<= "Default"; @@ -50,9 +51,10 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg) { for (int i = 0; i < NUM_OFFERS; i++) { - TAO_Trader_Test::Plotter_var pPlotter= this->plotter_[i]._this (); + CORBA::Object_ptr offer_obj= this->plotter_[i]._this (); + CosTrading::OfferId_var offer_id = - reg->_cxx_export (pPlotter.in(), + reg->_cxx_export (offer_obj, TT_Info::INTERFACE_NAMES[1], this->props_plotters_[i]); @@ -61,8 +63,9 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg) ACE_DEBUG ((LM_DEBUG, "Registered offer id: %C.\n", offer_id.in ())); } - TAO_Trader_Test::Printer_var pPrinter = this->printer_[i]._this (); - offer_id = reg->_cxx_export (pPrinter.in(), + offer_obj = this->printer_[i]._this (); + + offer_id = reg->_cxx_export (offer_obj, TT_Info::INTERFACE_NAMES[2], this->props_printers_[i]); @@ -71,8 +74,9 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg) ACE_DEBUG ((LM_DEBUG, "Registered offer id: %C.\n", offer_id.in ())); } - TAO_Trader_Test::File_System_var pFileSystem = this->fs_[i]._this (); - offer_id = reg->_cxx_export (pFileSystem.in(), + offer_obj = this->fs_[i]._this (); + + offer_id = reg->_cxx_export (offer_obj, TT_Info::INTERFACE_NAMES[3], this->props_fs_[i]); @@ -82,9 +86,10 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg) } } } - catch (const CORBA::Exception& e) + catch (const CORBA::Exception& ex) { - e._tao_print_exception ("TAO_Offer_Exporter::export_to"); + ex._tao_print_exception ( + "TAO_Offer_Exporter::export_offers"); throw; } } @@ -128,7 +133,6 @@ TAO_Offer_Exporter::export_offers_to_all (void) CosTrading::Link::LinkInfo_var link_info = link_if->describe_link (link_name_seq[i]); - // Set the PROPERTY_NAMES - TRADER_NAME. for (int j = 0; j < NUM_OFFERS; j++) { this->props_plotters_[j][4].value <<= link_name_seq[i]; @@ -144,10 +148,9 @@ TAO_Offer_Exporter::export_offers_to_all (void) this->export_to (link_info->target_reg.in ()); } - catch (const CORBA::Exception& e) + catch (const CORBA::Exception&) { - e._tao_print_exception ("TAO_Offer_Exporter::export_offers_to_all"); - throw; + // @@ IGNORE?? } } } @@ -173,9 +176,10 @@ TAO_Offer_Exporter::withdraw_offers (void) } } } - catch (const CORBA::Exception& e) + catch (const CORBA::Exception& ex) { - e._tao_print_exception ("TAO_Offer_Exporter::withdraw_offers"); + ex._tao_print_exception ( + "TAO_Offer_Exporter::withdraw_offers"); throw; } } @@ -212,9 +216,10 @@ TAO_Offer_Exporter::describe_offers (void) } } } - catch (const CORBA::Exception& e) + catch (const CORBA::Exception& ex) { - e._tao_print_exception ("TAO_Offer_Exporter::describe_offers"); + ex._tao_print_exception ( + "TAO_Offer_Exporter::describe_offers"); throw; } } @@ -250,9 +255,10 @@ TAO_Offer_Exporter::modify_offers (void) } } } - catch (const CORBA::Exception& e) + catch (const CORBA::Exception& ex) { - e._tao_print_exception ("TAO_Offer_Exporter::modify_offers"); + ex._tao_print_exception ( + "TAO_Offer_Exporter::modify_offers"); throw; } } @@ -283,9 +289,10 @@ withdraw_offers_using_constraints (void) withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::FILESYSTEM], constraint); } - catch (const CORBA::Exception& e) + catch (const CORBA::Exception& ex) { - e._tao_print_exception ("TAO_Offer_Exporter::withdraw_offers_using_constraints"); + ex._tao_print_exception ( + "TAO_Offer_Exporter::withdraw_using_constraint"); throw; } } @@ -296,38 +303,36 @@ TAO_Offer_Exporter::grab_offerids (void) if (this->verbose_) ACE_DEBUG ((LM_DEBUG, "TAO_Offer_Exporter::Grabbing all offer ids.\n")); - CosTrading::OfferIdSeq_var offer_id_seq_result; + CosTrading::OfferIdSeq *offer_id_seq; try { CORBA::ULong length = NUM_OFFERS; - CosTrading::OfferIdIterator_var offer_id_iter; + CosTrading::OfferIdIterator_ptr offer_id_iter; this->admin_->list_offers (NUM_OFFERS, - offer_id_seq_result.out(), - offer_id_iter.out()); + CosTrading::OfferIdSeq_out (offer_id_seq), + CosTrading::OfferIdIterator_out (offer_id_iter)); - // We might already have seq results but may have to process additional - // iterator result fragments. - if (!CORBA::is_nil (offer_id_iter.in())) + if ((! CORBA::is_nil (offer_id_iter)) && offer_id_seq != 0) { - CosTrading::OfferIdSeq_var offer_id_seq_remaining; CORBA::Boolean any_left = 0; + CosTrading::OfferIdSeq *id_seq; + CosTrading::OfferIdIterator_var offer_id_iter_var (offer_id_iter); + do { any_left = offer_id_iter->next_n (length, - offer_id_seq_remaining.out()); + CosTrading::OfferIdSeq_out (id_seq)); - // Grow our result sequence with the remaining fragments. - CORBA::ULong offers = offer_id_seq_remaining->length (); - CORBA::ULong old_length = offer_id_seq_result->length (); - offer_id_seq_result->length (old_length + offers); + int offers = id_seq->length (); + int old_length = offer_id_seq->length (); + offer_id_seq->length (old_length + offers); - for (CORBA::ULong i = 0; i < offers; i++) - { - offer_id_seq_result[i + old_length] = CORBA::string_dup (offer_id_seq_remaining[i].in ()); - } + for (int i = 0; i < offers; i++) + (*offer_id_seq)[i + old_length] = (*id_seq)[i]; + delete id_seq; } while (any_left); @@ -337,24 +342,23 @@ TAO_Offer_Exporter::grab_offerids (void) if (this->verbose_) { ACE_DEBUG ((LM_DEBUG, "The following offer ids are registered:\n")); - for (CORBA::ULong i=0; i<offer_id_seq_result->length(); i++) - ACE_DEBUG ((LM_DEBUG, "Offer Id: %C\n", offer_id_seq_result[i].in())); + for (int len = offer_id_seq->length (), j = 0; j < len; j++) + ACE_DEBUG ((LM_DEBUG, "Offer Id: %C\n", (const char *)(*offer_id_seq)[j])); } } - catch (const CORBA::Exception& e) + catch (const CORBA::Exception& ex) { - e._tao_print_exception ("TAO_Offer_Exporter::grab_offerids"); + ex._tao_print_exception ("TAO_Offer_Exporter::grab_offerids"); throw; } // @@ redundant. - return offer_id_seq_result._retn(); + return offer_id_seq; } void TAO_Offer_Exporter::create_offers (void) { - ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Creating offers.\n")); const int QUEUE_SIZE = 4; int counter = 0, i = 0; diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp index 51551c6760e..ac8b5a1014f 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp @@ -2,6 +2,8 @@ #include "Offer_Importer.h" + + TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if, CORBA::Boolean verbose) : verbose_ (verbose), @@ -20,6 +22,7 @@ TAO_Offer_Importer::perform_queries (void) policies.match_card (16*NUM_OFFERS); policies.return_card (16*NUM_OFFERS); policies.link_follow_rule (CosTrading::always); + this->perform_queries_with_policies (policies); } @@ -91,14 +94,14 @@ TAO_Offer_Importer::perform_directed_queries (void) } else { - ACE_ERROR ((LM_ERROR, ACE_TEXT("ERROR, This test requires a complete graph of three traders!\n"))); - throw CORBA::BAD_INV_ORDER(); // Let outside world know we can't continue this way. + ACE_DEBUG ((LM_DEBUG, "This test requires a complete" + " graph of three traders.\n")); } } else { - ACE_ERROR ((LM_ERROR, ACE_TEXT("ERROR, This test requires a complete graph of three traders!\n"))); - throw CORBA::BAD_INV_ORDER(); // Let outside world know we can't continue this way. + ACE_DEBUG ((LM_DEBUG, "This test requires a complete" + " graph of three traders.\n")); } } @@ -129,80 +132,60 @@ TAO_Offer_Importer::perform_queries_with_policies ( ACE_DEBUG ((LM_DEBUG, "*** Performing query for %C.\n", TT_Info::QUERIES[i][0])); ACE_DEBUG ((LM_DEBUG, "*** Query: %C\n", TT_Info::QUERIES[i][1])); ACE_DEBUG ((LM_DEBUG, "*** Preferences: %C\n", TT_Info::QUERIES[i][2])); - CosTrading::OfferSeq_var offer_seq; - CosTrading::OfferIterator_var offer_iterator; - CosTrading::PolicyNameSeq_var limits_applied; - - // Test with different how_many amount, both should work. - // Initially try to get this amount in the sequence. - CORBA::ULong how_many = 8; - if (i&0x0001) - { - how_many=0; // 0: Don't retrieve in offers but all in iterator. - }; + CosTrading::OfferSeq *offer_seq_ptr = 0; + CosTrading::OfferIterator_ptr offer_iterator_ptr = 0; + CosTrading::PolicyNameSeq *limits_applied_ptr = 0; + + CosTrading::OfferSeq_out offer_seq_out (offer_seq_ptr); + CosTrading::OfferIterator_out offer_iterator_out (offer_iterator_ptr); + CosTrading::PolicyNameSeq_out limits_applied_out (limits_applied_ptr); this->lookup_->query (TT_Info::QUERIES[i][0], TT_Info::QUERIES[i][1], TT_Info::QUERIES[i][2], policies.policy_seq (), desired_props, - how_many, - offer_seq.out(), - offer_iterator.out(), - limits_applied.out()); - - CORBA::ULong seqlen = (offer_seq.ptr() == 0 ? 0 : - offer_seq->length ()); - CORBA::ULong itrlen = (CORBA::is_nil(offer_iterator.in()) ? 0 : - offer_iterator->max_left ()); - CORBA::ULong total = seqlen + itrlen; + 8, + offer_seq_out, + offer_iterator_out, + limits_applied_out); + + CosTrading::OfferSeq_var offer_seq (offer_seq_ptr); + CosTrading::OfferIterator_var offer_iterator (offer_iterator_ptr); + CosTrading::PolicyNameSeq_var limits_applied (limits_applied_ptr); + + CORBA::ULong total = (offer_seq_ptr == 0 ? 0 : + offer_seq_ptr->length ()) + + (offer_iterator_ptr == 0 ? 0 : + offer_iterator_ptr->max_left ()); CORBA::ULong expected = ACE_OS::atoi (TT_Info::QUERIES[i][3]); - if (total != expected) - { - ACE_ERROR ((LM_ERROR - ,"ERROR: Expected %d for query %d, got seq(%d) + itr(%d) = %d\n" - ,expected - ,i - ,seqlen - ,itrlen - ,total - )); - throw CORBA::TRANSIENT(); // Try again later? - } - else if (this->verbose_) - { - ACE_DEBUG ((LM_DEBUG - ,"Expected %d for query %d, got seq(%d) + itr(%d) = %d\n" - ,expected - ,i - ,seqlen - ,itrlen - ,total - )); - }; + ACE_ERROR ((LM_ERROR, + "ERROR: Expected %d for query %d, but got %d\n", + expected, i, total)); if (this->verbose_) { ACE_DEBUG ((LM_DEBUG, "*** Results:\n\n")); - this->display_results (*offer_seq.ptr(), - offer_iterator.in()); + this->display_results (*offer_seq_ptr, + offer_iterator_ptr); - if (limits_applied->length () > 0) + if (limits_applied_out->length () > 0) ACE_DEBUG ((LM_DEBUG, "*** Limits Applied:\n\n")); - for (int length = limits_applied->length (), j = 0; j < length; j++) + for (int length = limits_applied_out->length (), j = 0; j < length; j++) { - const char *policy_name = (*limits_applied.ptr())[j]; + const char *policy_name = (*limits_applied_ptr)[j]; ACE_DEBUG ((LM_DEBUG, "%C\n", static_cast<const char*> (policy_name))); } } } } - catch (const CORBA::Exception& e) + catch (const CORBA::Exception& ex) { - e._tao_print_exception ("TAO_Offer_Importer::perform_queries_with_policies"); + ex._tao_print_exception ( + "TAO_Offer_Importer::perform_queries"); throw; } } @@ -213,14 +196,13 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, { try { + CORBA::ULong length = 0, i = 0; ACE_DEBUG ((LM_DEBUG, "------------------------------\n")); ACE_DEBUG ((LM_DEBUG, "Offers in the sequence:\n")); ACE_DEBUG ((LM_DEBUG, "------------------------------\n")); - for (CORBA::ULong i = 0; i < offer_seq.length (); i++) + for (length = offer_seq.length (), i = 0; i < length; i++) { // Call back to the exported object. - // FIXME: shouldn't this be done in a separate 'verify_results' method? - // (confirm () now skipped in quiet mode) TAO_Trader_Test::Remote_Output_var remote_output = TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ()); @@ -234,28 +216,27 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, ACE_DEBUG ((LM_DEBUG, "------------------------------\n")); if (! CORBA::is_nil (offer_iterator)) { + length = offer_seq.length (); CORBA::Boolean any_left = 0; + do { - CosTrading::OfferSeq_var offers; - // Use of iterator->max_left() to get all iterator results is not - // recommended? (see p.879 Advanced CORBA programming book) - // Howmany to process is a choice between next_n call 'dispatch - // costs' and 'larges results marshalling bandwidth costs'. - CORBA::ULong how_many = 100; - any_left = offer_iterator->next_n (how_many, offers.out()); - - for (CORBA::ULong i = 0; i < offers->length (); i++) + CosTrading::OfferSeq *iter_offers_ptr; + CosTrading::OfferSeq_out iter_offers_out (iter_offers_ptr); + + any_left = offer_iterator->next_n (length, + iter_offers_out); + + CosTrading::OfferSeq_var iter_offers (iter_offers_ptr); + for (length = iter_offers->length (), i = 0; i < length; i++) { // Call back to the exported object. - // FIXME: shouldn't this be done in a separate 'verify_results' method? - // (confirm () now skipped in quiet mode) TAO_Trader_Test::Remote_Output_var remote_output = - TAO_Trader_Test::Remote_Output::_narrow ((*offers)[i].reference.in ()); + TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ()); remote_output->confirm (); - CosTrading::PropertySeq& props = (*offers)[i].properties; + CosTrading::PropertySeq& props = iter_offers[i].properties; TT_Info::dump_properties (props, 1); ACE_DEBUG ((LM_DEBUG, "------------------------------\n")); @@ -266,9 +247,10 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, offer_iterator->destroy (); } } - catch (const CORBA::Exception& e) + catch (const CORBA::Exception& ex) { - e._tao_print_exception ("TAO_Offer_Importer::display_results"); + ex._tao_print_exception ( + "TAO_Offer_Importer::display_results"); throw; } } diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp index 86272281d1b..3de513e69a9 100644 --- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp @@ -2,6 +2,8 @@ #include "Service_Type_Exporter.h" + + TAO_Service_Type_Exporter:: TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if, CORBA::Boolean verbose) @@ -18,17 +20,6 @@ TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if, this->create_types (); } -TAO_Service_Type_Exporter::~TAO_Service_Type_Exporter (void) -{ - try - { - this->remove_all_types (); - } - catch (const CORBA::Exception&) - { - }; -} - void TAO_Service_Type_Exporter::remove_all_types (void) { @@ -48,12 +39,12 @@ TAO_Service_Type_Exporter::remove_all_types (void) if (excp.type.in () != 0) ACE_DEBUG ((LM_DEBUG, "Service type not yet registered: %C\n", excp.type.in ())); } - // Don't re-throw, this one is expected in the test. + } - catch (const CORBA::Exception& e) + catch (const CORBA::Exception& ex) { - e._tao_print_exception ("TAO_Service_Type_Exporter::remove_all_types"); - throw; + ex._tao_print_exception ( + "TAO_Service_Type_Exporter::remove_all_types"); } } } @@ -102,12 +93,12 @@ TAO_Service_Type_Exporter::add_all_types_to_all (void) CosTradingRepos::ServiceTypeRepository::_narrow (remote_repos.in ()); } - catch (const CORBA::Exception& e) + catch (const CORBA::Exception&) { - e._tao_print_exception ("TAO_Service_Type_Exporter::add_all_types_to_all"); - throw; + // @@ Seth, Ignore all these exceptions? } + // @@ Seth, But this one? this->add_all_types_to (str); } } @@ -129,37 +120,34 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos) const CosTradingRepos::ServiceTypeRepository::ServiceTypeExists& ste) { ste._tao_print_exception ( - "TAO_Service_Type_Exporter::add_all_types_to"); + "TAO_Service_Type_Exporter::add_all_types"); if (ste.name.in () != 0) ACE_DEBUG ((LM_DEBUG, "Invalid name: %C\n", ste.name.in ())); - throw; } catch (const CosTrading::IllegalPropertyName& excp) { excp._tao_print_exception ( - "TAO_Service_Type_Exporter::add_all_types_to"); + "TAO_Service_Type_Exporter::add_all_types"); if (excp.name.in () != 0) ACE_DEBUG ((LM_DEBUG, "Invalid name: %C\n", excp.name.in ())); - throw; } catch ( const CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition& vtr) { vtr._tao_print_exception ( - "TAO_Service_Type_Exporter::add_all_types_to"); + "TAO_Service_Type_Exporter::add_all_types"); if (vtr.type_1.in () != 0) ACE_DEBUG ((LM_DEBUG, "Type One: %C\n", vtr.type_2.in ())); if (vtr.type_2.in () != 0) ACE_DEBUG ((LM_DEBUG, "Type Two: %C\n", vtr.type_2.in ())); - throw; } - catch (const CORBA::Exception& e) + catch (const CORBA::Exception& ex) { - e._tao_print_exception ( - "TAO_Service_Type_Exporter::add_all_types_to"); + ex._tao_print_exception ( + "TAO_Service_Type_Exporter::add_all_types"); throw; } } @@ -178,28 +166,20 @@ TAO_Service_Type_Exporter::list_all_types (void) CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq_var type_names = this->repos_->list_types (sst); - if (type_names.ptr()!=0) - { - CORBA::ULong l = type_names->length (); - for (CORBA::ULong i = 0; i != l; ++i) - { - CORBA::ULong index = l - 1 - i; - if (this->verbose_) - { - ACE_DEBUG ((LM_DEBUG, "type name: %C\n", - static_cast<const char *> (type_names[index]))); - } - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT("ERROR, TAO_Service_Type_Exporter::list_all_types got list nil ptr!\n"))); - throw CORBA::TRANSIENT(); // Try again later? - }; + CORBA::ULong l = type_names->length (); + for (CORBA::ULong i = 0; i != l; ++i) + { + CORBA::ULong index = l - 1 - i; + if (this->verbose_) + { + ACE_DEBUG ((LM_DEBUG, "type name: %C\n", + static_cast<const char *> (type_names[index]))); + } + } } - catch (const CORBA::Exception& e) + catch (const CORBA::Exception& ex) { - e._tao_print_exception ("TAO_Service_Type_Exporter::list_all_types"); + ex._tao_print_exception ("TAO_Service_Type_Exporter::list_all_types"); throw; } } @@ -224,9 +204,10 @@ TAO_Service_Type_Exporter::describe_all_types (void) } } } - catch (const CORBA::Exception& e) + catch (const CORBA::Exception& ex) { - e._tao_print_exception ("TAO_Service_Type_Exporter::describe_all_types"); + ex._tao_print_exception ( + "TAO_Service_Type_Exporter::describe_all_types"); throw; } } @@ -251,9 +232,10 @@ TAO_Service_Type_Exporter::fully_describe_all_types (void) } } } - catch (const CORBA::Exception& e) + catch (const CORBA::Exception& ex) { - e._tao_print_exception ("TAO_Service_Type_Exporter::fully_describe_all_types"); + ex._tao_print_exception ( + "TAO_Service_Type_Exporter::fully_describe_all_types"); throw; } } @@ -301,7 +283,7 @@ TAO_Service_Type_Exporter::create_types (void) this->type_structs_[TT_Info::REMOTE_IO].props[0].mode = CosTradingRepos::ServiceTypeRepository::PROP_MANDATORY_READONLY; this->type_structs_[TT_Info::REMOTE_IO].props[1].name = - TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::LOCATION] ; + TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::LOCATION]; this->type_structs_[TT_Info::REMOTE_IO].props[1].value_type = CORBA::TypeCode::_duplicate (CORBA::_tc_string); this->type_structs_[TT_Info::REMOTE_IO].props[1].mode = @@ -330,6 +312,7 @@ TAO_Service_Type_Exporter::create_types (void) CORBA::TypeCode::_duplicate (CORBA::_tc_string); this->type_structs_[TT_Info::REMOTE_IO].props[5].mode = CosTradingRepos::ServiceTypeRepository::PROP_NORMAL; + this->type_structs_[TT_Info::REMOTE_IO].if_name = ro._interface_repository_id (); diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h index bda68c212e6..0553c65b621 100644 --- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h +++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h @@ -26,8 +26,6 @@ public: TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if, CORBA::Boolean verbose); - ~TAO_Service_Type_Exporter (void); - void remove_all_types (void); // Remove all service types from the trading service instance. diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp index f4cf39d1ccf..56617c9fdab 100644 --- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp +++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp @@ -247,7 +247,7 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq, } else if ((*value) >>= float_val) { - ACE_DEBUG ((LM_DEBUG, "%f\n", float_val)); + ACE_DEBUG ((LM_DEBUG, "%f\n", long_val)); } else if ((*value) >>= double_val) { diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp index ecd6c299330..884e1caff30 100644 --- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp +++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp @@ -9,131 +9,98 @@ #include "orbsvcs/Trader/Trader.h" #include "orbsvcs/Trader/Service_Type_Repository.h" -int +void parse_args (int argc, ACE_TCHAR *argv[], CORBA::Boolean& verbose) { + int opt; + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("fq")); + verbose = 1; - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("qh")); - for (int opt; (opt = get_opts()) != -1;) - { - switch (opt) + while ((opt = get_opt ()) != EOF) { - case 'q': + if (opt == 'q') verbose = 0; - break; - - case 'h': - ACE_DEBUG ((LM_INFO, - "\nUsage: colocated_test <options>\n" - "Test both the trader's exporter and importer roles.\n" - "The options are:\n" - "-quiet or -q (optional) Run the tests in quiet mode, don't show the query and\n" - " list results.\n" - "-h (optional) Show this help.\n" - "\n" - "This test uses an embedded trading service.\n" - "If you want to test with an external trading server or test federated traders\n" - "then use the other tests:\n" - " - 'export_test' (needs running 'Trading_Service')\n" - " - 'import_test'\n" - "See also TAO/docs/releasenotes/trader.html.\n\n")); - return -1; } - } - return 0; } int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { -int failure = 0; - try { - // Command line argument interpretation. - CORBA::Boolean verbose = 0; - if (parse_args (argc, argv, verbose) != 0) - return 1; - - ACE_DEBUG ((LM_DEBUG, "*** Initialize ORB and POA manager.\n")); TAO_ORB_Manager orb_manager; orb_manager.init (argc, argv); - //------------------------------------------------------------------------- - ACE_DEBUG ((LM_DEBUG, "*** Setup an embedded TradingService.\n")); - // Create a Service Type Repository and a Trader Object so the test can - // run without an external trading service. - // Start of Trading service scope. - { - TAO_Service_Type_Repository type_repos; - auto_ptr<TAO_Trader_Factory::TAO_TRADER> trader (TAO_Trader_Factory::create_trader (argc, argv)); - TAO_Support_Attributes_i& sup_attr = trader->support_attributes (); - TAO_Trading_Components_i& trd_comp = trader->trading_components (); - - // Set the service type repository - sup_attr.type_repos (type_repos._this ()); + // Command line argument interpretation. + CORBA::Boolean verbose = 0; + ::parse_args (argc, argv, verbose); - CosTrading::Lookup_var lookup_if = CosTrading::Lookup::_duplicate( - trd_comp.lookup_if()); + // Initialize ORB. + CORBA::ORB_var orb = orb_manager.orb (); - // Run the POA manager. - orb_manager.activate_poa_manager(); + // Create a Service Type Repository and a Trader Object. + TAO_Service_Type_Repository type_repos; + auto_ptr<TAO_Trader_Factory::TAO_TRADER> trader (TAO_Trader_Factory::create_trader (argc, argv)); + TAO_Support_Attributes_i& sup_attr = trader->support_attributes (); + TAO_Trading_Components_i& trd_comp = trader->trading_components (); - // Run the Service Type Exporter tests. - ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n")); - TAO_Service_Type_Exporter type_exporter(lookup_if.in(), verbose); + // Set the service type repository + sup_attr.type_repos (type_repos._this ()); - type_exporter.remove_all_types (); + // Run the Service Type Exporter tests + ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n")); + TAO_Service_Type_Exporter type_exporter + (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()), + verbose); - type_exporter.add_all_types (); + type_exporter.remove_all_types (); - type_exporter.list_all_types (); + type_exporter.add_all_types (); - type_exporter.describe_all_types (); + type_exporter.list_all_types (); - type_exporter.fully_describe_all_types (); + type_exporter.describe_all_types (); - // Run the Offer Exporter tests. - ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n")); - TAO_Offer_Exporter offer_exporter(lookup_if.in(), verbose); + type_exporter.fully_describe_all_types (); - offer_exporter.withdraw_offers (); + // Run the Offer Exporter tests + ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n")); + TAO_Offer_Exporter offer_exporter + (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()), + verbose); - offer_exporter.export_offers (); + offer_exporter.withdraw_offers (); - offer_exporter.describe_offers (); + offer_exporter.export_offers (); - offer_exporter.modify_offers (); + offer_exporter.describe_offers (); - offer_exporter.describe_offers (); + offer_exporter.modify_offers (); - offer_exporter.withdraw_offers_using_constraints (); + offer_exporter.describe_offers (); - offer_exporter.describe_offers (); + offer_exporter.withdraw_offers_using_constraints (); - offer_exporter.withdraw_offers (); + offer_exporter.describe_offers (); - offer_exporter.export_offers (); + offer_exporter.withdraw_offers (); - offer_exporter.describe_offers (); + offer_exporter.export_offers (); - // Run the Offer Importer tests. - ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Importer tests.\n")); - TAO_Offer_Importer offer_importer(lookup_if.in(), verbose); + offer_exporter.describe_offers (); - offer_importer.perform_queries (); + // Run the Offer Importer tests + ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Importer tests.\n")); + TAO_Offer_Importer offer_importer + (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()), verbose); - }; // End of Trading service scope. - //----------------------------------------------------------------------- - ACE_DEBUG ((LM_DEBUG, "*** Shutting down.\n")); - orb_manager.fini(); + offer_importer.perform_queries (); } - catch (const CORBA::Exception& e) + catch (const CORBA::Exception&) { - e._tao_print_exception ("Trader colocated test ERROR!"); - failure = 1; + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "Trader Export Tests Failed"), -1); } - return failure; + return 0; } diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp index c2a4e1c6657..5ed77a2cbc3 100644 --- a/TAO/orbsvcs/tests/Trading/export_test.cpp +++ b/TAO/orbsvcs/tests/Trading/export_test.cpp @@ -12,35 +12,28 @@ const ACE_TCHAR *done_file = ACE_TEXT("export_test_ready"); int -parse_args_spec (int argc, ACE_TCHAR *argv[], int help) +parse_args_spec (int argc, ACE_TCHAR *argv[]) { - if (help!=0) - { - ACE_DEBUG ((LM_INFO, - "\nUsage: export_test <options>\n" - "Test the trader's exporter role, the options are:\n" - "-ORBInitRef <orb_options> E.g. '-ORBInitRef TradingService=iiop://localhost:8901/TradingService'\n" - "-quiet or -q (optional) Run the tests in quiet mode, don't show the query and list results.\n" - "-federate or -f (optional) Setup for federated trader tests.\n" - "-iorfile or -i (optional) Get TradingService reference through IOR instead of resolve.\n" - "-d <done_file> (optional) Filename for signalling that we are ready for serving dynamic properties (for import_test).\n" - "\n" - "This test needs an external TradingServer running, example:\n" - " Trading_Service -ORBEndpoint iiop://:8901 -TSdumpior trading.ior\n" - "See also TAO/docs/releasenotes/trader.html.\n\n")); - return -1; - } - else - { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("d:")); - for (int opt; (opt = get_opts()) != -1;) - { - if (opt == 'd') + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("d:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) { - done_file = get_opts.opt_arg (); - }; - }; - }; + case 'd': + done_file = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-d <done_file> " + "\n", + argv [0]), + -1); + + } return 0; } @@ -48,25 +41,21 @@ parse_args_spec (int argc, ACE_TCHAR *argv[], int help) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { -int failure = 0; - try { - int help=(argc<=1); - TAO_ORB_Manager orb_manager; orb_manager.init (argc, argv); - // Command line argument parser for use with comlex pearl tests. - if (parse_args_spec (argc, argv, help) != 0) - return 1; - - // Command line argument parser for the trading tests. + // Command line argument interpretation. TT_Parse_Args parse_args (argc, argv); + //Command line argument parser for + if (parse_args_spec (argc, argv) != 0) + return 1; + // Init the orb and bootstrap to the trading service. CORBA::ORB_var orb = orb_manager.orb (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("*** Bootstrap to the Lookup interface.\n"))); + ACE_DEBUG ((LM_ERROR, "*** Bootstrap to the Lookup interface.\n")); char* ior = parse_args.ior (); CORBA::Object_var trading_obj = (ior == 0) ? @@ -75,17 +64,18 @@ int failure = 0; if (CORBA::is_nil (trading_obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT("ERROR, Unable to bootstrap to the Trading Service!\n")), - 1); + " (%P|%t) Unable to bootstrap to the Trading Service.\n"), + -1); // Narrow the lookup interface. - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("*** Narrowing the lookup interface.\n"))); + ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n")); CosTrading::Lookup_var lookup_if = CosTrading::Lookup::_narrow (trading_obj.in ()); - // Run the Service Type Exporter tests. - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("*** Running the Service Type Exporter tests.\n"))); - TAO_Service_Type_Exporter type_exporter (lookup_if.in (), ! parse_args.quiet ()); + // Run the Service Type Exporter tests + ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n")); + TAO_Service_Type_Exporter type_exporter (lookup_if.in (), + ! parse_args.quiet ()); type_exporter.remove_all_types (); @@ -106,10 +96,10 @@ int failure = 0; type_exporter.fully_describe_all_types (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("*** Service Type Exporter tests complete.\n"))); + ACE_DEBUG ((LM_DEBUG, "*** Service Type Exporter tests complete.\n")); - // Run the Offer Exporter tests. - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("*** Running the Offer Exporter tests.\n"))); + // Run the Offer Exporter tests + ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n")); TAO_Offer_Exporter offer_exporter (lookup_if.in (), ! parse_args.quiet ()); // = Test series. @@ -139,11 +129,9 @@ int failure = 0; offer_exporter.describe_offers (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("*** Offer Exporter tests complete.\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("*** Now serving dynamic properties.\n"))); + ACE_DEBUG ((LM_DEBUG, "*** Offer Exporter tests complete.\n")); + ACE_DEBUG ((LM_DEBUG, "*** Now serving dynamic properties.\n")); - // Next file can flag other external apps that we now arrived at serving - // dynamic properties. size_t offset = 0; ACE_TCHAR file[1024]; ACE_OS::strcpy(file, argv[0]); @@ -159,16 +147,15 @@ int failure = 0; ACE_OS::fclose (ready_file); } else { - ACE_DEBUG ((LM_WARNING, ACE_TEXT("Unable to open %s for output.\n"), file)); + ACE_DEBUG ((LM_WARNING, "Unable to open %s for output.\n", file)); } orb_manager.run (); } - catch (const CORBA::Exception& e) + catch (const CORBA::Exception&) { - e._tao_print_exception ("Trader export test ERROR!"); - failure = 1; + ACE_ERROR_RETURN ((LM_ERROR, "Trader Export Tests Failed\n"), -1); } - return failure; + return 0; } diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp index 0392f4620a8..e1200d35c19 100644 --- a/TAO/orbsvcs/tests/Trading/import_test.cpp +++ b/TAO/orbsvcs/tests/Trading/import_test.cpp @@ -3,36 +3,22 @@ #include "tao/Utils/ORB_Manager.h" #include "Offer_Importer.h" + + int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { -int failure = 0; - try { - if (argc<=1) - { - ACE_DEBUG ((LM_INFO, - "\nUsage: import_test <options>\n" - "Test the trader's importer role, the options are:\n" - "-ORBInitRef <orb_options> E.g. '-ORBInitRef TradingService=file://trading.ior'\n" - "-quiet or -q (optional) Run the tests in quiet mode, don't show the query and list results.\n" - "-federate or -f (optional) Perform federated trader tests.\n" - "-iorfile or -i (optional) Get TradingService reference through IOR instead of resolve.\n" - "\n" - "This test needs the 'export_test' running so the trader has the right offers.\n" - "See also TAO/docs/releasenotes/trader.html.\n\n")); - return 1; - }; TAO_ORB_Manager orb_manager; orb_manager.init (argc, argv); - // Command line argument parser. + // Command line argument interpretation. TT_Parse_Args parse_args (argc, argv); // Initialize the ORB and bootstrap to the Lookup interface. CORBA::ORB_var orb = orb_manager.orb (); - ACE_DEBUG ((LM_DEBUG, "*** Bootstrap to the Lookup interface.\n")); + ACE_DEBUG ((LM_ERROR, "*** Bootstrap to the Lookup interface.\n")); char* ior = parse_args.ior (); CORBA::Object_var trading_obj = (ior == 0) ? orb->resolve_initial_references ("TradingService") : @@ -40,15 +26,15 @@ int failure = 0; if (CORBA::is_nil (trading_obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT("ERROR, Unable to bootstrap to the Trading Service!\n")), - 1); + " (%P|%t) Unable to initialize the Trading Service.\n"), + -1); // Narrow the lookup interface. ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n")); CosTrading::Lookup_var lookup_if = CosTrading::Lookup::_narrow (trading_obj.in ()); - // Run the Offer Importer tests. + // Run the Offer Importer tests ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Importer tests.\n")); TAO_Offer_Importer offer_importer (lookup_if.in (), ! parse_args.quiet ()); @@ -59,11 +45,10 @@ int failure = 0; offer_importer.perform_directed_queries (); } } - catch (const CORBA::Exception& e) + catch (const CORBA::Exception&) { - e._tao_print_exception ("Trader import test ERROR!"); - failure = 1; + ACE_ERROR_RETURN ((LM_ERROR, "Trader Import Tests Failed.\n"), -1); } - return failure; + return 0; } diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp index d413a5becac..1ae4f59307d 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp @@ -21,7 +21,6 @@ #endif /* ACE_VXWORKS && !__RTP__ */ #include "server.h" -#include "ace/OS_NS_string.h" #include "ace/Sched_Params.h" #include "tao/Strategies/advanced_resource.h" @@ -172,17 +171,17 @@ Server::write_iors (void) int Server::activate_high_servant (void) { - ACE_TCHAR orbendpoint[BUFSIZ]; + char orbendpoint[BUFSIZ]; - ACE_OS::strcpy (orbendpoint, ACE_TEXT ("-ORBEndpoint ")); - ACE_OS::strcat (orbendpoint, GLOBALS::instance ()->endpoint); + ACE_OS::sprintf (orbendpoint, + "-ORBEndpoint %s ", + ACE_TEXT_ALWAYS_CHAR (GLOBALS::instance ()->endpoint)); - ACE_TCHAR *high_second_argv[] = - { orbendpoint, - const_cast<ACE_TCHAR *> (ACE_TEXT ("-ORBSndSock 32768 ")), - const_cast<ACE_TCHAR *> (ACE_TEXT ("-ORBRcvSock 32768 ")), - 0 - }; + char *high_second_argv[] = + {orbendpoint, + const_cast<char *> ("-ORBSndSock 32768 "), + const_cast<char *> ("-ORBRcvSock 32768 "), + 0}; ACE_NEW_RETURN (this->high_argv_, ACE_ARGV (this->argv_, high_second_argv), -1); diff --git a/TAO/tao/Bounded_Basic_String_Sequence_T.h b/TAO/tao/Bounded_Basic_String_Sequence_T.h index 78e5267e7b5..4c09f1305f2 100644 --- a/TAO/tao/Bounded_Basic_String_Sequence_T.h +++ b/TAO/tao/Bounded_Basic_String_Sequence_T.h @@ -39,55 +39,55 @@ public: typedef details::generic_sequence<value_type, allocation_traits, element_traits> implementation_type; - // @copydoc TAO::details::generic_sequence::generic_sequence() + /// @copydoc TAO::details::generic_sequence::generic_sequence() inline bounded_basic_string_sequence(void) : impl_() {} - // @copydoc TAO::details::generic_sequence::generic_sequence() + /// @copydoc TAO::details::generic_sequence::generic_sequence() inline bounded_basic_string_sequence( CORBA::ULong length, value_type * data, CORBA::Boolean release) : impl_(MAX, length, data, release) {} - // @copydoc TAO::details::generic_sequence::maximum() + /// @copydoc TAO::details::generic_sequence::maximum() inline CORBA::ULong maximum() const { return impl_.maximum(); } - // @copydoc TAO::details::generic_sequence::release() + /// @copydoc TAO::details::generic_sequence::release() inline CORBA::Boolean release() const { return impl_.release(); } - // @copydoc TAO::details::generic_sequence::length() + /// @copydoc TAO::details::generic_sequence::length() inline CORBA::ULong length() const { return impl_.length(); } - // @copydoc TAO::details::generic_sequence::length() + /// @copydoc TAO::details::generic_sequence::length() inline void length(CORBA::ULong length) { implementation_type::range::check_length(length, MAX); impl_.length(length); } - // @copydoc TAO::details::generic_sequence::operator[] + /// @copydoc TAO::details::generic_sequence::operator[] inline const_element_type operator[](CORBA::ULong i) const { return const_element_type (impl_[i], release()); } - // @copydoc TAO::details::generic_sequence::operator[] + /// @copydoc TAO::details::generic_sequence::operator[] inline element_type operator[](CORBA::ULong i) { return element_type(impl_[i], release()); } - // @copydoc TAO::details::generic_sequence::get_buffer() + /// @copydoc TAO::details::generic_sequence::get_buffer() inline const_value_type const * get_buffer() const { return impl_.get_buffer(); } - // @copydoc TAO::details::generic_sequence::replace() + /// @copydoc TAO::details::generic_sequence::replace() inline void replace( CORBA::ULong length, value_type * data, CORBA::Boolean release = false) { impl_.replace(MAX, length, data, release); } - // @copydoc TAO::details::generic_sequence::get_buffer(CORBA::Boolean) + /// @copydoc TAO::details::generic_sequence::get_buffer(CORBA::Boolean) inline value_type * get_buffer(CORBA::Boolean orphan = false) { return impl_.get_buffer(orphan); } diff --git a/TAO/tao/Bounded_Object_Reference_Sequence_T.h b/TAO/tao/Bounded_Object_Reference_Sequence_T.h index d2a1225ea33..ee54fdcf7d1 100644 --- a/TAO/tao/Bounded_Object_Reference_Sequence_T.h +++ b/TAO/tao/Bounded_Object_Reference_Sequence_T.h @@ -52,48 +52,48 @@ public: {} /* Use default ctor, operator= and dtor */ - // @copydoc TAO::details::generic_sequence::maximum() + /// @copydoc TAO::details::generic_sequence::maximum() inline CORBA::ULong maximum() const { return impl_.maximum(); } - // @copydoc TAO::details::generic_sequence::release() + /// @copydoc TAO::details::generic_sequence::release() inline CORBA::Boolean release() const { return impl_.release(); } - // @copydoc TAO::details::generic_sequence::length() + /// @copydoc TAO::details::generic_sequence::length() inline CORBA::ULong length() const { return impl_.length(); } - // @copydoc TAO::details::generic_sequence::length() + /// @copydoc TAO::details::generic_sequence::length() inline void length(CORBA::ULong length) { implementation_type::range::check_length(length, MAX); impl_.length(length); } - // @copydoc TAO::details::generic_sequence::operator[] + /// @copydoc TAO::details::generic_sequence::operator[] inline const_element_type operator[](CORBA::ULong i) const { return const_element_type (impl_[i], release()); } - // @copydoc TAO::details::generic_sequence::operator[] + /// @copydoc TAO::details::generic_sequence::operator[] inline element_type operator[](CORBA::ULong i) { return element_type(impl_[i], release()); } - // @copydoc TAO::details::generic_sequence::get_buffer() + /// @copydoc TAO::details::generic_sequence::get_buffer() inline value_type const * get_buffer() const { return impl_.get_buffer(); } - // @copydoc TAO::details::generic_sequence::replace() + /// @copydoc TAO::details::generic_sequence::replace() inline void replace( CORBA::ULong length, value_type * data, CORBA::Boolean release = false) { impl_.replace(MAX, length, data, release); } - // @copydoc TAO::details::generic_sequence::get_buffer(CORBA::Boolean) + /// @copydoc TAO::details::generic_sequence::get_buffer(CORBA::Boolean) inline value_type * get_buffer(CORBA::Boolean orphan = false) { return impl_.get_buffer(orphan); } - // @copydoc TAO::details::generic_sequence::swap + /// @copydoc TAO::details::generic_sequence::swap inline void swap(bounded_object_reference_sequence & rhs) throw() { impl_.swap(rhs.impl_); } diff --git a/TAO/tao/Bounded_Value_Sequence_T.h b/TAO/tao/Bounded_Value_Sequence_T.h index 4771aa29d3d..ac74f053de5 100644 --- a/TAO/tao/Bounded_Value_Sequence_T.h +++ b/TAO/tao/Bounded_Value_Sequence_T.h @@ -46,47 +46,47 @@ public: {} /* Use default ctor, operator= and dtor */ - // @copydoc TAO::details::generic_sequence::maximum() + /// @copydoc TAO::details::generic_sequence::maximum() inline CORBA::ULong maximum() const { return impl_.maximum(); } - // @copydoc TAO::details::generic_sequence::release() + /// @copydoc TAO::details::generic_sequence::release() inline CORBA::Boolean release() const { return impl_.release(); } - // @copydoc TAO::details::generic_sequence::length() + /// @copydoc TAO::details::generic_sequence::length() inline CORBA::ULong length() const { return impl_.length(); } - // @copydoc TAO::details::generic_sequence::length() + /// @copydoc TAO::details::generic_sequence::length() inline void length(CORBA::ULong length) { implementation_type::range::check_length(length, MAX); impl_.length(length); } - // @copydoc TAO::details::generic_sequence::operator[] + /// @copydoc TAO::details::generic_sequence::operator[] inline value_type const & operator[](CORBA::ULong i) const { return impl_[i]; } - // @copydoc TAO::details::generic_sequence::operator[] + /// @copydoc TAO::details::generic_sequence::operator[] inline value_type & operator[](CORBA::ULong i) { return impl_[i]; } - // @copydoc TAO::details::generic_sequence::replace() + /// @copydoc TAO::details::generic_sequence::replace() inline void replace( CORBA::ULong length, value_type * data, CORBA::Boolean release = false) { impl_.replace(MAX, length, data, release); } - // @copydoc TAO::details::generic_sequence::get_buffer() + /// @copydoc TAO::details::generic_sequence::get_buffer() inline value_type const * get_buffer() const { return impl_.get_buffer(); } - // @copydoc TAO::details::generic_sequence::get_buffer(CORBA::Boolean) + /// @copydoc TAO::details::generic_sequence::get_buffer(CORBA::Boolean) inline value_type * get_buffer(CORBA::Boolean orphan = false) { return impl_.get_buffer(orphan); } - // @copydoc TAO::details::generic_sequence::swap() + /// @copydoc TAO::details::generic_sequence::swap() inline void swap(bounded_value_sequence & rhs) throw() { impl_.swap(rhs.impl_); } diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp index be553ed041b..be98bc1a382 100644 --- a/TAO/tao/IIOP_Endpoint.cpp +++ b/TAO/tao/IIOP_Endpoint.cpp @@ -295,7 +295,7 @@ TAO_IIOP_Endpoint::next_filtered_i (TAO_IIOP_Endpoint *root, { if (candidate == 0) return !want_ipv6 ? candidate : - root->next_filtered_i(0, ipv6_only, prefer_ipv6, false); + root->next_filtered_i(root, ipv6_only, prefer_ipv6, false); if (want_ipv6 == candidate->is_ipv6_decimal()) return candidate; diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h index d2de7d60921..40973757eba 100644 --- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h +++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h @@ -42,9 +42,9 @@ public: * Initialize the dynamic hash operation table with a database of * operation names. The hash table size may be different from the * size of the database. Hence we use the third argument to specify - * the size of the internal hash table. The @a alloc argument is + * the size of the internal hash table. The <alloc> argument is * used to determine where the memory comes from (usually from - * ACE_Static_Allocator_Base). + * <ACE_Static_Allocator_Base>). */ TAO_Dynamic_Hash_OpTable (const TAO_operation_db_entry *db, CORBA::ULong dbsize, diff --git a/TAO/tao/Unbounded_Basic_String_Sequence_T.h b/TAO/tao/Unbounded_Basic_String_Sequence_T.h index dd67e3c011f..ea1b4ecc114 100644 --- a/TAO/tao/Unbounded_Basic_String_Sequence_T.h +++ b/TAO/tao/Unbounded_Basic_String_Sequence_T.h @@ -41,7 +41,7 @@ public: typedef const_value_type const_subscript_type; - // @copydoc TAO::details::generic_sequence::generic_sequence() + /// @copydoc TAO::details::generic_sequence::generic_sequence() inline unbounded_basic_string_sequence() : impl_() {} @@ -60,35 +60,35 @@ public: /* Use default ctor, operator= and dtor */ - // @copydoc TAO::details::generic_sequence::maximum() + /// @copydoc TAO::details::generic_sequence::maximum() inline CORBA::ULong maximum() const { return impl_.maximum(); } - // @copydoc TAO::details::generic_sequence::release() + /// @copydoc TAO::details::generic_sequence::release() inline CORBA::Boolean release() const { return impl_.release(); } - // @copydoc TAO::details::generic_sequence::length() + /// @copydoc TAO::details::generic_sequence::length() inline CORBA::ULong length() const { return impl_.length(); } - // @copydoc TAO::details::generic_sequence::length() + /// @copydoc TAO::details::generic_sequence::length() inline void length(CORBA::ULong length) { impl_.length(length); } - // @copydoc TAO::details::generic_sequence::operator[] + /// @copydoc TAO::details::generic_sequence::operator[] inline const_element_type operator[](CORBA::ULong i) const { return const_element_type (impl_[i], release()); } - // @copydoc TAO::details::generic_sequence::operator[] + /// @copydoc TAO::details::generic_sequence::operator[] inline element_type operator[](CORBA::ULong i) { return element_type(impl_[i], release()); } - // @copydoc TAO::details::generic_sequence::get_buffer() + /// @copydoc TAO::details::generic_sequence::get_buffer() inline const_value_type const * get_buffer() const { return impl_.get_buffer(); } - // @copydoc TAO::details::generic_sequence::replace() + /// @copydoc TAO::details::generic_sequence::replace() inline void replace( CORBA::ULong maximum, CORBA::ULong length, @@ -96,11 +96,11 @@ public: CORBA::Boolean release = false) { impl_.replace(maximum, length, data, release); } - // @copydoc TAO::details::generic_sequence::get_buffer(CORBA::Boolean) + /// @copydoc TAO::details::generic_sequence::get_buffer(CORBA::Boolean) inline value_type * get_buffer(CORBA::Boolean orphan = false) { return impl_.get_buffer(orphan); } - // @copydoc TAO::details::generic_sequence::swap + /// @copydoc TAO::details::generic_sequence::swap inline void swap(unbounded_basic_string_sequence & rhs) throw() { impl_.swap(rhs.impl_); } diff --git a/TAO/tao/Unbounded_Object_Reference_Sequence_T.h b/TAO/tao/Unbounded_Object_Reference_Sequence_T.h index ad66f654c92..fb5e63a428f 100644 --- a/TAO/tao/Unbounded_Object_Reference_Sequence_T.h +++ b/TAO/tao/Unbounded_Object_Reference_Sequence_T.h @@ -54,36 +54,36 @@ public: : impl_(maximum, length, data, release) {} - // @copydoc TAO::details::generic_sequence::maximum() + /// @copydoc TAO::details::generic_sequence::maximum() inline CORBA::ULong maximum() const { return impl_.maximum(); } - // @copydoc TAO::details::generic_sequence::release() + /// @copydoc TAO::details::generic_sequence::release() inline CORBA::Boolean release() const { return impl_.release(); } - // @copydoc TAO::details::generic_sequence::length() + /// @copydoc TAO::details::generic_sequence::length() inline CORBA::ULong length() const { return impl_.length(); } - // @copydoc TAO::details::generic_sequence::length() + /// @copydoc TAO::details::generic_sequence::length() inline void length(CORBA::ULong length) { impl_.length(length); } - // @copydoc TAO::details::generic_sequence::operator[] + /// @copydoc TAO::details::generic_sequence::operator[] inline const_element_type operator[](CORBA::ULong i) const { return const_element_type (impl_[i], release()); } - // @copydoc TAO::details::generic_sequence::operator[] + /// @copydoc TAO::details::generic_sequence::operator[] inline element_type operator[](CORBA::ULong i) { return element_type(impl_[i], release()); } - // @copydoc TAO::details::generic_sequence::get_buffer() + /// @copydoc TAO::details::generic_sequence::get_buffer() inline value_type const * get_buffer() const { return impl_.get_buffer(); } - // @copydoc TAO::details::generic_sequence::replace() + /// @copydoc TAO::details::generic_sequence::replace() inline void replace( CORBA::ULong maximum, CORBA::ULong length, @@ -91,11 +91,11 @@ public: CORBA::Boolean release = false) { impl_.replace(maximum, length, data, release); } - // @copydoc TAO::details::generic_sequence::get_buffer(CORBA::Boolean) + /// @copydoc TAO::details::generic_sequence::get_buffer(CORBA::Boolean) inline value_type * get_buffer(CORBA::Boolean orphan = false) { return impl_.get_buffer(orphan); } - // @copydoc TAO::details::generic_sequence::swap() + /// @copydoc TAO::details::generic_sequence::swap() inline void swap(unbounded_object_reference_sequence & rhs) throw() { impl_.swap(rhs.impl_); } diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp index 8887b07b328..06ab83c9456 100644 --- a/TAO/tests/FL_Cube/server.cpp +++ b/TAO/tests/FL_Cube/server.cpp @@ -54,7 +54,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - char* targv[] = { ACE_TEXT_ALWAYS_CHAR (argv[0]) }; + char* targv[] = { argv[0] }; window.show (1, targv); sw.show (); diff --git a/TAO/tests/IPV6/run_test.pl b/TAO/tests/IPV6/run_test.pl index 0b39bf185b6..dd0d7f39083 100755 --- a/TAO/tests/IPV6/run_test.pl +++ b/TAO/tests/IPV6/run_test.pl @@ -53,16 +53,9 @@ $client_arg = "-k file://$client_iorfile "; url => 0, url_address => "", },{ - description => "Testing IPV4 server with client with '-ORBPreferIPV6Interfaces 1'.\n", - server => "$server_arg -ORBListenEndpoints iiop://127.0.0.1", - client => "$client_arg -ORBPreferIPV6Interfaces 1", - error => 0, - url => 0, - url_address => "", - },{ description => "Testing IPV4 server with client and URL-style IOR", - server => "$server_arg -ORBDebuglevel 10 -ORBListenEndpoints iiop://0.0.0.0 -ORBObjRefStyle url", - client => "$client_arg -ORBDebuglevel 10", + server => "$server_arg -ORBListenEndpoints iiop://0.0.0.0 -ORBObjRefStyle url", + client => "$client_arg", error => 0, url => 0, url_address => "", diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp index 55261dcb1a1..d4f549290d7 100644 --- a/TAO/tests/QtTests/client.cpp +++ b/TAO/tests/QtTests/client.cpp @@ -2,7 +2,6 @@ #include "testC.h" #include "ace/Get_Opt.h" -#include "ace/Argv_Type_Converter.h" #include "tao/QtResource/QtResource_Loader.h" #include "client.h" @@ -10,11 +9,10 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - - ACE_Argv_Type_Converter ct (argc, argv); - QApplication app (argc, ct.get_ASCII_argv ()); + QApplication app (argc, argv); TAO::QtResource_Loader qt_resources (&app); + try { CORBA::ORB_var orb = diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp index 63101f832b2..6552506e4b8 100644 --- a/TAO/tests/QtTests/server.cpp +++ b/TAO/tests/QtTests/server.cpp @@ -2,7 +2,6 @@ #include "test_i.h" #include "ace/Get_Opt.h" -#include "ace/Argv_Type_Converter.h" // who defines index macro? #ifdef index @@ -53,8 +52,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 1; // Qt specific stuff for running with TAO... - ACE_Argv_Type_Converter ct (argc, argv); - QApplication app (argc, ct.get_ASCII_argv()); + QApplication app (argc, argv); TAO::QtResource_Loader qt_resources (&app); try |