diff options
| author | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-04-24 05:12:06 +0000 |
|---|---|---|
| committer | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-04-24 05:12:06 +0000 |
| commit | 0756bceb855477f313f1eaca5d01f9e36bb3e36d (patch) | |
| tree | 4a0e8ef5428d6e4478da2a46b566c84df67ef376 | |
| parent | ad7f2d4ae4273710073d841fe5afccaf14e6718a (diff) | |
| download | ATCD-fix_bug132_iter04_fin.tar.gz | |
This commit was manufactured by cvs2svn to create tagfix_bug132_iter04_fin
'fix_bug132_iter04_fin'.
538 files changed, 29882 insertions, 46675 deletions
diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html index 55d30a87644..c2c7e695572 100644 --- a/ACE-INSTALL.html +++ b/ACE-INSTALL.html @@ -57,7 +57,7 @@ an enhancement, then use our <table width="100%" border=1> <tr valign=top> <td><b>Fully supported, i.e., continually tested and used daily</b></td> - <td>Solaris 2.5, 2.6, 7 and 8, Windows NT 4.0, Windows 2000 (MSVC++ 5.0, and 6.0), + <td>Solaris 2.5, 2.6, and 7, Windows NT 4.0, Windows 2000 (MSVC++ 5.0, and 6.0), Linux/Intel, Linux/Alpha, VxWorks, LynxOS, Digital UNIX 4.0 and 5.0, HP/UX 10.x and 11.x, AIX 4.x, IRIX 6.x, and UnixWare 7.1.0. </td> diff --git a/ChangeLog b/ChangeLog index 5a7cf713c8a..afb206866f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,441 +1,53 @@ -Mon Apr 23 17:18:35 2001 Steve Huston <shuston@riverace.com> - - * ace/ACE.cpp (ACE::handle_timed_complete): Set need_to_check for - any non-success result, or on a system where you can't tell (AIX). - Also, to check, use getsockopt to retrieve the status/error if - SOL_SOCKET and SO_ERROR are defined; else use the old recv method. - This gets you a real error code on a failed connect, if the platform - supports it. - - * tests/SOCK_Connector_Test.cpp: For an expected success, allow test - to pass if socket gets a reset but not if it says ENOTCONN. If there - are platforms that can't do SOL_SOCKET/SO_ERROR (above) then this - other code may need to be re-enabled. - -Mon Apr 23 13:36:27 2001 Steve Huston <shuston@riverace.com> - - * ace/ACE.cpp (ACE::handle_timed_complete): Winsock (ACE_WIN32) sets - the exception bit (not the read bit) for a failed async connect. - So on fail, don't bother to do the recv trick to see if the socket - really did fail. - - * ace/Connector.cpp (ACE_Connector::handle_output): - * ace/SOCK_Connector.cpp (complete): Apparantly, Win2000 has - fixed the problem where a connection succeeds but can't be used - for a time. So, the sleep workaround is restructured for ACE_WIN32 - to try the new socket first, and only do the sleep if it fails. - Don't try to do this check (e.g. building on Win2000) at compile - time, since we want to be able to build on NT and run on Win2000. +Sat Apr 14 10:51:39 2001 Carlos O'Ryan <coryan@uci.edu> - * ace/README: - * ace/config-win32-common.h: Removed the macro, - ACE_HAS_BROKEN_NONBLOCKING_CONNECTS. It was only used in the two - cases above, and is not needed any longer. - -Mon Apr 23 07:08:09 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/Based_Pointer_T.h: Updated the documentation to - explain how ACE_Based_Pointer<T> (NULL) behaves. Thanks to Tom - Moog <tmoog@polhode.com> for motivating this. - -Sun Apr 22 14:26:56 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.h: - Some warnings are automatically disabled, but the pragmas only - make sense for MSVC. - - * ace/streams.h: - Fixed problems for Sun/CC-4.2, the trick is to include - strstream.h on MINGW32 *and* unix-like platforms, while - strstrea.h is included for all other WinXX-based compilers. - -Sat Apr 21 19:02:27 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * netsvcs/clients/Naming/Dump_Restore/Makefile: - * netsvcs/clients/Naming/Client/Makefile: Removed duplicated ACE - library. I thought I removed them all. - -Sat Apr 21 15:31:27 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/ACE.cpp: - * ace/Basic_Types.h: - * ace/Configuration.cpp: - * ace/Handle_Gobbler.i: - * ace/Lib_Find.cpp: - * ace/Local_Name_Space_T.cpp: - * ace/Log_Msg.cpp: - * ace/Makefile: - * ace/Mem_Map.cpp: - * ace/Memory_Pool.cpp: - * ace/Message_Queue.i: - * ace/NT_Service.cpp: - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - * ace/OS_String.cpp: - * ace/Process.cpp: - * ace/Process_Manager.cpp: - * ace/Registry.cpp: - * ace/SOCK_Connector.i: - * ace/Sock_Connect.cpp: - * ace/TTY_IO.cpp: - * ace/WFMO_Reactor.cpp: - * ace/WFMO_Reactor.i: - * ace/WIN32_Asynch_IO.cpp: - * ace/config-cygwin32-common.h: - * ace/config-g++-common.h: - * ace/config-win32-common.h: - * ace/config-win32-mingw.h: - * ace/config-win32.h: - * ace/streams.h: - * examples/NT_Service/Makefile: - * examples/NT_Service/main.cpp: - * examples/NT_Service/ntsvc.cpp: - * include/makeinclude/platform_cygwin32.GNU: - * include/makeinclude/platform_gnuwin32_common.GNU: - * include/makeinclude/platform_mingw32.GNU: - * include/makeinclude/rules.local.GNU: - * include/makeinclude/wrapper_macros.GNU: - * tests/CDR_File_Test.cpp: - * tests/Cached_Accept_Conn_Test.cpp: - * tests/Cached_Conn_Test.cpp: - * tests/Conn_Test.cpp: - * tests/Handle_Set_Test.cpp: - * tests/MEM_Stream_Test.cpp: - * tests/MEM_Stream_Test.h: - * tests/MM_Shared_Memory_Test.cpp: - * tests/MT_SOCK_Test.cpp: - * tests/Malloc_Test.cpp: - * tests/Mem_Map_Test.cpp: - * tests/OS_Test.cpp: - * tests/Priority_Reactor_Test.cpp: - * tests/Process_Strategy_Test.cpp: - * tests/Reactor_Exceptions_Test.cpp: - * tests/Reactor_Notify_Test.cpp: - * tests/SOCK_Send_Recv_Test.cpp: - * tests/SOCK_Test.cpp: - * tests/SPIPE_Test.cpp: - * tests/Svc_Handler_Test.cpp: - * tests/run_tests.bat: - * tests/run_tests.sh: - * tests/RMCast/RMCast_Fragment_Test.cpp: - Add support for mingw (www.mingw.org) and partial support for - cygwin (http://cygwin.com/). Many thanks to Cristian Ferretti - <cristian_ferretti@yahoo.com> - -Fri Apr 20 18:21:41 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/CDR_Stream.i (align_write_ptr): - Don't use grow_and_adjust() here because it forces an - allocation, using simply adjust() is better. - -Fri Apr 20 19:37:53 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Get_Opt.h: Updated the documentation to match the constructor - arguments for ACE_Get_Opt. Thanks to Benot Desmeules - <bdesmeules@eurekium.com> for reporting this. - - * ace/TP_Reactor.cpp: Added a workaround for compiling ACE on - Linux for the OS/390 OS. Thanks to James Dorsey - <James.Dorsey@acxiom.com> for reporting this. - -Fri Apr 20 00:57:24 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/Containers_T.cpp (operator=): Added a missing assignment to - this->size_ = s.size_. Thanks to Juan Jose Comellas - <jcomellas@novamens.com> for reporting this. - - * ace/SOCK_Dgram: One of the send() methods was lacking a "const" - in front of the ACE_Addr &. This has been fixed. Thanks to - Victor Poznyak <VictorP@Webley.COM> for reporting this. - -Thu Apr 19 16:18:33 2001 Steve Huston <shuston@riverace.com> - - * ace/Log_Msg.h: Doxygen-ized some function arguments; other - minor doc cleanups. - -Thu Apr 19 11:08:15 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ACE-INSTALL.html: Point out that ACE supports Solaris 8. - Thanks to Logan Modahala <lmodahal@cisco.com> for motivating - this. - -Wed Apr 18 13:57:40 2001 Chad Elliott <elliott_c@ociweb.com> - - * ace/ACE.cpp: - - Modification to check errno for ENOBUFS (in addition to - EWOULDBLOCK) after writing to a file descriptor. This will happen - on VxWorks when a client sends data faster than the server can - receive it. This modification causes this to be a retry situation - instead of an error. [Bug 866] - -Wed Apr 18 11:33:07 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * bin/auto_run_tests.lst: Added the BiDirectional tests to the - nightly builds. There is no reason why it did not go in so far. - -Wed Apr 18 10:25:03 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * bin/auto_run_tests.lst: Changed the name of the -config option - for SUNCC5.1. Removed the dot and replaced it with a '_'. - -Wed Apr 18 05:23:53 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * tests/Config_Test.cpp: Fixed several warnings related to - not using ACE_TEXT for wide-strings. Thanks to Bala for - reporting this. - -Wed Apr 18 02:08:16 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * examples/Synch/proc_sema.dsp: Fixed release build settings. - -Tue Apr 17 12:33:49 2001 Steve Huston <shuston@riverace.com> - - * ace/Service_Config.cpp (open_i): If the caller supplies a - logger key, enable the ACE_Log_Msg::LOGGER bit when opening - the ACE_Log_Msg instance, else the logger key is ignored. - -Tue Apr 17 06:15:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> - - * bin/auto_run_tests.lst: - - Added the UDP Pluggable Protocol test to the list of executed tests. - -Mon Apr 16 20:42:46 2001 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - Remove obsolete comments and raise the optimization level from - -O2 to -O3, the latter disables a huge number of warnings for - PACE. - -Mon Apr 16 22:15:28 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * bin/auto_run_tests.lst: Commented out some tests that are - failing on SUNCC 5.1. The failure is because of a compiler - bug. The problem is that the compiler seems to have difficulty - in calling the virtual method in a class hierarchy which is - built with multiple inheritance. - -Mon Apr 16 20:24:11 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * tests/Config_Test.cpp (main): Remoted the test_io() function. - Thanks to Jerry Odenwelder <jerry.o@mindspring.com> for - confirming this. - -Mon Apr 16 16:18:57 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/config-qnx-rtp.h: - Add support for gperf under QNX - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - The -fexceptions flag has no place in the CPPFLAGS macros, it - should go in CCFLAGS (though I could be convinced to put it in - CFLAGS) - -Mon Apr 16 16:13:29 2001 Steve Huston <shuston@riverace.com> - - * ace/Configuration.h (ACE_Configuration::root_section): Made this - method 'const'; makes today's changes easier to deal with. - - * ace/Configuration_Import_Export.cpp (string_has_white_space): - * ace/Configuration.cpp (operator==): Replaced 'true' with 1 and - 'false' with 0; replace const_cast<> with ACE_const_cast (), - per docs/ACE-guidelines.html, and IBM C++ :-) Also, use two - non-const local variables instead of const_casting 'this' and - 'rhs' on every use. - Made ACE_Configuration::root_section (void) const. - - * ace/ace.icc: This was an early hack attempt to use library or DLL - build for Visual Age C++ 4. It is now the Visual Age C++ 5 - configuration for building ACE on AIX. The ace-dll.icc and - ace-lib.icc are still around for Visual Age C++ 4 users, but may - not work and will be removed in a future ACE release. This - config is for Visual Age C++ 5 only and can/will be extended to - do subset builds as well as debug/optimize/etc variants. - - * bin/make_pretty.pl: Pick out AIX ld errors correctly. - - * include/makeinclude/platform_hpux_aCC.GNU: Note HP problem report - number and disposition for inability to use -AA and +noeh together. - -Mon Apr 16 12:32:48 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * tests/MEM_Stream_Test.cpp: Limited the concurrent connections - used in the multithreaded test on platforms without POSIX or - Win32 semaphores. In this case, SysV semaphores are used and - a user can only instantiate very limited number of them. The - test will also print out an INFO in this case as it implies - there can only be one "multithreaded" connection in one host at - any instance. This fixed the test on some obsolete UNIX - platforms. - -Mon Apr 16 09:58:23 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/Config_Test.cpp: Fixed a warning with g++ builds. The - warning was because of an unused function. - -Sun Apr 15 21:27:19 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Added new Configuration_Import_Export.{h,cpp} - files. - -Sun Apr 15 19:33:19 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/Configuration.cpp, - * ace/Configuration_Import_Export.cpp: Fixed some warnings - that show up with G++. Thanks to Carlos for reporting this. - -Sun Apr 15 17:13:40 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - Disabled TAO/tests/Client_Leaks on all configurations, it is - failing systematically because it cannot create processes fast - enough. - -Sat Apr 14 18:08:16 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Configuration_Import_Export.h: - Fixed small typo in the @file comment for - Configuration_Import_Export.h - -Sat Apr 14 18:31:15 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/Makefile.bor: Added new Configuration_Import_Export.obj file. - - * tests/Config_Test.cpp: Added tests for the new ACE_Configuration* - stuff. Thanks to Jerry Odenwelder <jerry.o@mindspring.com> for - contributing these. - - * ace/Configuration_Import_Export.{h,cpp}: Added two new files that - do the following: - - 1. Remove the import and export functionality from the - ACE_Configuration object. - 2. Provide two new classes to import/export ACE_Configuration - objects: - - * ACE_Registry_ImpExp import and exports in the Win32 - Registry format - this was the old import/export routine on - ACE_Configuration. - * ACE_Ini_ImpExp imports and exports in an INI format. The - import part of this was called import_config_as_strings in - the old ACE_Configuration object. While this object will - export any ACE_Configuration object, it can only import data as - strings. This is due to the inability to distinguish type - in the INI format. - 3. Added operator== to ACE_Configuration. This is to compare - contents not type. - 4. Test programs were modified to exercise this new functionality. - - Thanks to Jerry Odenwelder <jerry.o@mindspring.com> for - contributing these. - -Sat Apr 14 12:44:17 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/MEM_IO.i: - Reorder operations to eliminate warnings on Tru64/CXX - -Sat Apr 14 11:12:26 2001 Steve Huston <shuston@riverace.com> - - * tests/CLASSIX_Addr_Test.icc: - * tests/CLASSIX_CLD_Connector_Test.icc: - * tests/CLASSIX_Con_Acc_Test.icc: - * tests/CLASSIX_Group_Test.icc: - * tests/CLASSIX_Notify_Test.icc: - * tests/CLASSIX_OS_Test.icc: - * tests/CLASSIX_Reactor_Test.icc: - * tests/CLASSIX_Select_Reactor_Test.icc: - * tests/CLASSIX_Stream_Test.icc: - Removed these files. They were moved/copied to tests/CLASSIX some - time back and don't belong here. - - * tests/t.icc: Removed. This is not used for anything. - - * tests/Makefile.vac: Corrected 'realclean' actions. - -Sat Apr 14 09:17:32 2001 Steve Huston <shuston@riverace.com> - - * examples/QOS/Change_Sender_TSpec/sender.dsp: Added extra level of - directory for include and lib - missed this one in yesterday's - set of changes. - -Sat Apr 14 09:08:33 2001 Steve Huston <shuston@riverace.com> - - * ace/Array_Base.h: Added forward declaration for ACE_Allocator. - * ace/Array_Base.cpp: Added #include "Malloc_Base.h" so IBM C++ - can find ACE_Allocator when instantiating templates. - - * ace/config-hpux-10.x-hpc++.h: When using standard C++ lib, - set the value of ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB to 1. - - * netsvcs/clients/Naming/Dump_Restore/Makefile: - * netsvcs/clients/Naming/Client/Makefile: Add ACELIB to LIBS. This - allows IBM C++ compilers to build the library clean. - - * tests/Makefile.vac: Don't try to use vacbld_r on the entire - project. It can take so long that make gives up and kills - off the build, making a real mess of the .ics files and leaving - random numbers of tests unbuilt. Instead, run vacbld_r on - each .icc file in the directory. Similarly for clean, don't - reply on vacbld_r on the project file - run through all the - ics files and executables based on existing .icc files. + * ace/Log_Msg.h: + Document the lock related functions in a separate Doxygen + section. -Fri Apr 13 12:44:21 2001 Steve Huston <shuston@riverace.com> +Fri Apr 13 11:58:58 2001 Carlos O'Ryan <coryan@uci.edu> - * netsvcs/lib/Server_Logging_Handler_T.cpp (handle_logging_record): - If logging to STDERR is not enabled, don't dump the log record - there either. + * ace/OS.i (gethrtime): + Add support for the the clock tick register as a high resolution + timer under KCC/Linux. Fri Apr 13 12:21:01 2001 Nanbor Wang <nanbor@cs.wustl.edu> - * ace/Malloc_T.h: Added an explanation on the requirement about - sizeof (TYPE)link of ACE_Cached_Allocator and a link to - ACE_Cached_Mem_Pool_Node where this stuff was explained. Thanks - to Rachel G. Smith <Rachel_G_Smith@raytheon.com> for motivating - the change. + * ace/Malloc_T.h: Added an explanation on the requirement about + sizeof (TYPE)link of ACE_Cached_Allocator and a link to + ACE_Cached_Mem_Pool_Node where this stuff was explained. Thanks + to Rachel G. Smith <Rachel_G_Smith@raytheon.com> for motivating + the change. Fri Apr 13 12:05:38 2001 Nanbor Wang <nanbor@cs.wustl.edu> - * tests/MEM_Stream_Test.h: - * tests/MEM_Stream_Test.cpp: Borland C++ has problem cleaning up - the static Atomic_Op object in Echo_Handler in the right order. - Made that an ACE_Singleton and re-organized the test a big. - Thanks to Chris Kohlhoff <chris@kohlhoff.com> for reporting and - suggesting the fix. [Bug 862] - -Fri Apr 13 11:58:58 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.i (gethrtime): - Add support for the the clock tick register as a high resolution - timer under KCC/Linux. Thanks to David Levine for help on this. + * tests/MEM_Stream_Test.h: + * tests/MEM_Stream_Test.cpp: Borland C++ has problem cleaning up + the static Atomic_Op object in Echo_Handler in the right order. + Made that an ACE_Singleton and re-organized the test a big. + Thanks to Chris Kohlhoff <chris@kohlhoff.com> for reporting and + suggesting the fix. [Bug 862] Fri Apr 13 05:30:04 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ace/OS.i: Make sure that the PTHREADS version of ACE_OS::thr_yield() - gets top priority over the STHREADS version. Thanks to Munagala - Ramanath <amberarrow@yahoo.com> for reporting this. - - * ace/Malloc_T.{h,i}: Added support for one of the calloc() methods - to ACE_Cached_Allocator. Thanks to Rachel G Smith - <Rachel_G_Smith@raytheon.com> for motivating this change. + * ace/Malloc_T.{h,i}: Added support for one of the calloc() methods + to ACE_Cached_Allocator. Thanks to Rachel G Smith + <Rachel_G_Smith@raytheon.com> for motivating this change. - * ace/Malloc_Allocator.h: Updated the comments for ACE_New_Allocator - to indicate that the calloc() methods are also supported. - Thanks to Rachel G Smith <Rachel_G_Smith@raytheon.com> for - motivating this change. + * ace/Malloc_Allocator.h: Updated the comments for ACE_New_Allocator + to indicate that the calloc() methods are also supported. + Thanks to Rachel G Smith <Rachel_G_Smith@raytheon.com> for + motivating this change. - * docs/ACE-bug-process.html: Updated this document to explain how - bugs pertaining to OCI's TAO releases should be handled. Thanks - to Georg Lohrer <GeorgLohrer@web.de> for motivating this. + * docs/ACE-bug-process.html: Updated this document to explain how + bugs pertaining to OCI's TAO releases should be handled. Thanks + to Georg Lohrer <GeorgLohrer@web.de> for motivating this. Thu Apr 12 20:36:30 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ace/OS.i (thr_getspecific): Reorder the way in which we check - the flags so that ACE_HAS_PTHREADS takes precedence over - ACE_HAS_STHREADS. Thanks to Munagala Ramanath - <amberarrow@yahoo.com> for reporting this. + * ace/OS.i (thr_getspecific): Reorder the way in which we check + the flags so that ACE_HAS_PTHREADS takes precedence over + ACE_HAS_STHREADS. Thanks to Munagala Ramanath + <amberarrow@yahoo.com> for reporting this. Thu Apr 12 21:18:44 2001 Steve Huston <shuston@riverace.com> @@ -471,24 +83,24 @@ Thu Apr 12 15:48:22 2001 Joe Hoffert <joeh@cs.wustl.edu> Thu Apr 12 13:06:27 2001 Joel Sherrill <joel@OARcorp.com> - * include/makeinclude/Makefile.rtems: Replaced debug version - with real version that queries RTEMS application Makefile - infrastructure. + * include/makeinclude/Makefile.rtems: Replaced debug version + with real version that queries RTEMS application Makefile + infrastructure. * include/makeinclude/platform_rtems.x_g++.GNU: Added --no-print-directory option to all invocations of recursive - make to determine information from Makefile.rtems. This - avoids getting the "entering/exiting directory" messages - included in the results. + make to determine information from Makefile.rtems. This + avoids getting the "entering/exiting directory" messages + included in the results. * ACE-RTEMS.README: Added requirement to configure C++ support in RTEMS. Updated to reflect also compiling for mc68360 - target. + target. Wed Apr 11 20:36:36 2001 Nanbor Wang <nanbor@cs.wustl.edu> - * examples/Synch/proc_sema.cpp (main): Fixd an assigning string - literal to char* warning. + * examples/Synch/proc_sema.cpp (main): Fixd an assigning string + literal to char* warning. Wed Apr 11 18:04:33 2001 Steve Huston <shuston@riverace.com> @@ -498,9 +110,9 @@ Wed Apr 11 18:04:33 2001 Steve Huston <shuston@riverace.com> Wed Apr 11 11:00:50 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ACE-INSTALL.html: Added a section illustrating how to build - ACE+TAO for RTEMS. Thanks to Joel Sherrill <joel@OARcorp.com> - for this build procedure. + * ACE-INSTALL.html: Added a section illustrating how to build + ACE+TAO for RTEMS. Thanks to Joel Sherrill <joel@OARcorp.com> + for this build procedure. Wed Apr 11 11:38:37 2001 Steve Huston <shuston@riverace.com> diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 5a7cf713c8a..afb206866f0 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,441 +1,53 @@ -Mon Apr 23 17:18:35 2001 Steve Huston <shuston@riverace.com> - - * ace/ACE.cpp (ACE::handle_timed_complete): Set need_to_check for - any non-success result, or on a system where you can't tell (AIX). - Also, to check, use getsockopt to retrieve the status/error if - SOL_SOCKET and SO_ERROR are defined; else use the old recv method. - This gets you a real error code on a failed connect, if the platform - supports it. - - * tests/SOCK_Connector_Test.cpp: For an expected success, allow test - to pass if socket gets a reset but not if it says ENOTCONN. If there - are platforms that can't do SOL_SOCKET/SO_ERROR (above) then this - other code may need to be re-enabled. - -Mon Apr 23 13:36:27 2001 Steve Huston <shuston@riverace.com> - - * ace/ACE.cpp (ACE::handle_timed_complete): Winsock (ACE_WIN32) sets - the exception bit (not the read bit) for a failed async connect. - So on fail, don't bother to do the recv trick to see if the socket - really did fail. - - * ace/Connector.cpp (ACE_Connector::handle_output): - * ace/SOCK_Connector.cpp (complete): Apparantly, Win2000 has - fixed the problem where a connection succeeds but can't be used - for a time. So, the sleep workaround is restructured for ACE_WIN32 - to try the new socket first, and only do the sleep if it fails. - Don't try to do this check (e.g. building on Win2000) at compile - time, since we want to be able to build on NT and run on Win2000. +Sat Apr 14 10:51:39 2001 Carlos O'Ryan <coryan@uci.edu> - * ace/README: - * ace/config-win32-common.h: Removed the macro, - ACE_HAS_BROKEN_NONBLOCKING_CONNECTS. It was only used in the two - cases above, and is not needed any longer. - -Mon Apr 23 07:08:09 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/Based_Pointer_T.h: Updated the documentation to - explain how ACE_Based_Pointer<T> (NULL) behaves. Thanks to Tom - Moog <tmoog@polhode.com> for motivating this. - -Sun Apr 22 14:26:56 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.h: - Some warnings are automatically disabled, but the pragmas only - make sense for MSVC. - - * ace/streams.h: - Fixed problems for Sun/CC-4.2, the trick is to include - strstream.h on MINGW32 *and* unix-like platforms, while - strstrea.h is included for all other WinXX-based compilers. - -Sat Apr 21 19:02:27 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * netsvcs/clients/Naming/Dump_Restore/Makefile: - * netsvcs/clients/Naming/Client/Makefile: Removed duplicated ACE - library. I thought I removed them all. - -Sat Apr 21 15:31:27 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/ACE.cpp: - * ace/Basic_Types.h: - * ace/Configuration.cpp: - * ace/Handle_Gobbler.i: - * ace/Lib_Find.cpp: - * ace/Local_Name_Space_T.cpp: - * ace/Log_Msg.cpp: - * ace/Makefile: - * ace/Mem_Map.cpp: - * ace/Memory_Pool.cpp: - * ace/Message_Queue.i: - * ace/NT_Service.cpp: - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - * ace/OS_String.cpp: - * ace/Process.cpp: - * ace/Process_Manager.cpp: - * ace/Registry.cpp: - * ace/SOCK_Connector.i: - * ace/Sock_Connect.cpp: - * ace/TTY_IO.cpp: - * ace/WFMO_Reactor.cpp: - * ace/WFMO_Reactor.i: - * ace/WIN32_Asynch_IO.cpp: - * ace/config-cygwin32-common.h: - * ace/config-g++-common.h: - * ace/config-win32-common.h: - * ace/config-win32-mingw.h: - * ace/config-win32.h: - * ace/streams.h: - * examples/NT_Service/Makefile: - * examples/NT_Service/main.cpp: - * examples/NT_Service/ntsvc.cpp: - * include/makeinclude/platform_cygwin32.GNU: - * include/makeinclude/platform_gnuwin32_common.GNU: - * include/makeinclude/platform_mingw32.GNU: - * include/makeinclude/rules.local.GNU: - * include/makeinclude/wrapper_macros.GNU: - * tests/CDR_File_Test.cpp: - * tests/Cached_Accept_Conn_Test.cpp: - * tests/Cached_Conn_Test.cpp: - * tests/Conn_Test.cpp: - * tests/Handle_Set_Test.cpp: - * tests/MEM_Stream_Test.cpp: - * tests/MEM_Stream_Test.h: - * tests/MM_Shared_Memory_Test.cpp: - * tests/MT_SOCK_Test.cpp: - * tests/Malloc_Test.cpp: - * tests/Mem_Map_Test.cpp: - * tests/OS_Test.cpp: - * tests/Priority_Reactor_Test.cpp: - * tests/Process_Strategy_Test.cpp: - * tests/Reactor_Exceptions_Test.cpp: - * tests/Reactor_Notify_Test.cpp: - * tests/SOCK_Send_Recv_Test.cpp: - * tests/SOCK_Test.cpp: - * tests/SPIPE_Test.cpp: - * tests/Svc_Handler_Test.cpp: - * tests/run_tests.bat: - * tests/run_tests.sh: - * tests/RMCast/RMCast_Fragment_Test.cpp: - Add support for mingw (www.mingw.org) and partial support for - cygwin (http://cygwin.com/). Many thanks to Cristian Ferretti - <cristian_ferretti@yahoo.com> - -Fri Apr 20 18:21:41 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/CDR_Stream.i (align_write_ptr): - Don't use grow_and_adjust() here because it forces an - allocation, using simply adjust() is better. - -Fri Apr 20 19:37:53 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Get_Opt.h: Updated the documentation to match the constructor - arguments for ACE_Get_Opt. Thanks to Benot Desmeules - <bdesmeules@eurekium.com> for reporting this. - - * ace/TP_Reactor.cpp: Added a workaround for compiling ACE on - Linux for the OS/390 OS. Thanks to James Dorsey - <James.Dorsey@acxiom.com> for reporting this. - -Fri Apr 20 00:57:24 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/Containers_T.cpp (operator=): Added a missing assignment to - this->size_ = s.size_. Thanks to Juan Jose Comellas - <jcomellas@novamens.com> for reporting this. - - * ace/SOCK_Dgram: One of the send() methods was lacking a "const" - in front of the ACE_Addr &. This has been fixed. Thanks to - Victor Poznyak <VictorP@Webley.COM> for reporting this. - -Thu Apr 19 16:18:33 2001 Steve Huston <shuston@riverace.com> - - * ace/Log_Msg.h: Doxygen-ized some function arguments; other - minor doc cleanups. - -Thu Apr 19 11:08:15 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ACE-INSTALL.html: Point out that ACE supports Solaris 8. - Thanks to Logan Modahala <lmodahal@cisco.com> for motivating - this. - -Wed Apr 18 13:57:40 2001 Chad Elliott <elliott_c@ociweb.com> - - * ace/ACE.cpp: - - Modification to check errno for ENOBUFS (in addition to - EWOULDBLOCK) after writing to a file descriptor. This will happen - on VxWorks when a client sends data faster than the server can - receive it. This modification causes this to be a retry situation - instead of an error. [Bug 866] - -Wed Apr 18 11:33:07 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * bin/auto_run_tests.lst: Added the BiDirectional tests to the - nightly builds. There is no reason why it did not go in so far. - -Wed Apr 18 10:25:03 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * bin/auto_run_tests.lst: Changed the name of the -config option - for SUNCC5.1. Removed the dot and replaced it with a '_'. - -Wed Apr 18 05:23:53 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * tests/Config_Test.cpp: Fixed several warnings related to - not using ACE_TEXT for wide-strings. Thanks to Bala for - reporting this. - -Wed Apr 18 02:08:16 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * examples/Synch/proc_sema.dsp: Fixed release build settings. - -Tue Apr 17 12:33:49 2001 Steve Huston <shuston@riverace.com> - - * ace/Service_Config.cpp (open_i): If the caller supplies a - logger key, enable the ACE_Log_Msg::LOGGER bit when opening - the ACE_Log_Msg instance, else the logger key is ignored. - -Tue Apr 17 06:15:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> - - * bin/auto_run_tests.lst: - - Added the UDP Pluggable Protocol test to the list of executed tests. - -Mon Apr 16 20:42:46 2001 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - Remove obsolete comments and raise the optimization level from - -O2 to -O3, the latter disables a huge number of warnings for - PACE. - -Mon Apr 16 22:15:28 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * bin/auto_run_tests.lst: Commented out some tests that are - failing on SUNCC 5.1. The failure is because of a compiler - bug. The problem is that the compiler seems to have difficulty - in calling the virtual method in a class hierarchy which is - built with multiple inheritance. - -Mon Apr 16 20:24:11 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * tests/Config_Test.cpp (main): Remoted the test_io() function. - Thanks to Jerry Odenwelder <jerry.o@mindspring.com> for - confirming this. - -Mon Apr 16 16:18:57 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/config-qnx-rtp.h: - Add support for gperf under QNX - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - The -fexceptions flag has no place in the CPPFLAGS macros, it - should go in CCFLAGS (though I could be convinced to put it in - CFLAGS) - -Mon Apr 16 16:13:29 2001 Steve Huston <shuston@riverace.com> - - * ace/Configuration.h (ACE_Configuration::root_section): Made this - method 'const'; makes today's changes easier to deal with. - - * ace/Configuration_Import_Export.cpp (string_has_white_space): - * ace/Configuration.cpp (operator==): Replaced 'true' with 1 and - 'false' with 0; replace const_cast<> with ACE_const_cast (), - per docs/ACE-guidelines.html, and IBM C++ :-) Also, use two - non-const local variables instead of const_casting 'this' and - 'rhs' on every use. - Made ACE_Configuration::root_section (void) const. - - * ace/ace.icc: This was an early hack attempt to use library or DLL - build for Visual Age C++ 4. It is now the Visual Age C++ 5 - configuration for building ACE on AIX. The ace-dll.icc and - ace-lib.icc are still around for Visual Age C++ 4 users, but may - not work and will be removed in a future ACE release. This - config is for Visual Age C++ 5 only and can/will be extended to - do subset builds as well as debug/optimize/etc variants. - - * bin/make_pretty.pl: Pick out AIX ld errors correctly. - - * include/makeinclude/platform_hpux_aCC.GNU: Note HP problem report - number and disposition for inability to use -AA and +noeh together. - -Mon Apr 16 12:32:48 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * tests/MEM_Stream_Test.cpp: Limited the concurrent connections - used in the multithreaded test on platforms without POSIX or - Win32 semaphores. In this case, SysV semaphores are used and - a user can only instantiate very limited number of them. The - test will also print out an INFO in this case as it implies - there can only be one "multithreaded" connection in one host at - any instance. This fixed the test on some obsolete UNIX - platforms. - -Mon Apr 16 09:58:23 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/Config_Test.cpp: Fixed a warning with g++ builds. The - warning was because of an unused function. - -Sun Apr 15 21:27:19 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Added new Configuration_Import_Export.{h,cpp} - files. - -Sun Apr 15 19:33:19 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/Configuration.cpp, - * ace/Configuration_Import_Export.cpp: Fixed some warnings - that show up with G++. Thanks to Carlos for reporting this. - -Sun Apr 15 17:13:40 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - Disabled TAO/tests/Client_Leaks on all configurations, it is - failing systematically because it cannot create processes fast - enough. - -Sat Apr 14 18:08:16 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Configuration_Import_Export.h: - Fixed small typo in the @file comment for - Configuration_Import_Export.h - -Sat Apr 14 18:31:15 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/Makefile.bor: Added new Configuration_Import_Export.obj file. - - * tests/Config_Test.cpp: Added tests for the new ACE_Configuration* - stuff. Thanks to Jerry Odenwelder <jerry.o@mindspring.com> for - contributing these. - - * ace/Configuration_Import_Export.{h,cpp}: Added two new files that - do the following: - - 1. Remove the import and export functionality from the - ACE_Configuration object. - 2. Provide two new classes to import/export ACE_Configuration - objects: - - * ACE_Registry_ImpExp import and exports in the Win32 - Registry format - this was the old import/export routine on - ACE_Configuration. - * ACE_Ini_ImpExp imports and exports in an INI format. The - import part of this was called import_config_as_strings in - the old ACE_Configuration object. While this object will - export any ACE_Configuration object, it can only import data as - strings. This is due to the inability to distinguish type - in the INI format. - 3. Added operator== to ACE_Configuration. This is to compare - contents not type. - 4. Test programs were modified to exercise this new functionality. - - Thanks to Jerry Odenwelder <jerry.o@mindspring.com> for - contributing these. - -Sat Apr 14 12:44:17 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/MEM_IO.i: - Reorder operations to eliminate warnings on Tru64/CXX - -Sat Apr 14 11:12:26 2001 Steve Huston <shuston@riverace.com> - - * tests/CLASSIX_Addr_Test.icc: - * tests/CLASSIX_CLD_Connector_Test.icc: - * tests/CLASSIX_Con_Acc_Test.icc: - * tests/CLASSIX_Group_Test.icc: - * tests/CLASSIX_Notify_Test.icc: - * tests/CLASSIX_OS_Test.icc: - * tests/CLASSIX_Reactor_Test.icc: - * tests/CLASSIX_Select_Reactor_Test.icc: - * tests/CLASSIX_Stream_Test.icc: - Removed these files. They were moved/copied to tests/CLASSIX some - time back and don't belong here. - - * tests/t.icc: Removed. This is not used for anything. - - * tests/Makefile.vac: Corrected 'realclean' actions. - -Sat Apr 14 09:17:32 2001 Steve Huston <shuston@riverace.com> - - * examples/QOS/Change_Sender_TSpec/sender.dsp: Added extra level of - directory for include and lib - missed this one in yesterday's - set of changes. - -Sat Apr 14 09:08:33 2001 Steve Huston <shuston@riverace.com> - - * ace/Array_Base.h: Added forward declaration for ACE_Allocator. - * ace/Array_Base.cpp: Added #include "Malloc_Base.h" so IBM C++ - can find ACE_Allocator when instantiating templates. - - * ace/config-hpux-10.x-hpc++.h: When using standard C++ lib, - set the value of ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB to 1. - - * netsvcs/clients/Naming/Dump_Restore/Makefile: - * netsvcs/clients/Naming/Client/Makefile: Add ACELIB to LIBS. This - allows IBM C++ compilers to build the library clean. - - * tests/Makefile.vac: Don't try to use vacbld_r on the entire - project. It can take so long that make gives up and kills - off the build, making a real mess of the .ics files and leaving - random numbers of tests unbuilt. Instead, run vacbld_r on - each .icc file in the directory. Similarly for clean, don't - reply on vacbld_r on the project file - run through all the - ics files and executables based on existing .icc files. + * ace/Log_Msg.h: + Document the lock related functions in a separate Doxygen + section. -Fri Apr 13 12:44:21 2001 Steve Huston <shuston@riverace.com> +Fri Apr 13 11:58:58 2001 Carlos O'Ryan <coryan@uci.edu> - * netsvcs/lib/Server_Logging_Handler_T.cpp (handle_logging_record): - If logging to STDERR is not enabled, don't dump the log record - there either. + * ace/OS.i (gethrtime): + Add support for the the clock tick register as a high resolution + timer under KCC/Linux. Fri Apr 13 12:21:01 2001 Nanbor Wang <nanbor@cs.wustl.edu> - * ace/Malloc_T.h: Added an explanation on the requirement about - sizeof (TYPE)link of ACE_Cached_Allocator and a link to - ACE_Cached_Mem_Pool_Node where this stuff was explained. Thanks - to Rachel G. Smith <Rachel_G_Smith@raytheon.com> for motivating - the change. + * ace/Malloc_T.h: Added an explanation on the requirement about + sizeof (TYPE)link of ACE_Cached_Allocator and a link to + ACE_Cached_Mem_Pool_Node where this stuff was explained. Thanks + to Rachel G. Smith <Rachel_G_Smith@raytheon.com> for motivating + the change. Fri Apr 13 12:05:38 2001 Nanbor Wang <nanbor@cs.wustl.edu> - * tests/MEM_Stream_Test.h: - * tests/MEM_Stream_Test.cpp: Borland C++ has problem cleaning up - the static Atomic_Op object in Echo_Handler in the right order. - Made that an ACE_Singleton and re-organized the test a big. - Thanks to Chris Kohlhoff <chris@kohlhoff.com> for reporting and - suggesting the fix. [Bug 862] - -Fri Apr 13 11:58:58 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.i (gethrtime): - Add support for the the clock tick register as a high resolution - timer under KCC/Linux. Thanks to David Levine for help on this. + * tests/MEM_Stream_Test.h: + * tests/MEM_Stream_Test.cpp: Borland C++ has problem cleaning up + the static Atomic_Op object in Echo_Handler in the right order. + Made that an ACE_Singleton and re-organized the test a big. + Thanks to Chris Kohlhoff <chris@kohlhoff.com> for reporting and + suggesting the fix. [Bug 862] Fri Apr 13 05:30:04 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ace/OS.i: Make sure that the PTHREADS version of ACE_OS::thr_yield() - gets top priority over the STHREADS version. Thanks to Munagala - Ramanath <amberarrow@yahoo.com> for reporting this. - - * ace/Malloc_T.{h,i}: Added support for one of the calloc() methods - to ACE_Cached_Allocator. Thanks to Rachel G Smith - <Rachel_G_Smith@raytheon.com> for motivating this change. + * ace/Malloc_T.{h,i}: Added support for one of the calloc() methods + to ACE_Cached_Allocator. Thanks to Rachel G Smith + <Rachel_G_Smith@raytheon.com> for motivating this change. - * ace/Malloc_Allocator.h: Updated the comments for ACE_New_Allocator - to indicate that the calloc() methods are also supported. - Thanks to Rachel G Smith <Rachel_G_Smith@raytheon.com> for - motivating this change. + * ace/Malloc_Allocator.h: Updated the comments for ACE_New_Allocator + to indicate that the calloc() methods are also supported. + Thanks to Rachel G Smith <Rachel_G_Smith@raytheon.com> for + motivating this change. - * docs/ACE-bug-process.html: Updated this document to explain how - bugs pertaining to OCI's TAO releases should be handled. Thanks - to Georg Lohrer <GeorgLohrer@web.de> for motivating this. + * docs/ACE-bug-process.html: Updated this document to explain how + bugs pertaining to OCI's TAO releases should be handled. Thanks + to Georg Lohrer <GeorgLohrer@web.de> for motivating this. Thu Apr 12 20:36:30 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ace/OS.i (thr_getspecific): Reorder the way in which we check - the flags so that ACE_HAS_PTHREADS takes precedence over - ACE_HAS_STHREADS. Thanks to Munagala Ramanath - <amberarrow@yahoo.com> for reporting this. + * ace/OS.i (thr_getspecific): Reorder the way in which we check + the flags so that ACE_HAS_PTHREADS takes precedence over + ACE_HAS_STHREADS. Thanks to Munagala Ramanath + <amberarrow@yahoo.com> for reporting this. Thu Apr 12 21:18:44 2001 Steve Huston <shuston@riverace.com> @@ -471,24 +83,24 @@ Thu Apr 12 15:48:22 2001 Joe Hoffert <joeh@cs.wustl.edu> Thu Apr 12 13:06:27 2001 Joel Sherrill <joel@OARcorp.com> - * include/makeinclude/Makefile.rtems: Replaced debug version - with real version that queries RTEMS application Makefile - infrastructure. + * include/makeinclude/Makefile.rtems: Replaced debug version + with real version that queries RTEMS application Makefile + infrastructure. * include/makeinclude/platform_rtems.x_g++.GNU: Added --no-print-directory option to all invocations of recursive - make to determine information from Makefile.rtems. This - avoids getting the "entering/exiting directory" messages - included in the results. + make to determine information from Makefile.rtems. This + avoids getting the "entering/exiting directory" messages + included in the results. * ACE-RTEMS.README: Added requirement to configure C++ support in RTEMS. Updated to reflect also compiling for mc68360 - target. + target. Wed Apr 11 20:36:36 2001 Nanbor Wang <nanbor@cs.wustl.edu> - * examples/Synch/proc_sema.cpp (main): Fixd an assigning string - literal to char* warning. + * examples/Synch/proc_sema.cpp (main): Fixd an assigning string + literal to char* warning. Wed Apr 11 18:04:33 2001 Steve Huston <shuston@riverace.com> @@ -498,9 +110,9 @@ Wed Apr 11 18:04:33 2001 Steve Huston <shuston@riverace.com> Wed Apr 11 11:00:50 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ACE-INSTALL.html: Added a section illustrating how to build - ACE+TAO for RTEMS. Thanks to Joel Sherrill <joel@OARcorp.com> - for this build procedure. + * ACE-INSTALL.html: Added a section illustrating how to build + ACE+TAO for RTEMS. Thanks to Joel Sherrill <joel@OARcorp.com> + for this build procedure. Wed Apr 11 11:38:37 2001 Steve Huston <shuston@riverace.com> diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 5a7cf713c8a..afb206866f0 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,441 +1,53 @@ -Mon Apr 23 17:18:35 2001 Steve Huston <shuston@riverace.com> - - * ace/ACE.cpp (ACE::handle_timed_complete): Set need_to_check for - any non-success result, or on a system where you can't tell (AIX). - Also, to check, use getsockopt to retrieve the status/error if - SOL_SOCKET and SO_ERROR are defined; else use the old recv method. - This gets you a real error code on a failed connect, if the platform - supports it. - - * tests/SOCK_Connector_Test.cpp: For an expected success, allow test - to pass if socket gets a reset but not if it says ENOTCONN. If there - are platforms that can't do SOL_SOCKET/SO_ERROR (above) then this - other code may need to be re-enabled. - -Mon Apr 23 13:36:27 2001 Steve Huston <shuston@riverace.com> - - * ace/ACE.cpp (ACE::handle_timed_complete): Winsock (ACE_WIN32) sets - the exception bit (not the read bit) for a failed async connect. - So on fail, don't bother to do the recv trick to see if the socket - really did fail. - - * ace/Connector.cpp (ACE_Connector::handle_output): - * ace/SOCK_Connector.cpp (complete): Apparantly, Win2000 has - fixed the problem where a connection succeeds but can't be used - for a time. So, the sleep workaround is restructured for ACE_WIN32 - to try the new socket first, and only do the sleep if it fails. - Don't try to do this check (e.g. building on Win2000) at compile - time, since we want to be able to build on NT and run on Win2000. +Sat Apr 14 10:51:39 2001 Carlos O'Ryan <coryan@uci.edu> - * ace/README: - * ace/config-win32-common.h: Removed the macro, - ACE_HAS_BROKEN_NONBLOCKING_CONNECTS. It was only used in the two - cases above, and is not needed any longer. - -Mon Apr 23 07:08:09 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/Based_Pointer_T.h: Updated the documentation to - explain how ACE_Based_Pointer<T> (NULL) behaves. Thanks to Tom - Moog <tmoog@polhode.com> for motivating this. - -Sun Apr 22 14:26:56 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.h: - Some warnings are automatically disabled, but the pragmas only - make sense for MSVC. - - * ace/streams.h: - Fixed problems for Sun/CC-4.2, the trick is to include - strstream.h on MINGW32 *and* unix-like platforms, while - strstrea.h is included for all other WinXX-based compilers. - -Sat Apr 21 19:02:27 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * netsvcs/clients/Naming/Dump_Restore/Makefile: - * netsvcs/clients/Naming/Client/Makefile: Removed duplicated ACE - library. I thought I removed them all. - -Sat Apr 21 15:31:27 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/ACE.cpp: - * ace/Basic_Types.h: - * ace/Configuration.cpp: - * ace/Handle_Gobbler.i: - * ace/Lib_Find.cpp: - * ace/Local_Name_Space_T.cpp: - * ace/Log_Msg.cpp: - * ace/Makefile: - * ace/Mem_Map.cpp: - * ace/Memory_Pool.cpp: - * ace/Message_Queue.i: - * ace/NT_Service.cpp: - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - * ace/OS_String.cpp: - * ace/Process.cpp: - * ace/Process_Manager.cpp: - * ace/Registry.cpp: - * ace/SOCK_Connector.i: - * ace/Sock_Connect.cpp: - * ace/TTY_IO.cpp: - * ace/WFMO_Reactor.cpp: - * ace/WFMO_Reactor.i: - * ace/WIN32_Asynch_IO.cpp: - * ace/config-cygwin32-common.h: - * ace/config-g++-common.h: - * ace/config-win32-common.h: - * ace/config-win32-mingw.h: - * ace/config-win32.h: - * ace/streams.h: - * examples/NT_Service/Makefile: - * examples/NT_Service/main.cpp: - * examples/NT_Service/ntsvc.cpp: - * include/makeinclude/platform_cygwin32.GNU: - * include/makeinclude/platform_gnuwin32_common.GNU: - * include/makeinclude/platform_mingw32.GNU: - * include/makeinclude/rules.local.GNU: - * include/makeinclude/wrapper_macros.GNU: - * tests/CDR_File_Test.cpp: - * tests/Cached_Accept_Conn_Test.cpp: - * tests/Cached_Conn_Test.cpp: - * tests/Conn_Test.cpp: - * tests/Handle_Set_Test.cpp: - * tests/MEM_Stream_Test.cpp: - * tests/MEM_Stream_Test.h: - * tests/MM_Shared_Memory_Test.cpp: - * tests/MT_SOCK_Test.cpp: - * tests/Malloc_Test.cpp: - * tests/Mem_Map_Test.cpp: - * tests/OS_Test.cpp: - * tests/Priority_Reactor_Test.cpp: - * tests/Process_Strategy_Test.cpp: - * tests/Reactor_Exceptions_Test.cpp: - * tests/Reactor_Notify_Test.cpp: - * tests/SOCK_Send_Recv_Test.cpp: - * tests/SOCK_Test.cpp: - * tests/SPIPE_Test.cpp: - * tests/Svc_Handler_Test.cpp: - * tests/run_tests.bat: - * tests/run_tests.sh: - * tests/RMCast/RMCast_Fragment_Test.cpp: - Add support for mingw (www.mingw.org) and partial support for - cygwin (http://cygwin.com/). Many thanks to Cristian Ferretti - <cristian_ferretti@yahoo.com> - -Fri Apr 20 18:21:41 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/CDR_Stream.i (align_write_ptr): - Don't use grow_and_adjust() here because it forces an - allocation, using simply adjust() is better. - -Fri Apr 20 19:37:53 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Get_Opt.h: Updated the documentation to match the constructor - arguments for ACE_Get_Opt. Thanks to Benot Desmeules - <bdesmeules@eurekium.com> for reporting this. - - * ace/TP_Reactor.cpp: Added a workaround for compiling ACE on - Linux for the OS/390 OS. Thanks to James Dorsey - <James.Dorsey@acxiom.com> for reporting this. - -Fri Apr 20 00:57:24 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/Containers_T.cpp (operator=): Added a missing assignment to - this->size_ = s.size_. Thanks to Juan Jose Comellas - <jcomellas@novamens.com> for reporting this. - - * ace/SOCK_Dgram: One of the send() methods was lacking a "const" - in front of the ACE_Addr &. This has been fixed. Thanks to - Victor Poznyak <VictorP@Webley.COM> for reporting this. - -Thu Apr 19 16:18:33 2001 Steve Huston <shuston@riverace.com> - - * ace/Log_Msg.h: Doxygen-ized some function arguments; other - minor doc cleanups. - -Thu Apr 19 11:08:15 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ACE-INSTALL.html: Point out that ACE supports Solaris 8. - Thanks to Logan Modahala <lmodahal@cisco.com> for motivating - this. - -Wed Apr 18 13:57:40 2001 Chad Elliott <elliott_c@ociweb.com> - - * ace/ACE.cpp: - - Modification to check errno for ENOBUFS (in addition to - EWOULDBLOCK) after writing to a file descriptor. This will happen - on VxWorks when a client sends data faster than the server can - receive it. This modification causes this to be a retry situation - instead of an error. [Bug 866] - -Wed Apr 18 11:33:07 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * bin/auto_run_tests.lst: Added the BiDirectional tests to the - nightly builds. There is no reason why it did not go in so far. - -Wed Apr 18 10:25:03 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * bin/auto_run_tests.lst: Changed the name of the -config option - for SUNCC5.1. Removed the dot and replaced it with a '_'. - -Wed Apr 18 05:23:53 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * tests/Config_Test.cpp: Fixed several warnings related to - not using ACE_TEXT for wide-strings. Thanks to Bala for - reporting this. - -Wed Apr 18 02:08:16 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * examples/Synch/proc_sema.dsp: Fixed release build settings. - -Tue Apr 17 12:33:49 2001 Steve Huston <shuston@riverace.com> - - * ace/Service_Config.cpp (open_i): If the caller supplies a - logger key, enable the ACE_Log_Msg::LOGGER bit when opening - the ACE_Log_Msg instance, else the logger key is ignored. - -Tue Apr 17 06:15:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> - - * bin/auto_run_tests.lst: - - Added the UDP Pluggable Protocol test to the list of executed tests. - -Mon Apr 16 20:42:46 2001 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - Remove obsolete comments and raise the optimization level from - -O2 to -O3, the latter disables a huge number of warnings for - PACE. - -Mon Apr 16 22:15:28 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * bin/auto_run_tests.lst: Commented out some tests that are - failing on SUNCC 5.1. The failure is because of a compiler - bug. The problem is that the compiler seems to have difficulty - in calling the virtual method in a class hierarchy which is - built with multiple inheritance. - -Mon Apr 16 20:24:11 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * tests/Config_Test.cpp (main): Remoted the test_io() function. - Thanks to Jerry Odenwelder <jerry.o@mindspring.com> for - confirming this. - -Mon Apr 16 16:18:57 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/config-qnx-rtp.h: - Add support for gperf under QNX - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - The -fexceptions flag has no place in the CPPFLAGS macros, it - should go in CCFLAGS (though I could be convinced to put it in - CFLAGS) - -Mon Apr 16 16:13:29 2001 Steve Huston <shuston@riverace.com> - - * ace/Configuration.h (ACE_Configuration::root_section): Made this - method 'const'; makes today's changes easier to deal with. - - * ace/Configuration_Import_Export.cpp (string_has_white_space): - * ace/Configuration.cpp (operator==): Replaced 'true' with 1 and - 'false' with 0; replace const_cast<> with ACE_const_cast (), - per docs/ACE-guidelines.html, and IBM C++ :-) Also, use two - non-const local variables instead of const_casting 'this' and - 'rhs' on every use. - Made ACE_Configuration::root_section (void) const. - - * ace/ace.icc: This was an early hack attempt to use library or DLL - build for Visual Age C++ 4. It is now the Visual Age C++ 5 - configuration for building ACE on AIX. The ace-dll.icc and - ace-lib.icc are still around for Visual Age C++ 4 users, but may - not work and will be removed in a future ACE release. This - config is for Visual Age C++ 5 only and can/will be extended to - do subset builds as well as debug/optimize/etc variants. - - * bin/make_pretty.pl: Pick out AIX ld errors correctly. - - * include/makeinclude/platform_hpux_aCC.GNU: Note HP problem report - number and disposition for inability to use -AA and +noeh together. - -Mon Apr 16 12:32:48 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * tests/MEM_Stream_Test.cpp: Limited the concurrent connections - used in the multithreaded test on platforms without POSIX or - Win32 semaphores. In this case, SysV semaphores are used and - a user can only instantiate very limited number of them. The - test will also print out an INFO in this case as it implies - there can only be one "multithreaded" connection in one host at - any instance. This fixed the test on some obsolete UNIX - platforms. - -Mon Apr 16 09:58:23 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/Config_Test.cpp: Fixed a warning with g++ builds. The - warning was because of an unused function. - -Sun Apr 15 21:27:19 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Added new Configuration_Import_Export.{h,cpp} - files. - -Sun Apr 15 19:33:19 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/Configuration.cpp, - * ace/Configuration_Import_Export.cpp: Fixed some warnings - that show up with G++. Thanks to Carlos for reporting this. - -Sun Apr 15 17:13:40 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - Disabled TAO/tests/Client_Leaks on all configurations, it is - failing systematically because it cannot create processes fast - enough. - -Sat Apr 14 18:08:16 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Configuration_Import_Export.h: - Fixed small typo in the @file comment for - Configuration_Import_Export.h - -Sat Apr 14 18:31:15 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/Makefile.bor: Added new Configuration_Import_Export.obj file. - - * tests/Config_Test.cpp: Added tests for the new ACE_Configuration* - stuff. Thanks to Jerry Odenwelder <jerry.o@mindspring.com> for - contributing these. - - * ace/Configuration_Import_Export.{h,cpp}: Added two new files that - do the following: - - 1. Remove the import and export functionality from the - ACE_Configuration object. - 2. Provide two new classes to import/export ACE_Configuration - objects: - - * ACE_Registry_ImpExp import and exports in the Win32 - Registry format - this was the old import/export routine on - ACE_Configuration. - * ACE_Ini_ImpExp imports and exports in an INI format. The - import part of this was called import_config_as_strings in - the old ACE_Configuration object. While this object will - export any ACE_Configuration object, it can only import data as - strings. This is due to the inability to distinguish type - in the INI format. - 3. Added operator== to ACE_Configuration. This is to compare - contents not type. - 4. Test programs were modified to exercise this new functionality. - - Thanks to Jerry Odenwelder <jerry.o@mindspring.com> for - contributing these. - -Sat Apr 14 12:44:17 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/MEM_IO.i: - Reorder operations to eliminate warnings on Tru64/CXX - -Sat Apr 14 11:12:26 2001 Steve Huston <shuston@riverace.com> - - * tests/CLASSIX_Addr_Test.icc: - * tests/CLASSIX_CLD_Connector_Test.icc: - * tests/CLASSIX_Con_Acc_Test.icc: - * tests/CLASSIX_Group_Test.icc: - * tests/CLASSIX_Notify_Test.icc: - * tests/CLASSIX_OS_Test.icc: - * tests/CLASSIX_Reactor_Test.icc: - * tests/CLASSIX_Select_Reactor_Test.icc: - * tests/CLASSIX_Stream_Test.icc: - Removed these files. They were moved/copied to tests/CLASSIX some - time back and don't belong here. - - * tests/t.icc: Removed. This is not used for anything. - - * tests/Makefile.vac: Corrected 'realclean' actions. - -Sat Apr 14 09:17:32 2001 Steve Huston <shuston@riverace.com> - - * examples/QOS/Change_Sender_TSpec/sender.dsp: Added extra level of - directory for include and lib - missed this one in yesterday's - set of changes. - -Sat Apr 14 09:08:33 2001 Steve Huston <shuston@riverace.com> - - * ace/Array_Base.h: Added forward declaration for ACE_Allocator. - * ace/Array_Base.cpp: Added #include "Malloc_Base.h" so IBM C++ - can find ACE_Allocator when instantiating templates. - - * ace/config-hpux-10.x-hpc++.h: When using standard C++ lib, - set the value of ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB to 1. - - * netsvcs/clients/Naming/Dump_Restore/Makefile: - * netsvcs/clients/Naming/Client/Makefile: Add ACELIB to LIBS. This - allows IBM C++ compilers to build the library clean. - - * tests/Makefile.vac: Don't try to use vacbld_r on the entire - project. It can take so long that make gives up and kills - off the build, making a real mess of the .ics files and leaving - random numbers of tests unbuilt. Instead, run vacbld_r on - each .icc file in the directory. Similarly for clean, don't - reply on vacbld_r on the project file - run through all the - ics files and executables based on existing .icc files. + * ace/Log_Msg.h: + Document the lock related functions in a separate Doxygen + section. -Fri Apr 13 12:44:21 2001 Steve Huston <shuston@riverace.com> +Fri Apr 13 11:58:58 2001 Carlos O'Ryan <coryan@uci.edu> - * netsvcs/lib/Server_Logging_Handler_T.cpp (handle_logging_record): - If logging to STDERR is not enabled, don't dump the log record - there either. + * ace/OS.i (gethrtime): + Add support for the the clock tick register as a high resolution + timer under KCC/Linux. Fri Apr 13 12:21:01 2001 Nanbor Wang <nanbor@cs.wustl.edu> - * ace/Malloc_T.h: Added an explanation on the requirement about - sizeof (TYPE)link of ACE_Cached_Allocator and a link to - ACE_Cached_Mem_Pool_Node where this stuff was explained. Thanks - to Rachel G. Smith <Rachel_G_Smith@raytheon.com> for motivating - the change. + * ace/Malloc_T.h: Added an explanation on the requirement about + sizeof (TYPE)link of ACE_Cached_Allocator and a link to + ACE_Cached_Mem_Pool_Node where this stuff was explained. Thanks + to Rachel G. Smith <Rachel_G_Smith@raytheon.com> for motivating + the change. Fri Apr 13 12:05:38 2001 Nanbor Wang <nanbor@cs.wustl.edu> - * tests/MEM_Stream_Test.h: - * tests/MEM_Stream_Test.cpp: Borland C++ has problem cleaning up - the static Atomic_Op object in Echo_Handler in the right order. - Made that an ACE_Singleton and re-organized the test a big. - Thanks to Chris Kohlhoff <chris@kohlhoff.com> for reporting and - suggesting the fix. [Bug 862] - -Fri Apr 13 11:58:58 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.i (gethrtime): - Add support for the the clock tick register as a high resolution - timer under KCC/Linux. Thanks to David Levine for help on this. + * tests/MEM_Stream_Test.h: + * tests/MEM_Stream_Test.cpp: Borland C++ has problem cleaning up + the static Atomic_Op object in Echo_Handler in the right order. + Made that an ACE_Singleton and re-organized the test a big. + Thanks to Chris Kohlhoff <chris@kohlhoff.com> for reporting and + suggesting the fix. [Bug 862] Fri Apr 13 05:30:04 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ace/OS.i: Make sure that the PTHREADS version of ACE_OS::thr_yield() - gets top priority over the STHREADS version. Thanks to Munagala - Ramanath <amberarrow@yahoo.com> for reporting this. - - * ace/Malloc_T.{h,i}: Added support for one of the calloc() methods - to ACE_Cached_Allocator. Thanks to Rachel G Smith - <Rachel_G_Smith@raytheon.com> for motivating this change. + * ace/Malloc_T.{h,i}: Added support for one of the calloc() methods + to ACE_Cached_Allocator. Thanks to Rachel G Smith + <Rachel_G_Smith@raytheon.com> for motivating this change. - * ace/Malloc_Allocator.h: Updated the comments for ACE_New_Allocator - to indicate that the calloc() methods are also supported. - Thanks to Rachel G Smith <Rachel_G_Smith@raytheon.com> for - motivating this change. + * ace/Malloc_Allocator.h: Updated the comments for ACE_New_Allocator + to indicate that the calloc() methods are also supported. + Thanks to Rachel G Smith <Rachel_G_Smith@raytheon.com> for + motivating this change. - * docs/ACE-bug-process.html: Updated this document to explain how - bugs pertaining to OCI's TAO releases should be handled. Thanks - to Georg Lohrer <GeorgLohrer@web.de> for motivating this. + * docs/ACE-bug-process.html: Updated this document to explain how + bugs pertaining to OCI's TAO releases should be handled. Thanks + to Georg Lohrer <GeorgLohrer@web.de> for motivating this. Thu Apr 12 20:36:30 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ace/OS.i (thr_getspecific): Reorder the way in which we check - the flags so that ACE_HAS_PTHREADS takes precedence over - ACE_HAS_STHREADS. Thanks to Munagala Ramanath - <amberarrow@yahoo.com> for reporting this. + * ace/OS.i (thr_getspecific): Reorder the way in which we check + the flags so that ACE_HAS_PTHREADS takes precedence over + ACE_HAS_STHREADS. Thanks to Munagala Ramanath + <amberarrow@yahoo.com> for reporting this. Thu Apr 12 21:18:44 2001 Steve Huston <shuston@riverace.com> @@ -471,24 +83,24 @@ Thu Apr 12 15:48:22 2001 Joe Hoffert <joeh@cs.wustl.edu> Thu Apr 12 13:06:27 2001 Joel Sherrill <joel@OARcorp.com> - * include/makeinclude/Makefile.rtems: Replaced debug version - with real version that queries RTEMS application Makefile - infrastructure. + * include/makeinclude/Makefile.rtems: Replaced debug version + with real version that queries RTEMS application Makefile + infrastructure. * include/makeinclude/platform_rtems.x_g++.GNU: Added --no-print-directory option to all invocations of recursive - make to determine information from Makefile.rtems. This - avoids getting the "entering/exiting directory" messages - included in the results. + make to determine information from Makefile.rtems. This + avoids getting the "entering/exiting directory" messages + included in the results. * ACE-RTEMS.README: Added requirement to configure C++ support in RTEMS. Updated to reflect also compiling for mc68360 - target. + target. Wed Apr 11 20:36:36 2001 Nanbor Wang <nanbor@cs.wustl.edu> - * examples/Synch/proc_sema.cpp (main): Fixd an assigning string - literal to char* warning. + * examples/Synch/proc_sema.cpp (main): Fixd an assigning string + literal to char* warning. Wed Apr 11 18:04:33 2001 Steve Huston <shuston@riverace.com> @@ -498,9 +110,9 @@ Wed Apr 11 18:04:33 2001 Steve Huston <shuston@riverace.com> Wed Apr 11 11:00:50 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ACE-INSTALL.html: Added a section illustrating how to build - ACE+TAO for RTEMS. Thanks to Joel Sherrill <joel@OARcorp.com> - for this build procedure. + * ACE-INSTALL.html: Added a section illustrating how to build + ACE+TAO for RTEMS. Thanks to Joel Sherrill <joel@OARcorp.com> + for this build procedure. Wed Apr 11 11:38:37 2001 Steve Huston <shuston@riverace.com> diff --git a/PACE/ChangeLog b/PACE/ChangeLog index 8c472f39beb..da979c42484 100644 --- a/PACE/ChangeLog +++ b/PACE/ChangeLog @@ -1,66 +1,3 @@ -Mon Apr 23 10:43:23 2001 Carlos O'Ryan <coryan@uci.edu> - - * pace/config/compiler.h: - Reverted on of Cristian's changes. He agrees that it is not - worthwhile to use the C9X 'inline' feature when only a few - versions of gcc support it, while inlining static functions with - -O3 is supported by all versions. - -Mon Apr 23 09:45:13 2001 Carlos O'Ryan <coryan@uci.edu> - - * pace/win32/pthread.c (pthread_getschedparam): - Fixed syntax error, thanks to Cristian Ferretti - <cristian_ferretti@yahoo.com> for keeping track of the builds - and providing the patch. - -Sun Apr 22 18:53:28 2001 Carlos O'Ryan <coryan@uci.edu> - - * pace/win32/ctype.h: - ctype.inl is already #included in pace/ctype.h, no need to - #include it again. - -Sun Apr 22 15:03:11 2001 Carlos O'Ryan <coryan@uci.edu> - - * pace/ctype.h: - Add missing #includes that were causing compilation warnings. - -Sat Apr 21 17:37:40 2001 Carlos O'Ryan <coryan@uci.edu> - - * pace/win32/socket.inl: - * pace/win32/socket.c: - Make Fuzz happy, some RCS ids went missing. - -Sat Apr 21 15:31:27 2001 Carlos O'Ryan <coryan@uci.edu> - - * PACE/pace/ctype.h: - * PACE/pace/config/compiler.h: - * PACE/pace/config/platform.h: - * PACE/pace/win32/pthread.c: - * PACE/pace/win32/pthread.inl: - * PACE/pace/win32/semaphore.c: - * PACE/pace/win32/semaphore.h: - * PACE/pace/win32/signal.inl: - * PACE/pace/win32/socket.c: - * PACE/pace/win32/socket.h: - * PACE/pace/win32/socket.inl: - * PACE/pace/win32/stdlib.inl: - * PACE/pace/win32/unistd.h: - * PACE/pace/win32/unistd.inl: - * PACE/pace/win32/utime.c: - * PACE/pace/win32/utsname.c: - * PACE/pace/win32/utsname.inl: - * PACE/pace/win32/wait.inl: - Add support for mingw (www.mingw.org) and partial support for - cygwin (http://cygwin.com/). Many thanks to Cristian Ferretti - <cristian_ferretti@yahoo.com> - -Mon Apr 16 16:17:35 2001 Carlos O'Ryan <coryan@uci.edu> - - * pace/posix/socket.h: - * pace/config/platform.h: - * include/makeinclude/rules.common.GNU: - Add support for QNX, it behaves like other POSIX platforms. - Wed Mar 21 09:26:38 2001 Joe Hoffert <joeh@cs.wustl.edu> * pace/posix/socket.h: @@ -70,15 +7,15 @@ Wed Mar 21 09:26:38 2001 Joe Hoffert <joeh@cs.wustl.edu> Mon Mar 19 16:56:47 2001 Luther Baker <luther@cs.wustl.edu> * pace/win32/unistd.c: - * pace/win32/unistd.inl: - * pace/win32/stdio.c: - * pace/win32/time.inl: + * pace/win32/unistd.inl: + * pace/win32/stdio.c: + * pace/win32/time.inl: Removed ::MsvcFoo punctuation. Since PACE is a c-library, - it doesn't recognize this C++ism. (::) - - * pace/win32/unistd.h: - Added signature for pace_win32_read (needs to be visible - before unistd.inl). + it doesn't recognize this C++ism. (::) + + * pace/win32/unistd.h: + Added signature for pace_win32_read (needs to be visible + before unistd.inl). Tue Mar 13 12:58:09 2001 Joe Hoffert <joeh@cs.wustl.edu> diff --git a/PACE/include/makeinclude/rules.common.GNU b/PACE/include/makeinclude/rules.common.GNU index 49b89db279e..ebcdc1a2712 100644 --- a/PACE/include/makeinclude/rules.common.GNU +++ b/PACE/include/makeinclude/rules.common.GNU @@ -99,11 +99,6 @@ ifeq ($(PACE_SYSNAME),HP-UX) CFLAGS += -DPACE_HAS_POSIX -D_REENTRANT endif -ifeq ($(PACE_SYSNAME),QNX) - VPATH := .:posix:$(VPATH) - CFLAGS += -DPACE_QNX=$(PACE_SYSVER) -D_REENTRANT -endif - ifeq ($(debug),) ifeq (,$(findstring $(CFLAGS),$(CCFLAGS))) CCFLAGS += -DPACE_NDEBUG diff --git a/PACE/pace/config/platform.h b/PACE/pace/config/platform.h index ec206c25599..1c9d406338d 100644 --- a/PACE/pace/config/platform.h +++ b/PACE/pace/config/platform.h @@ -46,13 +46,6 @@ # define PACE_LYNXOS 0 # define PACE_VXWORKS 0 # define PACE_WIN32 0 -#elif defined (PACE_QNX) -# define PACE_HAS_POSIX PACE_QNX -# define PACE_LINUX 0 -# define PACE_SUNOS 0 -# define PACE_LYNXOS 0 -# define PACE_VXWORKS 0 -# define PACE_WIN32 0 /* These platforms are NOT POSIX compliant. */ @@ -64,7 +57,6 @@ # define PACE_WIN32 0 /* Doesn't use the makefile! */ #elif defined (WIN32) -# undef PACE_WIN32 # define PACE_WIN32 2000 # define PACE_LACKS_POSIX PACE_WIN32 # define PACE_LINUX 0 diff --git a/PACE/pace/posix/socket.h b/PACE/pace/posix/socket.h index 187230d776a..61e96e7f341 100644 --- a/PACE/pace/posix/socket.h +++ b/PACE/pace/posix/socket.h @@ -35,7 +35,7 @@ extern "C" { #ifndef PACE_SOCKLEN_T #define PACE_SOCKLEN_T -# if PACE_LYNXOS == 0x300 || PACE_LYNXOS == 0x310 || PACE_SUNOS == 551 || PACE_SUNOS == 560 || PACE_QNX == 600 +# if PACE_LYNXOS == 0x300 || PACE_LYNXOS == 0x310 || PACE_SUNOS == 551 || PACE_SUNOS == 560 typedef int pace_socklen_t; # else typedef socklen_t pace_socklen_t; diff --git a/PACE/pace/win32/ctype.h b/PACE/pace/win32/ctype.h index 9025f3de909..6744ab2a8b9 100644 --- a/PACE/pace/win32/ctype.h +++ b/PACE/pace/win32/ctype.h @@ -24,4 +24,8 @@ extern "C" { } #endif /* PACE_HAS_CPLUSPLUS */ +#if defined (PACE_HAS_INLINE) +# include "pace/win32/ctype.inl" +#endif /* PACE_HAS_INLINE */ + #endif /* PACE_CTYPE_H_WIN32 */ diff --git a/PACE/pace/win32/pthread.c b/PACE/pace/win32/pthread.c index b53dab9396c..790add37a53 100644 --- a/PACE/pace/win32/pthread.c +++ b/PACE/pace/win32/pthread.c @@ -31,9 +31,6 @@ pthread_create (pace_pthread_t * thread, void * (*start_routine) (void*), void * arg) { - /* Get around a gcc bug. */ - typedef unsigned (__stdcall *bthrexr)(void*); - unsigned flags = 0x0, thr_addr = 0x0; if (attr->sparam_.sched_priority != THREAD_PRIORITY_NORMAL) { @@ -41,13 +38,12 @@ pthread_create (pace_pthread_t * thread, flags = CREATE_SUSPENDED; } - thread = (pace_pthread_t) - _beginthreadex (0, - attr->stack_size_, - (bthrexr) start_routine, - arg, - flags, - &thr_addr); + thread = (pace_pthread_t) _beginthreadex (0, + attr->stack_size_, + (unsigned (__stdcall *)(void*))start_routine, + arg, + flags, + &thr_addr); if (flags == CREATE_SUSPENDED && thread != 0) { @@ -81,7 +77,6 @@ pthread_getschedparam (pace_pthread_t thread, int * policy, pace_sched_param * param) { - PACE_UNUSED_ARG (policy); if (param != (pace_sched_param*)0) { param->sched_priority = GetThreadPriority (thread); @@ -97,8 +92,6 @@ pthread_getschedparam (pace_pthread_t thread, int policy, const pace_sched_param * param) { - PACE_UNUSED_ARG(policy); - if (SetThreadPriority (thread, param->sched_priority)) { return 0; diff --git a/PACE/pace/win32/pthread.inl b/PACE/pace/win32/pthread.inl index 3fea1729342..7a61a99d66f 100644 --- a/PACE/pace/win32/pthread.inl +++ b/PACE/pace/win32/pthread.inl @@ -37,11 +37,6 @@ pace_pthread_create (pace_pthread_t * thread, void * (*start_routine) (void*), void * arg) { - PACE_UNUSED_ARG (thread); - PACE_UNUSED_ARG (attr); - PACE_UNUSED_ARG (start_routine); - PACE_UNUSED_ARG (arg); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); } #endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/win32/semaphore.c b/PACE/pace/win32/semaphore.c index 23728df5c29..401ebddc5a5 100644 --- a/PACE/pace/win32/semaphore.c +++ b/PACE/pace/win32/semaphore.c @@ -47,8 +47,6 @@ sem_destroy (pace_sem_t * sem) int sem_init (pace_sem_t * sem, int pshared, unsigned int value) { - PACE_UNUSED_ARG (pshared); - /* Create the semaphore with its value initialized to <count> and its maximum value initialized to <max>. diff --git a/PACE/pace/win32/semaphore.h b/PACE/pace/win32/semaphore.h index 7abd89211f0..d7e395f7fc6 100644 --- a/PACE/pace/win32/semaphore.h +++ b/PACE/pace/win32/semaphore.h @@ -40,7 +40,7 @@ extern "C" { #endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ #if (PACE_HAS_POSIX_NONUOF_FUNCS) - PACE_INLINE pace_sem_t * sem_open (const char * name, int oflag, ...); + pace_sem_t * sem_open (const char * name, int oflag, ...); #endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ #if (PACE_HAS_POSIX_NONUOF_FUNCS) diff --git a/PACE/pace/win32/signal.inl b/PACE/pace/win32/signal.inl index 437d609f926..57c4fd87ad7 100644 --- a/PACE/pace/win32/signal.inl +++ b/PACE/pace/win32/signal.inl @@ -142,7 +142,6 @@ pace_sigqueue (pace_pid_t pid, int signo, { PACE_UNUSED_ARG (pid); PACE_UNUSED_ARG (signo); - PACE_UNUSED_ARG (value); PACE_ERRNO_NO_SUPPORT_RETURN (-1); } #endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ diff --git a/PACE/pace/win32/socket.c b/PACE/pace/win32/socket.c deleted file mode 100644 index 682a843fe1b..00000000000 --- a/PACE/pace/win32/socket.c +++ /dev/null @@ -1,9 +0,0 @@ -/* - * $Id$ - */ - -#include "pace/sys/socket.h" - -/* - * Empty for win32. - */ diff --git a/PACE/pace/win32/socket.h b/PACE/pace/win32/socket.h deleted file mode 100644 index bfaaaab9953..00000000000 --- a/PACE/pace/win32/socket.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * $Id$ - * - * Empty for win32. - */ diff --git a/PACE/pace/win32/socket.inl b/PACE/pace/win32/socket.inl deleted file mode 100644 index 62d778da847..00000000000 --- a/PACE/pace/win32/socket.inl +++ /dev/null @@ -1,7 +0,0 @@ -/* - * $Id$ - */ - -/* - * Empty for win32. - */ diff --git a/PACE/pace/win32/stdlib.inl b/PACE/pace/win32/stdlib.inl index 3597e1954dc..455943da667 100644 --- a/PACE/pace/win32/stdlib.inl +++ b/PACE/pace/win32/stdlib.inl @@ -230,17 +230,6 @@ pace_strtoul (const char* nptr, #if (PACE_HAS_POSIX_NONUOF_FUNCS) PACE_INLINE -int -pace_system (const char* string) -{ - PACE_UNUSED_ARG (string); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -} - -#endif /* PACE_HAS_POSIX_NONUOF_FUNCS */ - -#if (PACE_HAS_POSIX_NONUOF_FUNCS) -PACE_INLINE pace_size_t pace_wcstombs (char* s, const pace_wchar_t* pwcs, diff --git a/PACE/pace/win32/unistd.h b/PACE/pace/win32/unistd.h index 1292cea5bd9..7751ddcf509 100644 --- a/PACE/pace/win32/unistd.h +++ b/PACE/pace/win32/unistd.h @@ -104,7 +104,7 @@ typedef ssize_t pace_ssize_t; #if (PACE_HAS_POSIX_DI_UOF) pace_ssize_t pace_win32_read (PACE_HANDLE fildes, - void * buf, + const void * buf, pace_size_t nbyte); #endif /* PACE_HAS_POSIX_DI_UOF */ diff --git a/PACE/pace/win32/unistd.inl b/PACE/pace/win32/unistd.inl index 83f3f2a9e14..29599b5ee22 100644 --- a/PACE/pace/win32/unistd.inl +++ b/PACE/pace/win32/unistd.inl @@ -109,11 +109,11 @@ int pace_execv (const char * path, char * const argv[]) { -#if defined (__BORLANDC__) || defined(__MINGW32__) +#if defined (__BORLANDC__) return execv (path, argv); -#else /* __BORLANDC__ || __MINGW32__ */ +#else /* __BORLANDC__ */ return _execv (path, (const char * const *) argv); -#endif /* __BORLANDC__ || __MINGW32__ */ +#endif /* __BORLANDC__ */ /* if successful, this operation does NOT return */ } #endif /* PACE_HAS_POSIX_MP_UOF */ @@ -125,12 +125,12 @@ pace_execve (const char * path, char * const argv[], char * const envp[]) { -#if defined (__BORLANDC__) || defined (__MINGW32__) +#if defined (__BORLANDC__) return execve (path, argv, envp); -#else /* __BORLANDC__ || __MINGW32__ */ +#else /* __BORLANDC__ */ return _execve (path, (const char *const *) argv, (const char *const *) envp); -#endif /* __BORLANDC__ || __MINGW32__ */ +#endif /* __BORLANDC__ */ /* if successful, this operation does NOT return */ } #endif /* PACE_HAS_POSIX_MP_UOF */ @@ -141,11 +141,11 @@ int pace_execvp (const char * file, char * const argv[]) { -#if defined (__BORLANDC__) || defined (__MINGW32__) +#if defined (__BORLANDC__) return execvp (file, argv); -#else /* __BORLANDC__ || __MINGW32__ */ +#else /* __BORLANDC__ */ return _execvp (file, (const char *const *) argv); -#endif /* __BORLANDC__ || __MINGW32__ */ +#endif /* __BORLANDC__ */ /* if successful, this operation does NOT return */ } #endif /* PACE_HAS_POSIX_MP_UOF */ @@ -262,8 +262,6 @@ PACE_INLINE int pace_getlogin_r (char * name, size_t namesize) { - PACE_UNUSED_ARG (name); - PACE_UNUSED_ARG (namesize); PACE_ERRNO_NO_SUPPORT_RETURN (-1); } #endif /* PACE_HAS_POSIX_UGR_UOF */ @@ -312,11 +310,11 @@ PACE_INLINE int pace_isatty (int fildes) { -#if defined (__BORLANDC__) || defined (__MINGW32__) +#if defined (__BORLANDC__) return isatty (fildes); -#else /* __BORLANDC__ || __MINGW32__ */ +#else /* __BORLANDC__ */ return _isatty (fildes); -#endif /* __BORLANDC__ || __MINGW32__ */ +#endif /* __BORLANDC__ */ } #endif /* PACE_HAS_POSIX_DS_UOF */ @@ -475,7 +473,7 @@ PACE_INLINE char * pace_ttyname (PACE_HANDLE fildes) { - char * retval = (char*) 0; + char * retval = (void*)0; PACE_UNUSED_ARG (fildes); PACE_ERRNO_NO_SUPPORT_RETURN (retval); } diff --git a/PACE/pace/win32/utime.c b/PACE/pace/win32/utime.c index cafec0eb6cb..1ee2542885b 100644 --- a/PACE/pace/win32/utime.c +++ b/PACE/pace/win32/utime.c @@ -23,19 +23,15 @@ int win32_utime (const char * path, const pace_utimbuf * times) { - PACE_UNUSED_ARG (path); - PACE_UNUSED_ARG (times); - PACE_ERRNO_NO_SUPPORT_RETURN (-1); -#if 0 - /* Not yet working */ + /* Not yet working char * path2 = (char*) malloc (sizeof (path)); pace_strcpy (path2, path); pace_utimbuf * times2 = (pace_utimbuf*) malloc (sizeof (pace_utimbuf); memcpy (times2, times, sizeof times); return _utime (path2, times2); -#endif + */ } #endif /* PACE_HAS_POSIX_FS_UOF */ diff --git a/PACE/pace/win32/utsname.c b/PACE/pace/win32/utsname.c index 9963f1ff624..208b3f2f142 100644 --- a/PACE/pace/win32/utsname.c +++ b/PACE/pace/win32/utsname.c @@ -23,7 +23,6 @@ int uname (pace_utsname * name) { - PACE_UNUSED_ARG (name); PACE_ERRNO_NO_SUPPORT_RETURN (-1); #if 0 /* Emulation: Not bug free! :-/ */ diff --git a/PACE/pace/win32/utsname.inl b/PACE/pace/win32/utsname.inl index bc79bb80db4..e906fc1e131 100644 --- a/PACE/pace/win32/utsname.inl +++ b/PACE/pace/win32/utsname.inl @@ -20,7 +20,6 @@ PACE_INLINE int pace_uname (pace_utsname * name) { - PACE_UNUSED_ARG (name); PACE_ERRNO_NO_SUPPORT_RETURN (-1); } #endif /* PACE_HAS_POSIX_SP_UOF */ diff --git a/PACE/pace/win32/wait.inl b/PACE/pace/win32/wait.inl index 166a0936d10..02c1aca2ce7 100644 --- a/PACE/pace/win32/wait.inl +++ b/PACE/pace/win32/wait.inl @@ -18,12 +18,8 @@ PACE_INLINE pace_pid_t pace_wait (int * statloc) { - PACE_UNUSED_ARG (statloc); - - { - pace_pid_t retval = -1; - PACE_ERRNO_NO_SUPPORT_RETURN (retval); - } + pace_pid_t retval = -1; + PACE_ERRNO_NO_SUPPORT_RETURN (retval); } #endif /* PACE_HAS_POSIX_MP_UOF */ @@ -32,14 +28,8 @@ PACE_INLINE pace_pid_t pace_waitpid (pace_pid_t pid, int * statloc, int options) { - PACE_UNUSED_ARG (pid); - PACE_UNUSED_ARG (statloc); - PACE_UNUSED_ARG (options); - /* ACE version uses a HANDLE */ - { - pace_pid_t retval = -1; - PACE_ERRNO_NO_SUPPORT_RETURN (retval); - } + pace_pid_t retval = -1; + PACE_ERRNO_NO_SUPPORT_RETURN (retval); } #endif /* PACE_HAS_POSIX_MP_UOF */ diff --git a/STL/ACE_Changes b/STL/ACE_Changes deleted file mode 100644 index 902fb94c94c..00000000000 --- a/STL/ACE_Changes +++ /dev/null @@ -1,53 +0,0 @@ -This version of STL was obtained from -http://www.rahul.net/terris/. This is a modified version of the -implementation that comes with VC++4.0. Please see readme2.stl for -details. - -The following modification have been made for compilation with VC++4.x - -________________________________________ - -vector.h (line 85) -________________________________________ - - - /* - * This is cause the VC++ compiler sucks - * and does not recognize nested classes properly - * - */ -#if !defined (VC_PLUS_PLUS_NESTED_CLASS_PROBLEM) - vector(size_type n, const T& value = T()) { - start = static_allocator.allocate(n); - uninitialized_fill_n(start, n, value); - finish = start + n; - end_of_storage = finish; - } -#endif /* VC_PLUS_PLUS_NESTED_CLASS_PROBLEM */ - - -________________________________________ - -bstring.h (line 1102) -________________________________________ - - - /* - * This should be correctly scoped - * - * if (cap == ::reserve) - */ - - if (cap == std::reserve) - { - len = 0; - res = size; - ptr = new charT [res]; - } - /* - * This should be correctly scoped - * - * else if ((cap == ::default_size) && (size != NPOS)) - */ - - else if ((cap == std::default_size) && (size != NPOS)) diff --git a/STL/readme2.stl b/STL/readme2.stl deleted file mode 100644 index 5132bc1189b..00000000000 --- a/STL/readme2.stl +++ /dev/null @@ -1,272 +0,0 @@ -STL2.ZIP - -Standard Template Library for Visual C++ 4.0 -and Related Classes - -Revised 10/15/96 - Bug fixes and change to bit_vector. - -This version supports DLLs and threading. You must use critical -sections around code that uses the same container in different -threads. These features come at a price -- since memory -usage is not optimal, this code may use more memory and -may be slower. - -+ General strategy: Remove all statics except the - static allocator objects. -+ Vectors were not affected. -+ Major changes made to tree.h -+ Stability: Very stable. - -This code should be considered for experimental use only. There -are still statics lurking in some functions; these functions -are not thread-safe. - -------------------------- -Fix for bit_vector -------------------------- -This version also has a fix for bit_vector, which doesn't really -work with VC++ 4.x. Please include bvector.cpp in your -project if you use bit_vector. This fixes the linker errors -that occur if you use bector.h in multiple .cpp files. - -------------------------- -Disclaimer -------------------------- -Code is provided without warranty, liability, or technical support. - -STL.H and PTR.H are freely distributable and can be -modified in any way. - --------------------------------- -STRING.H does not compile. --------------------------------- - -"D. Pirzadeh" <ddp@crl.com> Explains how to fix: - -First, I got compile errors in "bstring.h" -and changed it as follows to correct: - line 1104 "::reserve" -> "std::reserve" - line 1110 "::default_size" -> "std::default_size" - -Also, I got an INTERNAL COMPILER ERROR with Visual C++ v4.0 when I did the fol- -lowing: - class xyz : public std::string { } - -I fixed it with: - typedef std::string XyzString; - class xyz : public XyzString { } - --------------------------------- -Changes made to STL distribution --------------------------------- - -These files were modified from the STL distribution shipped with -Microsoft Visual C++ 4.0. The files here are a complete, -working version of the STL. These files have been tested with -MFC applications. - -Changes were made to practically all header files. Look for -comments like: - -*Added by... -*Changed by... - ------------------- -Usage Instructions ------------------- - -Set the preprocessor variable NOMINMAX. - -As Microsoft recommends, the STL is compiled in the std namespace. - -When including these files, do **not** do this: - - namespace std - { - #include <vector.h> - } - -Instead, do this: - - #include <vector.h> - -Recommended usage: - - First, include: - - #include <afxwin.h> - #include <afxext.h> - #include <afxtempl.h> - - Then include the STL header files. - -------------------- -Support for CString -------------------- -The stl.h file contains code written by me. The file contains -operators that will allow you to use CString objects with STL -containers and functions. - -!!!! CString will not work with STL unless you include <stl.h> !!!! - -------------------------------------------- -Helper functions for pointers-in-containers -------------------------------------------- -There is a file called stl.h which contains two functions: - SequenceDelete - MapDelete -These functions send "delete" to all of the objects in a container. - -If you don't like this approach, you can use a supplied "pointer -wrapper" class. - -There is a file called ptr.h which contains a class called Ptr -that can be used exactly like a pointer. The object has a pointer -inside it that points to an object of any class. When a Ptr object -is deleted, "delete" is sent to its underlying pointer. Ptr can be -used with any STL container, as it has a copy constructor and -assignment operator, which transfers "ownership" of the pointer from -the source object to the destination object. Ptr is from the book -Design Patterns by Gamma et al -- see the Proxy pattern. - -The Ptr class makes memory leaks impossible, because it deletes -objects automatically when the container is deleted, or when -functions like "delete" are used. - -Example: - - This is a vector of CStrings: - - std::vector< Ptr<CString> > StringVector; - - StringVector.push_back( Ptr( new CString( "hello" ) ) ); - StringVector.push_back( Ptr( new CString( "This is another string" ) ) ); - ------------------------- -Common Problems with STL ------------------------- - -1) Compiler error: != is ambiguous - - Solution: put the following line at the beginning of the method - that caused the error: - - using namespace std; - -2) When using maps, the debugger crashes. - - This is because symbols for maps (actually, for the "pair") - get truncated to 255 characters. Solution: Turn off the - variables window in the debugger. Don't try to look at - a symbol that has been truncated. This is not an STL-specific - bug -- It's a bug in the debugger. - -3) All sorts of compile errors in STL header files - - Make sure the preprocessor variable NOMINMAX is defined - - -4) Compiler errors about "operator < is not available", etc. - The class involved has global comparison operators. - - Solution: - Write "routers" in the std namespace to the global namespace. - Example (see also stl.h - this is how CString is able - to work with STL): - - namespace std - { - BOOL operator < ( const MyClass & rLhs, - const AnotherClass & rRhs ) - { - return ::operator < ( rLhs, rRhs ); - } - } - - See also 5. - -5) When you use find() or another algorithm, the compiler - complains that it cannot find the == or < operators. - -If your code compiles without any error messages, then disregard -this section. However, if you get errors like "cannot convert -first argument from const class X" then read on. - -I am assuming that your code is calling an STL algorithm like -std::sort() or std::find(). If you're not, I can't help -you. - -There is apparently a bug in the Microsoft compiler regarding -namespaces. Namespaces cannot locate global -functions that reside in the global namespace. For example, -the binary == operator. - -Maybe this is a bug, maybe it isn't. This is not clear -to me. However, I do know what works and have tried many other -approaches that do not work. If you have a better solution I -would appreciate it if you could let me know about it. - -So, if you declare your own class and want to use algorithms -like find() on an STL container, you have two choices: - -(1) Declare == as a member function. -(2) Declare global operators == and !=. - -(1) simply works. There will come a time, however, when (1) -won't satisfy your needs. If A == B, then B == A. You can't -do this using member functions if A and B are from different -classes. - -If you choose (2), you must add the != operator to the std -namespace. There are two ways to do this. First, you can do -this: - namespace std - { - inline operator != ( const MyClass &rLhs, const MyClass &rRhs ) - { - return ::operator != ( rLhs, rRhs ); - } - } -This "routes" != from the std namespace to the global namespace. - -Note that ( lhs != rhs ) can be derived from the == operator -as !( lhs == rhs ). There is a macro in STL.H, -STL_DECLARE_GLOBAL_NE, that does this derivation. -This derivation will not work when for whatever reason, !(lhs == rhs) -is not the same as ( lhs != rhs ). - -The following example shows what you have to do for find(). Other -algorithms require you to declare <, <=, and >= too. See the -macros STL_DECLARE_GLOBAL_GE, STL_DECLARE_GLOBAL_LT, and -STL_GLOBAL_LE. These macros derive new comparison operators -from "operator <( const T&, const T& )". - -class MyClass -{ - public: - - int units; - CString description; -}; - -// We want to be able to test two MyClass objects against each other -// in STL. Need to create a global operator for this purpose. -// Since we use find(), we need to declare not-equal too. -bool operator == ( const MyClass &, const MyClass & ); -STL_DECLARE_GLOBAL_NE( MyClass, MyClass ) - -// These operators test for a matching description. -// We do A == B and B == A to be consistent. -bool operator == ( const MyClass&, const CString & ); -bool operator == ( const CString&, const MyClass & ); -STL_DECLARE_GLOBAL_NE( MyClass, CString ) -STL_DECLARE_GLOBAL_NE( CString, MyClass ) - -6. Errors when creating vectors that have vectors and deques - that have deques. - - Solution: Provide atruments to the constructor. - - std::vector< std::vector<int> > - TwoDimensional( 0, std::vector<int>() ); - diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 2c37693d3e4..f3d7ced978b 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,639 +1,1023 @@ -Mon Apr 23 11:49:01 2001 Joe Hoffert <joeh@cs.wustl.edu> +Mon Apr 23 22:05:56 2001 Carlos O'Ryan <coryan@uci.edu> - * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp: - Added a sanity check for the length of sequences not to exceed - the length of the stream - cf. bug 58. + * examples/PluggableUDP/DIOP/DIOP_Transport.cpp: + * examples/PluggableUDP/DIOP/DIOP_Transport.h: + * examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp: + Update to match the new Transport classes. -Mon Apr 23 10:40:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> + * tao/IIOP_Transport.cpp: + Cosmetic fixes - * tests/MT_Timeout/client.cpp: - * tests/MT_Timeout/Client_Task.cpp: - * tests/MT_Timeout/Client_Taks.h: +Mon Apr 23 21:10:40 2001 Carlos O'Ryan <coryan@uci.edu> - Made the test more smart and tolerant regarding scheduling jitters. - The test now checks how many calls have taken too long to return - and prints warnings, or even errors in the case more than 5 % of - the calls have taken too long. Thanks to Carlos for his suggestions. - -Mon Apr 23 00:45:00 2001 Craig Rodrigues <crodrigu@bbn.com> + * tests/AMI_Buffering/client.cpp: + * tests/Big_Oneways/Coordinator.cpp: + * tests/Big_Twoways/Coordinator.cpp: + Fixed ACE_CHECK/ACE_TRY_CHECK mismatches. - * orbsvcs/tests/AVStreams/*/Makefile - All AVStreams tests now depend on libACE_QoS.so (even if they - do not use QoS), because libTAO_AV.so links against libACE_QoS.so - if QoS was enabled. - libACE_QoS.so should only be conditionally linked in. - (Check if rapi=1) +Mon Apr 23 16:40:07 2001 Carlos O'Ryan <coryan@uci.edu> -Sun Apr 22 19:59:06 2001 Carlos O'Ryan <coryan@uci.edu> + * tao/Transport.h: + * tao/Transport.cpp: + * tao/Reactive_Flushing_Strategy.cpp: + The schedule_output() and cancel_output() methods are invoked + while the handle_mutex_ is held, so there is no need to grab it + again. + The methods are renamed schedule_output_i() and + cancel_output_i() and they are made private, because only the + Reactive_Flushing_Strategy should invoke them. - * orbsvcs/orbsvcs/AV/Transport.cpp: - Removed unused variable. + * tao/Transport.cpp: + * tao/PortableServer/Object_Adapter.cpp: + Move the instantiation of ACE_Reverse_Lock<ACE_Lock> to the + Transport.cpp file. -Sun Apr 22 19:44:02 2001 Carlos O'Ryan <coryan@uci.edu> + * tests/AMI/muxed.conf: + * tests/AMI/exclusive.conf: + Fixed use of obsolete options - * tests/Oneway_Buffering/README: - Too much cut & paste in the documentation. + * tests/AMI/run_test.pl: + Cosmetic fixes -Sun Apr 22 16:44:12 2001 Carlos O'Ryan <coryan@uci.edu> +Mon Apr 23 11:54:23 2001 Carlos O'Ryan <coryan@uci.edu> - * tao/Pluggable_Messaging_Utils.cpp: - Use default constructor for the IOP::ServiceContextList instead - of the constructor taking the maximum size hint. This solves - [BUGID:876] + * tests/AMI_Buffering/AMI_Buffering.dsw: + * tests/AMI_Buffering/admin.dsp: + * tests/AMI_Buffering/client.dsp: + * tests/AMI_Buffering/server.dsp: + Add MSVC project files for this test -Sun Apr 22 16:27:20 2001 Ossama Othman <ossama@uci.edu> +Mon Apr 23 11:47:07 2001 Carlos O'Ryan <coryan@uci.edu> - * tao/TAO_Server_Request.i (operation): + * tests/AMI_Buffering/Client_Task.h: + * tests/AMI_Buffering/Client_Task.cpp: + * tests/AMI_Buffering/client.cpp: + The client event loop can be explicitly terminated now. - This method is now basically a wrapper around the - ACE_CString::set() method. This change makes it easier to - control whether or not the TAO_ServerRequest object should copy - the operation name string. [Bug 870] + * tests/AMI_Buffering/run_timeout_reactive.pl: + Add new driver script for timeout based flushing, but initiated + via the Reactor. - * tao/TAO_Server_Request.cpp (TAO_ServerRequest): + * tests/Oneway_Buffering/client.cpp: + Renamed the second part of the test, 'liveness' is a more + descriptive term. - This constructor now accepts a "const char *" instead of an - ACE_CString. There is no longer any need to use an ACE_CString. +Mon Apr 23 10:38:28 2001 Carlos O'Ryan <coryan@uci.edu> - (_tao_send_reply_exception): + * tests/AMI_Buffering/svc.conf: + Without connection muxing the test runs out of resources pretty + fast, plus flushing does not work exactly as expected. - Initialize the static buffer using aggregate initialization - instead of memset(). It's cleaner. + * tests/AMI_Buffering/Client_Task.h: + * tests/AMI_Buffering/Client_Task.cpp: + Add thread on the client to invoke the reply handler. Without + this feature the ORB would soon dead-lock. - * tao/GIOP_Message_Generator_Parser_10.cpp (parse_request_header): - * tao/GIOP_Message_Generator_Parser_12.cpp (parse_request_header): - * tao/GIOP_Message_Lite.cpp (parse_request_header): +Mon Apr 23 10:03:31 2001 Carlos O'Ryan <coryan@uci.edu> - Don't bother creating a temporary ACE_CString. Just pass the - operation name string to The TAO_ServerRequest object. - TAO_ServerRequest now does the "Right Thing"tm in terms of - managing the operation name string. This removes one heap - allocation from the criticial path (i.e. zero allocations in the - common case (no character set translator) and one allocation in - the case where a character set translator is used). [Bug 870] + * tao/Transport.h: + * tao/Transport.inl: + * tao/Transport.cpp: + Reduce locking overhead by sharing the event handler mutex and + the queue mutex. Since we need to lock the queue just before we + do any I/O it is a very natural fit, and saves us one mutex + per-call. - * tao/LocalObject.cpp: +Sun Apr 22 19:54:09 2001 Carlos O'Ryan <coryan@uci.edu> - Removed inclusion of "ace/Auto_Ptr.h." There was no need to - include it. + * tao/TAO.dsp: + Update list of files. - (_hash): +Sun Apr 22 19:32:55 2001 Carlos O'Ryan <coryan@uci.edu> - Implemented this method. Simply base the hash on the address of - the object. + * tests/README: + * tests/Makefile: + * tests/Makefile.bor: + * tests/AMI_Buffering/README: + * tests/AMI_Buffering/Makefile: + * tests/AMI_Buffering/Makefile.bor: + * tests/AMI_Buffering/admin.bor: + * tests/AMI_Buffering/client.bor: + * tests/AMI_Buffering/server.bor: + * tests/AMI_Buffering/run_test.pl: + * tests/AMI_Buffering/run_timeout.pl: + * tests/AMI_Buffering/run_buffer_size.pl: + * tests/AMI_Buffering/run_message_count.pl: + * tests/AMI_Buffering/Test.idl: + * tests/AMI_Buffering/AMI_Buffering.h: + * tests/AMI_Buffering/AMI_Buffering.cpp: + * tests/AMI_Buffering/AMI_Buffering_Admin.h: + * tests/AMI_Buffering/AMI_Buffering_Admin.cpp: + * tests/AMI_Buffering/Reply_Handler.h: + * tests/AMI_Buffering/Reply_Handler.cpp: + * tests/AMI_Buffering/admin.cpp: + * tests/AMI_Buffering/client.cpp: + * tests/AMI_Buffering/server.cpp: + +Fri Apr 20 15:29:13 2001 Carlos O'Ryan <coryan@uci.edu> * tao/Makefile: - * tao/*/Makefile: + * tao/Makefile.bor: + * tao/Queued_Message.h: + * tao/Transport.h: + * tao/Transport.inl: + * tao/Transport.cpp: + * tao/Transport_Timer.h: + * tao/Transport_Timer.cpp: + Add support for timeout notifications from the Reactor. This is + used to implement the TIMEOUT buffering constraints when the + application does not send events continously. - Updated dependencies. + * tests/Oneway_Buffering/client.cpp: + * tests/Oneway_Buffering/run_test.pl: + * tests/Oneway_Buffering/run_timeout_reactive.pl: + Add new regression test to verify that the TIMEOUT buffering + constraints work. -Sun Apr 22 14:00:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> +Thu Apr 19 14:17:38 2001 Carlos O'Ryan <coryan@uci.edu> - * examples/PluggableUDP/DIOP/DIOP_Connector.cpp: - * examples/PluggableUDP/DIOP/DIOP_Connector.h: + * tao/Transport.h: + * tao/Transport.cpp: + Factor out common code in drain_queue_i() into + drain_queue_helper(). + Factor out code in send_message_queue(), incidentally + send_message_queue() did not grab the queue lock, fixed that + oversight. + Made TAO_Block_Flushing_Strategy a friend class to access a + couple of _i() methods. + + * tao/Synch_Queued_Message.cpp: + Sometimes the message block chain contain trailing empty + elements. Those elements must be skipped, otherwise the + current_block_ field never becomes 0, even though there is no + more data to send. - Fixed a compiler warning about pragma once by reordering - includes. Thanks to Carlos for reporting this. + * tao/Block_Flushing_Strategy.cpp: + In the blocking flush strategy we need to drain the queue as + soon as schedule_output() is called, otherwise it is possible + that the queue will never be drained. - * examples/PluggableUDP/tests/Basic/run_test.pl: + * tests/Queued_Message_Test/Queued_Message_Test.cpp: + Use the TAO_Async_Queued_Message class for the test, the base + class is abstract now. - Extended the time to wait for the test. + * tests/Oneway_Buffering/client.cpp: + Initialize payload with non-zero bytes for easier debugging -Sat Apr 21 19:33:43 2001 Carlos O'Ryan <coryan@uci.edu> + * tests/LongWrites/Makefile: + Add files missed during the merge - * tao/Environment.h: - * tao/Environment.i: - * tao/Environment.cpp: - Remove the reference count, this allow us to eliminate the - creation (and destruction) of 3 locks on the server's critical - path. This fixes [BUGID:873] + * tests/Big_Request_Muxing/Makefile: + Update dependencies -Sat Apr 21 19:30:35 2001 Nanbor Wang <nanbor@cs.wustl.edu> + * tests/Big_Request_Muxing/client.cpp: + Made request payload smaller, it was taking too long to run + otherwise. - * orbsvcs/tests/Trading/TradingLib.dsp: Fixed the library output - directory to conform with our pattern. + * tests/Big_Request_Muxing/Client_Task.cpp: + Made the test less verbose -Sat Apr 21 16:08:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> + * tests/Makefile: + Add a couple of missing tests Big_Twoways and Big_Request_Muxing - * examples/PluggableUDP/tests/Performace/UDP_PerformanceClient.cpp: - * examples/PluggableUDP/tests/Performace/UDP_i.cpp: + * performance-tests/Latency/client.conf: + Made output path blocking, using reactive out with blocking + input does not quite work. - Fixed the test output. + * examples/Buffered_AMI/test.idl: + * tests/Reliable_Oneways/Test.idl: + * tests/Blocking_Sync_None/Test.idl: + Made shutdown() operation a twoway. -Sat Apr 21 05:50:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> + * examples/Buffered_AMI/client.cpp: + Change ReplyHandler to receive the shutdown() callback. - * examples/PluggableUDP/DIOP/DIOP_Connector.cpp: + * tests/Muxing/run_test.pl: + * examples/Buffered_AMI/run_test.pl: + Increased wait time for the IOR file. - Fixed a template instantiation problem. +Tue Apr 17 19:12:31 2001 Carlos O'Ryan <coryan@uci.edu> -Sat Apr 21 05:05:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> + * tao/Transport.cpp: + Reset the current deadline as soon as the queue is empty. - * examples/PluggableUDP/DIOP/DIOP_Acceptor.cpp + * tao/Sync_Strategies.cpp: + Add debugging messages - Fixed memory mangement of connection handlers. + * tao/Makefile: + * tao/Message_Sent_Callback.h: + * tao/Message_Sent_Callback.inl: + * tao/Message_Sent_Callback.cpp: + * tao/Queued_Message.h: + * tao/Queued_Message.cpp: + Removed the TAO_Message_Sent_Callback class, it was not required + at all. - * examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp + * tao/Strategies/UIOP_Transport.cpp: + Add missing function (removed during the merge). - Fixed a bug which caused the reactor to call us infinitely. +Tue Apr 17 14:21:23 2001 Carlos O'Ryan <coryan@uci.edu> - * examples/PluggableUDP/DIOP/TAO_DIOP.dsw: + * tao/Queued_Message.h: + * tao/Asynch_Queued_Message.h: + * tao/Asynch_Queued_Message.cpp: + * tao/Synch_Queued_Message.h: + The bytes_transferred() method does not need to return anything, + the return value was ignored anyway, so change it to return + void. - Added dependencies correctly. + * tao/Synch_Queued_Message.cpp: + Fixed implementation of bytes_transferred(), the byte_count + argument was not updated on all exit branches. - * examples/PluggableUDP/tests/Basic/client.cpp: + * tao/GIOP_Message_Handler.cpp: + Fixed inconsistency with main trunk. - Fixed a race condition when the client would shutdown. + * tao/Sync_Strategies.cpp: + Set the must_flush and set_timer flags to zero if there is no + buffering constraint policy. - * examples/PluggableUDP/tests/Basic/svc.conf + * tao/Transport.cpp: + Cosmetic fixes. Return 1 from drain_queue_i() even if the flush + operation returned 0, the return value is supposed to represent + what happened to the message, not if there was a generic problem + with the ORB. - Added the thread pool reactor as the reactor. +Tue Apr 17 09:59:38 2001 Carlos O'Ryan <coryan@uci.edu> - * examples/PluggableUDP/tests/SimplePerformance/client.cpp: + * tao/Sync_Strategies.h: + * tao/Sync_Strategies.cpp: + Add an argument in buffering_constraints_reached(), this new + argument represents the current deadline for the transport. + The current deadline is used to determine if the timer needs to + be reset or if the timer has already expired. + Unless the flushing strategy is turned on we need to check the + timers on all exit paths. - Added a line invoking shutdown on the server. + Change TAO_Transport_Sync_Strategy to *always* flush and always + schedule output on every request. -Sat Apr 21 01:45:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> + * tao/Transport.h: + * tao/Transport.cpp: + Use the new interface in the sync strategies to activate the + output as soon as the timer expires. Keep track of the current + deadline for scheduling output. + Fixed boundary condition in drain_queue_i(), there is a while() + loop to fill iovecs with the contents of the queue, it is + possible to exit the loop without anything in the iovec. In + this case we don't want to attempt a send() call. + Remove unused argument from the send_synchronous_message_i() + method. - * examples/PluggableUDP/DIOP/DIOP_Transport.cpp: +Sat Apr 14 17:04:21 2001 Carlos O'Ryan <coryan@uci.edu> - Removed debug messages. + * tao/Transport.cpp (send_synchronous_message_i): + The message was left in the queue even if a problem was detected + in the write() operation. -Sat Apr 21 01:35:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> +Sat Apr 14 17:01:05 2001 Carlos O'Ryan <coryan@uci.edu> - * examples/PluggableUDP/tests/Performance/Makefile: - * examples/PluggableUDP/tests/Basic/Makefile: - * examples/PluggableUDP/tests/SimplePerformance/Makefile: + * tao/TAO.dsp: + Complete merge for Win32, CVS' automatic merge was not quite the + right thing for this file. - Fixed the Makfiles to properly compile and link. + * tao/BiDir_Policy_i.cpp: + This file was removed in the main trunk but was accidentally + resurrected during the merge. -Sat Apr 21 01:20:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> +Sat Apr 14 12:59:39 2001 Carlos O'Ryan <coryan@uci.edu> - * examples/PluggableUDP/tests/Performance/UDP_i.cpp: - * examples/PluggableUDP/tests/Performance/server.cpp: - * examples/PluggableUDP/tests/Performance/PerformanceClient.cpp: + * tao/Block_Flushing_Strategy.h: + * tao/Block_Flushing_Strategy.cpp: + * tao/Flushing_Strategy.h: + * tao/Flushing_Strategy.cpp: + * tao/Message_Sent_Callback.h: + * tao/Message_Sent_Callback.inl: + * tao/Message_Sent_Callback.cpp: + * tao/Queued_Message.h: + * tao/Queued_Message.inl: + * tao/Queued_Message.cpp: + * tao/Reactive_Flushing_Strategy.h: + * tao/Reactive_Flushing_Strategy.cpp: + Add files lost during merge - Fixed compiler warnings. + * tao/IIOP_Transport.cpp: + Solve merging problems. -Sat Apr 21 00:47:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> + * tests/Big_Oneways/Makefile: + * tests/Big_Twoways/Makefile: + Update dependencies - * examples/PluggableUDP/tests/SimplePerformance/run_test.pl: - * examples/PluggableUDP/tests/SimplePerformance/server.cpp: - * examples/PluggableUDP/tests/Basic/run_test.pl: - * examples/PluggableUDP/tests/Basic/server.cpp: - * examples/PluggableUDP/tests/Performance/run_test.pl: - * examples/PluggableUDP/tests/Performance/server.cpp: +Sat Apr 14 10:33:47 2001 Carlos O'Ryan <coryan@uci.edu> - Fixed some confusion between ior file names. + * Another merge for the bug 132 fixes. -Sat Apr 21 00:40:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> + Fri Apr 13 18:49:32 2001 Carlos O'Ryan <coryan@uci.edu> - * examples/PluggableUDP/tests/SimplePerformance/run_test.pl: + * tao/Flushing_Strategy.h: + * tao/Block_Flushing_Strategy.h: + * tao/Block_Flushing_Strategy.cpp: + * tao/Reactive_Flushing_Strategy.h: + * tao/Reactive_Flushing_Strategy.cpp: + Add timeout to the flush_message() operation. - Added this perl script. + * tao/Transport.cpp: + Use the new timeout of flush_message() to implement timeouts + for twoways blocked during writes. -Fri Apr 20 21:29:38 2001 Nanbor Wang <nanbor@cs.wustl.edu> + * tao/Queued_Message.h: + * tao/Queued_Message.cpp: + Add method to insert message at the head of the queue. - * TAO/tao/Client_Strategy_Factory.cpp: - * TAO/tao/Client_Strategy_Factory.h: - * TAO/tao/default_client.cpp: - * TAO/tao/default_client.h: - Added a new method <allow_callback> that query the strategy - factory whether the effective wait strategy allows any form of - callback. + * tao/Synch_Queued_Message.h: + * tao/Synch_Queued_Message.cpp: + Add accessor to obtain the current message block. - * TAO/tao/Strategies/SHMIOP_Acceptor.cpp (open): - * TAO/tao/Strategies/SHMIOP_Connector.cpp (open): Added code to - hint the MEM_Stream's to use the new multithreaded transport when - the client/server strategies allow them to. + Thu Apr 12 20:15:22 2001 Carlos O'Ryan <coryan@uci.edu> -Fri Apr 20 16:13:40 2001 Yamuna Krishnamurthy <yamuna@cs.wustl.edu> + * tao/Sync_Strategies.h: + * tao/Sync_Strategies.cpp: + Use two separate flags to return if: + (1) the queue should be immediately flushed + (2) and/or the ORB should start draining the queue - * orbsvcs/orbsvcs/Makefile.av: - * orbsvcs/orbsvcs/AV/AVStreams_i.h: - * orbsvcs/orbsvcs/AV/AVStreams_i.i: - * orbsvcs/orbsvcs/AV/AVStreams_i.cpp: - * orbsvcs/orbsvcs/AV/Transport.cpp: - * orbsvcs/orbsvcs/AV/AV_Core.h: - * orbsvcs/orbsvcs/AV/AV_Core.cpp: - * orbsvcs/orbsvcs/AV/UDP.cpp: - * orbsvcs/orbsvcs/AV/QoS_UDP.cpp: - * orbsvcs/orbsvcs/AV/QoS_UDP.h: - * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp: - * orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h: - * orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp: + * tao/Transport.h: + * tao/Transport.cpp: + Use the new interface in TAO_Sync_Strategy to correctly + implement TAO::BUFFER_MESSAGE_COUNT and the TAO::BUFFER_SIZE + buffering constraint policies. - Integrated AQoSA and AVStreams for the UDP unicast protocol. This allows - to set up an RSVP session between the sender and receiver using AQoSA. + Wed Apr 11 10:21:35 2001 Carlos O'Ryan <coryan@uci.edu> - * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile: - * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/README: - * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/runtest.pl: - * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/input: - * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Simple_Two_Stage_With_QoS.dsw: - * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h: - * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp: - * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.dsp: - * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h: - * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp: - * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.dsp: + * With the following changes the semantics of oneways are + bug-compatible with the main trunk. - Test to verify the AQoSA/AV integration. + * tao/Transport.cpp: + Add new method to check if the transport queue has any data + pending. -Fri Apr 20 14:39:48 2001 Ossama Othman <ossama@uci.edu> + * tao/Flushing_Strategy.h: + Add new operation to block until the queue becomes completely + empty. - * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp - (handle_close): - * examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp - (handle_close): + * tao/Block_Flushing_Strategy.h: + * tao/Block_Flushing_Strategy.cpp: + * tao/Reactive_Flushing_Strategy.h: + * tao/Reactive_Flushing_Strategy.cpp: + Implement flush_transport() in each concrete strategy. - Call destroy() on the Svc_Handler rather than calling "delete - this." See ChangeLog entry from Tue Apr 17 15:48:20 2001 - Nanbor Wang <nanbor@cs.wustl.edu>. + * tao/Transport.h: + Remove old code that was commented out anyway. -Fri Apr 20 15:51:52 2001 Paul Calabrese <calabrese_p@ociweb.com> + Mon Apr 09 00:41:20 2001 Carlos O'Ryan <coryan@uci.edu> - * docs/ec_options.html: - * docs/cec_options.html: + * tao/Invocation.cpp: + The default scope should be SYNC_WITH_TRANSPORT, but was + overriden and became SYNC_NONE. - Update the documentation to better reflect reality. Includes - the following changes: + * tao/Reactive_Flushing_Strategy.cpp: + Fixed conditions to terminate the loop. - - Reformat collection option table for readability - - Remove the UNIMPLEMENTED tag from COPY_ON_WRITE - - Add the missing attributes - - Add discussion of TAO_EC_Sched_Factory - - Mark TAO_EC_Sched_Factory option values as such - - Add missing option (-ECProxyPushSupplierCollection) - - Fix some typos + * tao/Transport.cpp: + Initialize byte_count to zero before calling send(), add more + ACE_ASSERT() calls to debug the system. -Fri Apr 20 16:00:40 2001 Angelo Corsaro <corsaro@cs.wustl.edu> + Sat Apr 7 21:13:48 2001 Carlos O'Ryan <coryan@uci.edu> - * examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp: - * examples/PluggableUDP/DIOP/DIOP_Connector.cpp: - Added missing explicit template instatiation to fix the - problem on compiler that use explicit template instantiation. + * tao/Transport.cpp: + Separate the path for synchronous and asynchronous requests more + cleanly. + Merge the close_connection() changes from the main trunk, the + ORB was dead-locking on me. + Improve output for sent iovectors, now it is only generated if + TAO_debug_level==2 and the Log_Msg is locked to prevent other + threads from dumping the same messages. -Fri Apr 20 08:17:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> + * tao/Transport.cpp (drain_queue_i): + New method used by the synchronous path to send data ASAP. - * examples/PluggableUDP/DIOP/DIOP_Connector.cpp: + * tao/Invocation.h: + * tao/Invocation.cpp (invoke): + Clarify the semantics of the <twoway_flag> argument, actually it + means that the ORB should wait until the data is delivered to + the wire. + Oneway invocations with the SYNC_WITH_TRANSPORT policy should + block until the data is delivered to the wire. - Fixed template instantiation problems. + * tao/GIOP_Message_Handler.cpp: + Only print the full contents of the received data when the debug + level is *exactly* 2. -Thu Apr 19 23:30:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> + * tests/Big_Oneways/Session.cpp: + Fill up the messages with a repeating pattern, this is useful + during debugging. - * examples/PluggableUDP/DIOP/DIOP_Acceptor.h: - * examples/PluggableUDP/DIOP/DIOP_Acceptor.cpp: - * examples/PluggableUDP/DIOP/DIOP_Connector.h: - * examples/PluggableUDP/DIOP/DIOP_Connector.cpp: - * examples/PluggableUDP/DIOP/DIOP_Factory.h: + Thu Apr 05 10:36:57 2001 Carlos O'Ryan <coryan@uci.edu> - Removed unused dependencies to ACE headers and - removed dead code. + * tao/Queued_Message.h: + Remove the declaration of the done() method, the semantics were + not clear and it was removed a couple of iterations ago. -Thu Apr 19 14:40:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> + * tao/Block_Flushing_Strategy.cpp: + * tao/Reactive_Flushing_Strategy.cpp: + Wait until all_data_sent() returns. - * examples/PluggableUDP/tests/Basic/run_test.pl: - * examples/PluggableUDP/tests/Performance/run_test.pl: + * tao/Transport.cpp: + Cleanup handle_output() no need to loop, the drain_queue() + method does that. + After trying to send a message and blocking the send_message_i() + method was not updating the new Asynch_Queued_Message with the + number of bytes sent. + drain_queue() loop was too complicated for its own sake. - Fixed the path settings. + * tests/Big_Oneways/Session.h: + * tests/Big_Oneways/Test.idl: + * tests/Big_Oneways/Session.cpp: + Add methods to prime the connections among multiple clients. - * examples/PluggableUDP/tests/SimplePerformance/run_test.pl: + * tests/Big_Oneways/server.cpp: + Increase timeout for initial session registration. Important + for manual executions. - Added the perl script. + Wed Apr 4 10:53:27 2001 Carlos O'Ryan <coryan@uci.edu> - * examples/PluggableUDP/tests/Basic/server.dsp: - * examples/PluggableUDP/tests/Basic/client.dsp: + * tao/Transport.h: + * tao/Transport.cpp: + Remove dead code. + Rename some methods to more clearly reflect their intent. + Simplify the management for the outgoing data queue. The + cleanup_queue() method removes any element that is completely + sent, while the drain_queue() method simply tries to send as + much data as possible. - Changed the name as it appears in the workspace slightly. + * tao/Queued_Message.h: + * tao/Queued_Message.inl: + * tao/Queued_Message.cpp: + Each derived class can decided if the message has been + completely sent very efficiently, no need to keep a local + variable for that. + We do need variables to keep track of closed connections, failed + sends and timeouts. -Thu Apr 19 07:09:30 2001 Balachandran Natarajan <bala@cs.wustl.edu> + * tao/Messaging_Policy_i.cpp: + * tao/Invocation.cpp: + Improved debugging messages for timeouts - * tests/RTCORBA/Thread_Pool/server.cpp: Fixed a typo that was - giving a warning. + Sun Apr 01 15:34:32 2001 Carlos O'Ryan <coryan@uci.edu> -Wed Apr 18 23:00:07 2001 Nanbor Wang <nanbor@cs.wustl.edu> + * tao/Makefile: + * tao/TAO.dsp: + * tao/TAO_Static.dsp: + * tao/Asynch_Queued_Message.h: + * tao/Asynch_Queued_Message.cpp: + * tao/Synch_Queued_Message.h: + * tao/Synch_Queued_Message.cpp: + * tao/Queued_Message.h: + * tao/Queued_Message.inl: + * tao/Queued_Message.cpp: + Specialize the Queue_Message class for Synchronous and + Asynchronous messages. Their behavior is completely different: + synchronous messages (twoways and reliable oneways) are + allocated from the stack, they should not copy the CDR stream + and thus have to deal with message block chains. + Asynchronous messages (oneways and AMIs with SYNC_NONE policy) + are allocated from the heap, they must copy their data and thus + can reassemble it in a single buffer. - * tests/Collocation/Collocation.bor: Changed main.obj to - Collocation.obj. + * tao/Transport.h: + * tao/Transport.cpp: + Changed the transport to use the new interface in the + Queued_Message class. + Completely separate the synchronous and asynchronous operation + path. + The new implementation recovers some functionality lost in + previous revisions: multiple messages can be sent in a single + iovector. -Wed Apr 18 21:57:46 2001 Jeff Parsons <parsons@cs.wustl.edu> + * tests/Big_Oneways/Test.idl: + * tests/Big_Oneways/Session.h: + * tests/Big_Oneways/Session.cpp: + Add ping() operation to the Session IDL interface. + This is used to validate the session during startup, i.e. ensure + that enough connections are available for all the threads. - * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp: + Sat Mar 31 14:56:37 2001 Carlos O'Ryan <coryan@uci.edu> - Recent changes to this files necessitated a change in the - way the visitor's context's scope parameter is set. + * tao/Transport.cpp: + Fixed memory management and synchronization problems. + Invoke the connection_closed() method on all the pending + messages if the connection is closed. -Wed Apr 18 21:38:35 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + * tao/Queued_Message.h: + * tao/Queued_Message.inl: + * tao/Queued_Message.cpp: + If the connection is closed there is no sense in trying to + continue sending the message. + The done() method returns 1 if the connection was closed or if + the message was completely sent. - * orbsvcs/Naming_Service: Updated the README file so that it explains - how to trouble shoot problems with multicast. Thanks to Stephen - Torri <s.torri@lancaster.ac.uk> for contributing this. + * tao/Reactive_Flushing_Strategy.cpp: + Propagate any errors from Transport::schedule_output() and + Transport::cancel_output() -Wed Apr 18 19:17:37 2001 Carlos O'Ryan <coryan@uci.edu> + * tests/Big_Request_Muxing/Big_Request_Muxing.dsw: + * tests/Big_Request_Muxing/client.dsp: + * tests/Big_Request_Muxing/server.dsp: + Add MSVC project files - * performance-tests/Makefile: - * performance-tests/Makefile.bor: - * performance-tests/Throughput/Makefile: - * performance-tests/Throughput/Makefile.bor: - * performance-tests/Throughput/README: - * performance-tests/Throughput/Receiver.cpp: - * performance-tests/Throughput/Receiver.h: - * performance-tests/Throughput/Receiver_Factory.cpp: - * performance-tests/Throughput/Receiver_Factory.h: - * performance-tests/Throughput/Test.idl: - * performance-tests/Throughput/client.bor: - * performance-tests/Throughput/client.cpp: - * performance-tests/Throughput/run_test.pl: - * performance-tests/Throughput/server.bor: - * performance-tests/Throughput/server.cpp: - * performance-tests/Throughput/svc.conf: - * performance-tests/Thruput/*: - Remove the old Thruput test and replaced it with a simpler - test. The new test can be put in the nightly regression test - and it would be easy to extract performance number for the - performance metrics charts. - -Wed Apr 18 17:06:42 2001 Jeff Parsons <parsons@cs.wustl.edu> - - * TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h: - * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp: + Fri Mar 30 17:06:33 2001 Carlos O'Ryan <coryan@uci.edu> - Checking in changes of + * tests/README: + * tests/Big_Request_Muxing/README: + * tests/Big_Request_Muxing/Test.idl: + * tests/Big_Request_Muxing/run_test.pl: + * tests/Big_Request_Muxing/Makefile: + * tests/Big_Request_Muxing/Client_Task.h: + * tests/Big_Request_Muxing/Client_Task.cpp: + * tests/Big_Request_Muxing/Payload_Receiver.h: + * tests/Big_Request_Muxing/Payload_Receiver.cpp: + * tests/Big_Request_Muxing/client.cpp: + * tests/Big_Request_Muxing/server.cpp: + * tests/Big_Request_Muxing/svc.conf: + Another regression tests, use the same connection to the big + oneways at different levels of reliability. - Wed Apr 18 15:24:57 2001 Jeff Parsons <parsons@cs.wustl.edu> + * tests/README: + * tests/Big_Twoways/README: + * tests/Big_Twoways/Test.idl: + * tests/Big_Twoways/run_test.pl: + * tests/Big_Twoways/Makefile: + * tests/Big_Twoways/Coordinator.h: + * tests/Big_Twoways/Coordinator.cpp: + * tests/Big_Twoways/Peer.h: + * tests/Big_Twoways/Peer.cpp: + * tests/Big_Twoways/Session.h: + * tests/Big_Twoways/Session.cpp: + * tests/Big_Twoways/Session_Control.h: + * tests/Big_Twoways/Session_Control.cpp: + * tests/Big_Twoways/Session_Task.h: + * tests/Big_Twoways/Session_Task.cpp: + * tests/Big_Twoways/client.cpp: + * tests/Big_Twoways/server.cpp: + Another regression test, similar to Big_Oneways, but this one + uses a long request *and* a long reply. - once again. + * tests/LongWrites/Sender.cpp: + Fixed warning about unused variable - * TAO_IDL/ast/ast_exception.cpp (in_recursion): - * TAO_IDL/ast/ast_union.cpp (in_recursion): + * tests/LongWrites/Makefile: + Fixed Makefile - Removed some bogus error messages. The corresponding one - for ast_structure.cpp has already been removed. + * tests/Timeout/client.cpp: + Verify that at least some of the messages timeout and others + complete the test successfully. -Wed Apr 18 16:28:39 2001 Jeff Parsons <parsons@cs.wustl.edu> + Thu Mar 29 08:38:42 2001 Carlos O'Ryan <coryan@uci.edu> - * TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h: - * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp: + * tao/IIOP_Transport.cpp: + * tao/Strategies/SHMIOP_Transport.cpp: + * tao/Strategies/UIOP_Transport.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp: + Do not close the connection if it sends 0 bytes. This is + perfectly possible when using non-blocking I/O. - Reverted change below until I can find the problem it - was causing with normal running of the IDL compiler. + Wed Mar 28 10:42:12 2001 Carlos O'Ryan <coryan@uci.edu> -Wed Apr 18 15:24:57 2001 Jeff Parsons <parsons@cs.wustl.edu> + * Another merge for the branch fixing bug 132 - * TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h: - * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp: + Tue Mar 20 09:34:53 2001 Carlos O'Ryan <coryan@uci.edu> - Fixed typecode generation for structs and exceptions - that have an enum defined inside. The enum member names - were inserted into the typecode and added to the member - count. Thanks to Tom Lake <Tom.Lake@glossa.co.uk> for - reporting the problem. + * tao/Transport.cpp: + Improved error checking for Queued_Message allocations. -Wed Apr 18 12:10:54 2001 Balachandran Natarajan <bala@cs.wustl.edu> + Sat Mar 17 17:52:27 2001 Carlos O'Ryan <coryan@uci.edu> - * tao/GIOP_Message_Handler.cpp (read_messages): Reverted the - change from this "Wed Apr 18 10:56:30 2001 Balachandran - Natarajan <bala@cs.wustl.edu>". Going over the fix from - scratch as the fix is wrong. + * tao/Transport.h: + * tao/Transport.cpp: + Removed the current_message_ field, using the head of the queue + works just as well, at least as long as we always push events to + the end of the queue. -Wed Apr 18 10:56:30 2001 Balachandran Natarajan <bala@cs.wustl.edu> + * tao/IIOP_Transport.h: + * tao/IIOP_Transport.cpp: + * tao/Reactive_Flushing_Strategy.cpp: + Use the Flushing Strategy to schedule output and cancel output + with the reactor. - * tests/BiDirectional_NestedUpcall/run_test.pl: Fixed the - run_test.pl script. Thanks to Carlos for pointing out that this - script does not work. + Sat Mar 17 15:34:14 2001 Carlos O'Ryan <coryan@uci.edu> -Wed Apr 18 10:28:16 2001 Balachandran Natarajan <bala@cs.wustl.edu> + * tests/Big_Oneways/Session.h: + * tests/Big_Oneways/Session.cpp: + Fixed signed/unsigned warnings - * tao/GIOP_Message_Handler.cpp: Added an extra check for errno == - EAGAIN. After a read, if the errno is set to EAGAIN, a value of - 0 was returned to the reactor. This was because errno values of - EAGAIN and EWOULDBLOCK are same. This made the reactor call the - handle_input () again and again. Every call would return a 0 - with errno set to EAGAIN. Thanks to Jody Hagins - <jody@atdesk.com> for coming up with a test case that - demonstrated the problem. Need to check the test case in with - some modifications. + * tests/Big_Oneways/Coordinator.cpp: + Print error messages in all exception cases - * tao/GIOP_Message_Base.cpp: Made some cosmetic fixes. + * tests/Big_Oneways/run_test.pl: + Run 3 peers to cause failures. -Wed Apr 18 10:28:53 2001 Jeff Parsons <parsons@cs.wustl.edu> + Fri Mar 16 15:49:26 2001 Carlos O'Ryan <coryan@uci.edu> - * TAO_IDL/be_be_visitor_union/union_cs.cpp: + * tao/IIOP_Transport.cpp: + Fixed debugging message for cancel_output. - Added check for self-assignment in code generation for - assignment operator. The lack of the check caused not - only inefficiency, but also a crash if the union's - active member is a pointer type, since the code - deallocates the old member first. Thanks to - Uwe Jäger <jaeger@varial.de> for pointing out the missing - check. + * tests/Big_Oneways/Big_Oneways.dsw: + * tests/Big_Oneways/client.dsp: + * tests/Big_Oneways/server.dsp: + Fixed project files, the first version commited missed some + changes. -Wed Apr 18 09:44:15 2001 Balachandran Natarajan <bala@cs.wustl.edu> + Thu Mar 15 10:46:52 2001 Carlos O'Ryan <coryan@uci.edu> - * tao/Leader_Follower.h: Added TAO_Export macros. Looks to me that - this should take care of link errors on Win32. + * tests/Big_Oneways/Makefile: + * tests/Big_Oneways/Test.idl: + * tests/Big_Oneways/run_test.pl: + * tests/Big_Oneways/Coordinator.h: + * tests/Big_Oneways/Coordinator.cpp: + * tests/Big_Oneways/Peer.h: + * tests/Big_Oneways/Peer.cpp: + * tests/Big_Oneways/Session.h: + * tests/Big_Oneways/Session.cpp: + * tests/Big_Oneways/client.cpp: + * tests/Big_Oneways/server.cpp: + Changed the test to work more predictably on multi-CPU boxes. + The sessions are configured at creation time, and they don't + start sending events until start() is called. + Instead of automatically destroy them on shutdown we wait until + they all stop and then explicitly use a destroy() method to take + them down. -Wed Apr 18 08:49:42 2001 Irfan Pyarali <irfan@cs.wustl.edu> + Tue Mar 13 15:08:06 2001 Carlos O'Ryan <coryan@uci.edu> - * tests/RTCORBA/Thread_Pool/server.cpp (main): - * tests/RTCORBA/Thread_Pool/client.cpp (main): + * tests/README: + * tests/Makefile: + * tests/Big_Oneways/README: + * tests/Big_Oneways/Test.idl: + * tests/Big_Oneways/Makefile: + * tests/Big_Oneways/Big_Oneways.dsw: + * tests/Big_Oneways/server.dsp: + * tests/Big_Oneways/client.dsp: + * tests/Big_Oneways/run_test.pl: + * tests/Big_Oneways/Coordinator.h: + * tests/Big_Oneways/Coordinator.cpp: + * tests/Big_Oneways/Peer.h: + * tests/Big_Oneways/Peer.cpp: + * tests/Big_Oneways/Session.h: + * tests/Big_Oneways/Session.cpp: + * tests/Big_Oneways/Session_Control.h: + * tests/Big_Oneways/Session_Control.cpp: + * tests/Big_Oneways/Session_Task.h: + * tests/Big_Oneways/Session_Task.cpp: + * tests/Big_Oneways/client.cpp: + * tests/Big_Oneways/server.cpp: + Add new stress test for the non-blocking I/O features in the + ORB. This test is more focussed than LongWrites, and its + shutdown sequence is better designed (LongWrites tends to crash + after running successfully.) - Couple of minor warning fixes. + * tao/GIOP_Message_Handler.cpp: + Fixed unsigned/signed warning -Wed Apr 18 03:43:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> + Thu Mar 8 19:12:48 2001 Carlos O'Ryan <coryan@uci.edu> - * examples/PluggableUDP/tests/Basic/client.dsp: - * examples/PluggableUDP/tests/Basic/server.dsp: - * examples/PluggableUDP/tests/Performance/client.dsp: - * examples/PluggableUDP/tests/Performance/server.dsp: - * examples/PluggableUDP/tests/SimplePerformance/client.dsp: - * examples/PluggableUDP/tests/SimplePerformance/server.dsp: + * tao/GIOP_Message_Base.cpp: + * tao/GIOP_Message_Handler.h: + * tao/GIOP_Message_Handler.cpp: + Had to manually merge Bala's changes from Sat Feb 17 23:08:44 + 2001. - Fixed settings for Release versions. Thanks to Bala - for pointing that out. + * tao/IIOP_Connection_Handler.cpp: + Cosmetic fixes. -Tue Apr 17 22:33:42 2001 Irfan Pyarali <irfan@cs.wustl.edu> + * tao/IIOP_Transport.cpp: + Print debugging messages when output is scheduled, and alse when + it is canceled. + Do not register the handler more than once on the reactor. - * tests/RTCORBA/Thread_Pool/server.cpp (main): Changed FALSE to 0. + * tao/Queued_Message.inl: + The done() condition was reversed. - * tests/RTCORBA/Thread_Pool/Makefile (BIN_UNCHECKED): Targets - should be labeled as BIN_UNCHECKED rather than BIN. + * tao/Transport.cpp: + Add a ton of debugging mesages, including detailed messages of + outgoing and incoming data, information about each queued + message, etc. -Tue Apr 17 22:09:19 2001 Jeff Parsons <parsons@cs.wustl.edu> + * tao/Transport.cpp (send_message_block_chain): + Always add the number of bytes transferred on each send() call, + even when it returns an error. - * examples/TypeCode_Creation/TypeCode_Creation.dsp: + * tao/Transport.cpp (send_message_i): + Use easier to read code when deciding what messages are queued. + Before calling schedule_output() and returning we must queue the + message, forgot to do that in the previous version. - Fixed settings in the release version. + * tests/LongWrites/Receiver.cpp: + * tests/LongWrites/Sender.cpp: + * tests/LongWrites/Sender.h: + * tests/LongWrites/Sender_Task.cpp: + * tests/LongWrites/Sender_Task.h: + * tests/LongWrites/client.cpp: + I'm tweaking the test trying to make the termination condition + more reliable. Unfortunately after one of the clients finishes + the rest does not receive all the required messages. + I will probably have to change the protocol, which is probably a + good idea anyway, so we can control the number of threads too. -Tue Apr 17 21:59:06 2001 Balachandran Natarajan <bala@cs.wustl.edu> + * tests/LongWrites/run_test.pl: + In the haste to merge the fix_bug132 bug I forgot to incorporate + the support for the multiple test types. - * tests/BiDirectional/client.dsp: - * tests/BiDirectional/server.dsp: Fixed the release builds. + * tao/Makefile: + * tao/Domain/Makefile: + * tao/DynamicAny/Makefile: + * tao/DynamicInterface/Makefile: + * tao/IFR_Client/Makefile: + * tao/IORManipulation/Makefile: + * tao/IORTable/Makefile: + * tao/PortableServer/Makefile: + * tao/SmartProxies/Makefile: + * tao/Strategies/Makefile: + * tests/LongWrites/Makefile: + Update dependencies. -Tue Apr 17 21:21:06 2001 Nanbor Wang <nanbor@cs.wustl.edu> + Wed Mar 07 08:48:11 2001 Carlos O'Ryan <coryan@uci.edu> - * tests/Collocation/Coll_Tester.cpp: - * tests/Collocation/Coll_Tester.h: Added shutdown method to - destroy the RootPOA and the ORB. The lack of it was causing the - test to crash. + * tao/Queued_Message.inl: + Both done() and mb() were using contents_, but the flow has + changed to use current_message_. - * tests/Collocation/Collocation.dsw: Redefined project - dependencies. + * tao/Transport.cpp: + Simplify code flow in send_current_message() + Simplify code in dequeue_head() - * tests/Collocation/Makefile.test: - * tests/Collocation/Collocation.cpp: - * tests/Collocation/main.cpp: - * tests/Collocation/Collocation.dsp: Renamed <main.cpp> to - <Collocation.cpp> so that both Win32 and UNIX build the same - executable. + * tao/TAO.dsp: + * tao/TAO_Static.dsp: + Update project files so they work on the branch. - Thanks to Carlos for pointing them out. + Tue Mar 6 19:44:44 2001 Carlos O'Ryan <coryan@uci.edu> -Tue Apr 17 15:48:20 2001 Nanbor Wang <nanbor@cs.wustl.edu> + * tao/GIOP_Message_Handler.cpp: + When printing an invalid GIOP magic number use hex values, not + the character representation, because the latter can print out + garbage. - * tao/IIOP_Connection_Handler.cpp (handle_close): - * tao/Strategies/UIOP_Connection_Handler.cpp (handle_close): - * tao/Strategies/SHMIOP_Connection_Handler.cpp (handle_close): The - handle_close methods were not closing these Svc_Handler's down - properly. Removed "this->peer ()->close ()" calls and use - "this->destroy () instead of calling "delete this." + * tao/ORB_Core.cpp: + Print the return value of each handle_events() call, on an + attempt to figure out why it is spinning. -Tue Apr 17 15:43:45 2001 Nanbor Wang <nanbor@cs.wustl.edu> + * tao/Transport.cpp: + Print handle, return value and errno after each call to + send_current_message() - * examples/POA/TIE/client.dsp: Removed FooS.* from project. + * tao/Wait_On_Leader_Follower.cpp: + Don't enter the event loop if the reply has been received + already. -Tue Apr 17 13:03:49 2001 Chris Cleeland <cleeland_c@ociweb.com> + Tue Mar 6 11:02:43 2001 Carlos O'Ryan <coryan@uci.edu> - * tao/Transport.h (TAO_Synch_Refcountable): Reworked this so that - the lock can be specified in the constructor. This permits an - optimization for single-threaded versions of the ORB so they can - use a null lock implementation if desired and thus achieve better - performance. [Bug 861] + * Merged in changes from the fix_bug132 branch. I need several + bug fixes from the main trunk. In my experience the easiest way + to do this is to create a new branch higher up in the main + trunk, close the old branch and propagate its changes to the new + one. + In this case we created fix_bug132_iter02 (today) merge the + changes from fix_bug132 into that branch, and close fix_bug132. - * tao/Transport.cpp: Updated various methods to take advantage of - the optimization outlined above. Specifically, the TAO_Transport - constructor now initializes its TAO_Synch_Refcountable's lock - using the resource factory's create_cached_connection_lock(), just - like TAO_Transport's handler_lock_ and the connection cache lock. - Thanks to Joe Hoffert <joeh@cs.wustl.edu> and Bala - <bala@cs.wustl.edu> for pointing out this opportunity and testing - it via Quantify. [Bug 861] + Mon Mar 5 11:32:14 2001 Carlos O'Ryan <coryan@uci.edu> -Tue Apr 17 12:19:32 2001 Jeff Parsons <parsons@cs.wustl.edu> + * tao/Transport.cpp: + * tao/IIOP_Transport.cpp: + Add debugging messages - * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp: + * tests/LongWrites/Makefile: + Updates dependencies and object files for the client. - Modified code that used != to compare two typecodes - to use TypeCode::equal(). Also added TypeCode_vars - to contain the results of CORBA::Any::type(). Thanks - to Max Voronoy <m.voronoy@telesens.com.ua> for - reporting the != bug. + Fri Mar 02 15:29:17 2001 Carlos O'Ryan <coryan@uci.edu> -Tue Apr 17 08:34:27 2001 Pradeep Gore <pradeep@cs.wustl.edu> + * tao/Transport.h: + * tao/Transport.cpp: + Continue implementation of reactive output. + On this pass I fixed the code to deal with several error + conditions, invoke schedule_output() if the connection returns + an EWOULDBLOCK, also cancel the output if there is no data to + send. + Fix syncronization on send_queued_message() + Fix memory allocation for message blocks contained in + Queued_Message, they cannot be cloned() because that would + allocate from TSS. - * tests/OctetSeq/run_test1.pl: - * tests/OctetSeq/run_test2.pl: - Use unique test1.ior and test2.ior for each test. - Common ior file name was failing these tests on some platforms. + * tao/IIOP_Transport.h: + * tao/IIOP_Transport.cpp: + Implement schedule_output() and cancel_output() methods. + + * tao/Wait_On_Leader_Follower.cpp: + Do not re-insert the transport into the reactor on each wait, + once is enough. -Tue Apr 17 07:26:47 2001 Balachandran Natarajan <bala@cs.wustl.edu> + * tao/IIOP_Connection_Handler.h: + * tao/IIOP_Connection_Handler.cpp: + Implement a handle_output() callback, delegate on the + TAO_Transport - * tao/Thread_Pool.cpp: Fixed a warning in TRU64 builds. + * tao/IIOP_Endpoint.cpp: + Remove unused #include -Tue Apr 17 07:23:12 2001 Johnny Willemsen <jwillemsen@remedy.nl> + * tests/LongWrites/Coordinator.h: + * tests/LongWrites/Coordinator.cpp: + * tests/LongWrites/Receiver.h: + * tests/LongWrites/Receiver.cpp: + * tests/LongWrites/Sender.h: + * tests/LongWrites/Sender.cpp: + * tests/LongWrites/client.cpp: + * tests/LongWrites/client.dsp: + * tests/LongWrites/run_test.pl: + * tests/LongWrites/server.cpp: + * tests/LongWrites/svc.conf: + * tests/LongWrites/Sender_Task.h: + * tests/LongWrites/Sender_Task.cpp: + Add support for multi-threaded clients. + Try to count the number of incoming messages and only exit when + all have been received. - * examples/POA/Default_Servant/*.bor - Added BCB makefiles for this test + * tests/Queued_Message_Test/Queued_Message_Test.dsp: + Removed a number of unused files from this unit test. -Mon Apr 16 16:45:19 2001 Angelo Corsaro <corsaro@cs.wustl.edu> + Sun Feb 25 10:22:59 2001 Carlos O'Ryan <coryan@uci.edu> - * tests/RTCORBA/Client_Protocol/client.cpp: - This test was printing a misleading error message. - The problem has now been fixed. + * tao/Queued_Message.h: + * tao/Queued_Message.cpp: + * tao/Transport.cpp: + Instead of releasing the message blocks as soon as possible we + delay until the queued message is deallocated. This will make + it possible to release all the data in the same thread that + allocated it, preserving the support for TSS allocators. -Mon Apr 16 13:34:31 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + * tests/LongWrites/Test.idl: + * tests/LongWrites/Receiver.h: + * tests/LongWrites/Receiver.cpp: + * tests/LongWrites/Sender.h: + * tests/LongWrites/Sender.cpp: + * tests/LongWrites/client.cpp: + * tests/LongWrites/run_test.pl: + The test can now send big oneways, big twoways and big twoways + with big responses. - * examples/PluggableUDP/DIOP/README: Generalize this a bit so that - it fits in better with the ACE+TAO context. + Wed Feb 14 18:38:11 2001 Carlos O'Ryan <coryan@uci.edu> -Mon Apr 16 13:13:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> + * tao/Queued_Message.cpp: + Fixed queue manipulation logic - * docs/releasenotes/index.html: - * examples/PluggableUDP/DIOP/README: + * tests/Queued_Message_Test/Queued_Message_Test.cpp: + The test was miscounting remove operations from the queue. - Updated documentation about the UDP based pluggable protocol. + * tests/Queued_Message_Test/Queued_Message_Test.dsw: + * tests/Queued_Message_Test/Queued_Message_Test.dsp: + Add MSVC project files. -Mon Apr 16 09:49:58 2001 Carlos O'Ryan <coryan@uci.edu> + Wed Feb 14 10:02:44 2001 Carlos O'Ryan <coryan@uci.edu> - * orbsvcs/tests/InterfaceRepo/Application_Test/Makefile: - * performance-tests/Latency/Makefile: - * tests/DSI_Gateway/Makefile: - * tests/Param_Test/Makefile: - More missing libraries for QNX + * tao/Queued_Message.h: + * tao/Queued_Message.cpp: + Add flag to control message block ownership, used to minimize + memory allocations. -Mon Apr 16 02:15:49 2001 Christopher Kohlhoff <chris@kohlhoff.com> + * tao/Transport.cpp: + Use the ownership flags for the Queued_Message. - * tao/Domain/Makefile.bor: - * tao/IFR_Client/Makefile.bor: - * tao/IORManipulation/Makefile.bor: - * tao/IORTable/Makefile.bor: - * tao/SmartProxies/Makefile.bor: - Fixed definitions of INCDIR_NAME to use backslash, as - forward slash is interpreted as an option by copy on Win32. + * tests/Makefile: + * tests/Queued_Message_Test/Makefile: + * tests/Queued_Message_Test/Queued_Message_Test.cpp: + Add new unit test for the TAO_Queued_Message class. -Sun Apr 15 17:16:33 2001 Carlos O'Ryan <coryan@uci.edu> + * tao/Makefile: + * tao/Domain/Makefile: + * tao/DynamicAny/Makefile: + * tao/DynamicInterface/Makefile: + * tao/IFR_Client/Makefile: + Update dependencies - * tests/MT_Timeout/Client_Task.cpp (one_iteration): - Relaxed the conditions to accept the elapsed time of each - request. Now we accept up to 30 milliseconds over the expected - time as valid. + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp: + The ACE_SSL_SOCK_Stream does not support sendv() -Sun Apr 15 15:31:00 2001 Yamuna Krishnamurthy <yamuna@cs.wustl.edu> + Mon Feb 12 15:44:54 2001 Carlos O'Ryan <coryan@uci.edu> - * orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp: + * tao/Makefile: + Update makefile to include new files - Fixed Fuzz error. + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp: + * tao/Strategies/SHMIOP_Transport.h: + * tao/Strategies/SHMIOP_Transport.cpp: + * tao/Strategies/UIOP_Transport.h: + * tao/Strategies/UIOP_Transport.cpp: + Fixed all protocols to use the new send() method with iovec + parameters. -Sun Apr 15 14:03:00 2001 Yamuna Krishnamurthy <yamuna@cs.wustl.edu> + * tao/GIOP_Message_Lite.cpp: + Use the send() method with iovec arguments. - * orbsvcs/tests/AVStreams/Asynch_Three_Stage/input: + * tao/Sync_Strategies.h: + * tao/Sync_Strategies.cpp: + * tao/Transport.cpp: + More cleanup for the Sync_Strategies, the must_queue() method + does not require a Stub argument. - Added a new input file as the older one was too short to test - all the different use cases in the run_test.pl. This was breaking - the test on all platforms. + Mon Feb 12 10:15:47 2001 Carlos O'Ryan <coryan@uci.edu> -Sun Apr 15 12:13:00 2001 Yamuna Krishnamurthy <yamuna@cs.wustl.edu> + * tao/Transport.h: + * tao/Transport.cpp: + Add new method to send a message block chain. + The template method to send data takes an iovec argument. - * orbsvcs/orbsvcs/AV/AVStreams_i.cpp: + * tao/IIOP_Transport.h: + * tao/IIOP_Transport.cpp: + Implement the iovec-based send() template method. - Removed unused method definitions which were breaking builds. + * tao/Queued_Message.cpp: + The cleanup code was broken. -Sat Apr 14 23:57:01 2001 Carlos O'Ryan <coryan@uci.edu> + * tao/GIOP_Message_Base.cpp: + Use the message block chain method to send short critical + messages. - * orbsvcs/orbsvcs/AV/AVStreams_i.cpp: - Reverted changes, they would not compile on any platform. + Fri Feb 09 10:50:47 2001 Carlos O'Ryan <coryan@uci.edu> -Sat Apr 14 23:00:00 2001 Yamuna Krishnamurthy <yamuna@cs.wustl.edu> + * tao/Queued_Message.h: + * tao/Queued_Message.inl: + * tao/Queued_Message.cpp: + Add new class to represent a queued message in the outgoing + path. This class has to keep more than just the message block, + it also takes care of timeouts and signaling any waiting thread + when the message is sent. - * orbsvcs/tests/AVStreams/Modify_QoS/Makefile: - * orbsvcs/tests/AVStreams/Modify_QoS/Modify_QoS.dsw: - * orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl: - * orbsvcs/tests/AVStreams/Modify_QoS/input: - * orbsvcs/tests/AVStreams/Modify_QoS/receiver.h: - * orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp: - * orbsvcs/tests/AVStreams/Modify_QoS/receiver.dsp: - * orbsvcs/tests/AVStreams/Modify_QoS/sender.h: - * orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp: - * orbsvcs/tests/AVStreams/Modify_QoS/sender.dsp: + * tao/Message_Sent_Callback.h: + * tao/Message_Sent_Callback.inl: + * tao/Message_Sent_Callback.cpp: + Define interface to signal threads waiting for a message to be + sent out, e.g. twoway requests blocked waiting for a queued + message. - Added a new test Modify_QoS to demonstrate how the qos of - the flows can be changed during run-time. + * tao/Flushing_Strategy.h: + * tao/Flushing_Strategy.cpp: + * tao/Block_Flushing_Strategy.h: + * tao/Block_Flushing_Strategy.cpp: + * tao/Reactive_Flushing_Strategy.h + * tao/Reactive_Flushing_Strategy.cpp: + New classes to control how the outgoing data is flushed, + either by blocking on write() or by using the reactor. + + * tao/Resource_Factory.h: + * tao/default_resource.h: + * tao/default_resource.cpp: + Add new methods to create the flushing strategy. -Sat Apr 14 19:31:56 2001 Yamuna Krishnamurthy <yamuna@cs.wustl.edu> + * tao/ORB_Core.h: + * tao/ORB_Core.i: + * tao/ORB_Core.cpp: + Add accessor for the flushing strategy. Notice that the + strategy is stateless so a single instance (per-ORB) is needed. - * orbsvcs/orbsvcs/AV/AVStreams_i.cpp: + * tao/Sync_Strategies.h: + * tao/Sync_Strategies.cpp: + The Sync_Strategies have been simplified. They are now + stateless, and they only need to answer a couple of questions + (1) should a message be buffered, (2) should the ORB flush a + queue. - Added modify_qos support to enable modifying the qos of the individual flows during run time. + * performance-tests/Latency/st_client.cpp: + Destroy the ORB on shutdown. + + * tao/TAO.dsp: + * tao/TAO_Static.dsp: + Add the new files to the TAO project files. + + * tao/Transport.h: + * tao/Transport.inl: + * tao/Transport.cpp: + Move much of the functionality of sending and outgoing message + queue up to the base transport class. Remove a lot of code + deailing with the previous (blocking) queues. + + * tao/IIOP_Transport.cpp: + * tao/IIOP_Connection_Handler.cpp: + * tao/Strategies/SHMIOP_Transport.cpp: + * tao/Strategies/SHMIOP_Connection_Handler.cpp: + * tao/Strategies/UIOP_Transport.cpp: + * tao/Strategies/UIOP_Connection_Handler.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp: + Change the transport and connection handlers to use the new + outgoing message queue, the flushing strategy and the changes to + the SyncStrategy. + + * tao/GIOP_Message_Base.cpp: + Propagate a few interface changes. + + * tests/LongWrites/LongWrites.dsw: + * tests/LongWrites/client.dsp: + * tests/LongWrites/server.dsp: + * tests/LongWrites/run_test.pl: + Got the test to compile (and run) under NT. Fri Apr 13 16:41:56 2001 Carlos O'Ryan <coryan@uci.edu> diff --git a/TAO/TAO_IDL/ast/ast_exception.cpp b/TAO/TAO_IDL/ast/ast_exception.cpp index a69df9c3734..eab8d5a4a6a 100644 --- a/TAO/TAO_IDL/ast/ast_exception.cpp +++ b/TAO/TAO_IDL/ast/ast_exception.cpp @@ -128,11 +128,14 @@ AST_Exception::in_recursion (AST_Type *node) AST_Field::narrow_from_decl (si->item ()); if (field == 0) - // This will be an enum value or other legitimate non-field - // member - in any case, no recursion. { - si->next (); - continue; + delete si; + + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("(%N:%l) AST_Exception::") + ACE_TEXT ("in_recursion - ") + ACE_TEXT ("bad field node\n")), + 0); } AST_Type *type = diff --git a/TAO/TAO_IDL/ast/ast_union.cpp b/TAO/TAO_IDL/ast/ast_union.cpp index 42f7c880dc6..305f584cb33 100644 --- a/TAO/TAO_IDL/ast/ast_union.cpp +++ b/TAO/TAO_IDL/ast/ast_union.cpp @@ -218,11 +218,13 @@ AST_Union::in_recursion (AST_Type *node) AST_UnionBranch::narrow_from_decl (si->item ()); if (field == 0) - // This will be an enum value or other legitimate non-field - // member - in any case, no recursion. { - si->next (); - continue; + delete si; + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("(%N:%l) AST_Union::") + ACE_TEXT ("in_recursion - ") + ACE_TEXT ("bad field node\n")), + 0); } AST_Type *type = diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp index 0b9f85f7f49..a2647093471 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp @@ -191,14 +191,6 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node) *os << "// If length is 0 we return true." << be_nl; *os << "if (0 >= _tao_seq_len) " << be_idt_nl; *os << "return 1;" << be_uidt_nl; - - // Add a sanity check for the length of a sequence. - *os << "// Add a check to the length of the sequence" << be_nl; - *os << "// to make sure it does not exceed the length" << be_nl; - *os << "// of the stream. (See bug 58.)" << be_nl; - *os << "if (_tao_seq_len > strm.length())" << be_idt_nl; - *os << "return 0;" << be_uidt_nl; - *os << "// retrieve all the elements" << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp index 6c178833f3a..2d103aca25b 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp @@ -48,65 +48,6 @@ be_visitor_typecode_defn::~be_visitor_typecode_defn (void) this->queue_reset (this->compute_queue_); } -int -be_visitor_typecode_defn::visit_members (AST_Structure *node) -{ - this->elem_number_ = 0; - - AST_Field **member_ptr = 0; - size_t count = node->nfields (); - - for (size_t i = 0; i < count; ++i) - { - node->field (member_ptr, i); - - be_decl *bd = be_decl::narrow_from_decl (*member_ptr); - - // Set the node to be visited. - this->ctx_->node (bd); - this->elem_number_++; - - // Do any pre processing using the next item info. - if (this->pre_process (bd) == -1) - { - ACE_ERROR_RETURN (( - LM_ERROR, - "(%N:%l) be_visitor_typecode_defn::visit_members - " - "pre processing failed\n" - ), - -1 - ); - } - - // Send the visitor. - if (bd == 0 || bd->accept (this) == -1) - { - ACE_ERROR_RETURN (( - LM_ERROR, - "(%N:%l) be_visitor_typecode_defn::visit_members - " - "codegen for scope failed\n" - ), - -1 - ); - - } - - // Do any post processing using this item info. - if (this->post_process (bd) == -1) - { - ACE_ERROR_RETURN (( - LM_ERROR, - "(%N:%l) be_visitor_typecode_defn::visit_members - " - "post processing failed\n" - ), - -1 - ); - } - } - - return 0; -} - // the following needs to be done to deal with the most bizarre behavior of // MSVC++ compiler int @@ -427,7 +368,7 @@ be_visitor_typecode_defn::visit_exception (be_exception *node) return ((this->computed_encap_len_ > 0) ? 0 : -1); case TAO_CodeGen::TAO_TC_DEFN_SCOPE: case TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN: - return this->visit_members (node); + return this->visit_scope (node); default: // error break; @@ -613,7 +554,7 @@ be_visitor_typecode_defn::visit_structure (be_structure *node) return ((this->computed_encap_len_ > 0) ? 0 : -1); case TAO_CodeGen::TAO_TC_DEFN_SCOPE: case TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN: - return this->visit_members (node); + return this->visit_scope (node); default: // error break; @@ -676,7 +617,7 @@ be_visitor_typecode_defn::visit_union (be_union *node) return ((this->computed_encap_len_ > 0) ? 0 : -1); case TAO_CodeGen::TAO_TC_DEFN_SCOPE: case TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN: - return this->visit_members (node); + return this->visit_scope (node); default: // error break; @@ -1033,7 +974,6 @@ be_visitor_typecode_defn::gen_typecode (be_exception *node) // now emit the encapsulation this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION); - if (node->accept (this) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -1069,18 +1009,12 @@ be_visitor_typecode_defn::gen_encapsulation (be_exception *node) // generate the member count os->indent (); - *os << node->nfields () << ", // member count\n"; + *os << node->member_count () << ", // member count\n"; // size of the member count this->tc_offset_ += sizeof (ACE_CDR::ULong); // hand over to the scope to generate the typecode for elements this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE); - - // Set the scope node as "node" in which the code is being - // generated so that elements in the node's scope can use it - // for code generation. - this->ctx_->scope (node); - if (node->accept (this) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -1619,13 +1553,12 @@ be_visitor_typecode_defn::gen_encapsulation (be_structure *node) // generate the member count os->indent (); - *os << node->nfields () << ", // member count\n"; + *os << node->member_count () << ", // member count\n"; // size of the member count this->tc_offset_ += sizeof (ACE_CDR::ULong); // hand over to the scope to generate the typecode for elements this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE); - if (node->accept (this) == -1) { ACE_ERROR ((LM_ERROR, "be_structure: cannot generate typecode for members\n")); @@ -1864,18 +1797,12 @@ be_visitor_typecode_defn::gen_encapsulation (be_union *node) this->tc_offset_ += sizeof (ACE_CDR::ULong); // generate the member count - *os << node->nfields () << ", // member count\n"; + *os << node->member_count () << ", // member count\n"; // size of the member count this->tc_offset_ += sizeof (ACE_CDR::ULong); // hand over to the scope to generate the typecode for elements this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE); - - // Set the scope node as "node" in which the code is being - // generated so that elements in the node's scope can use it - // for code generation. - this->ctx_->scope (node); - if (node->accept (this) == -1) { ACE_ERROR ((LM_ERROR, "be_union: cannot generate code for members\n")); diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp index 4b30f6c6a58..1deb76bc796 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp @@ -214,19 +214,15 @@ int be_visitor_union_cs::visit_union (be_union *node) *os << node->name () << " &" << be_nl; // return type *os << node->name () << "::operator= (const ::" << node->name () << " &u)" << be_nl; - *os << "{" << be_idt_nl; - // First check for self-assignment. - *os << "if (&u == this)" << be_idt_nl - << "{" << be_idt_nl - << "return *this;" << be_uidt_nl - << "}" << be_uidt_nl << be_nl; - // Reset and set the discriminant. + *os << "{\n"; + os->incr_indent (); + // first reset and set the discriminant *os << "this->_reset (u.disc_, 0);" << be_nl; - *os << "this->disc_ = u.disc_;" << be_nl << be_nl; + *os << "this->disc_ = u.disc_;" << be_nl; // now switch based on the disc value *os << "switch (this->disc_)" << be_nl; - *os << "{" << be_idt_nl; - + *os << "{\n"; + os->incr_indent (0); if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -243,16 +239,15 @@ int be_visitor_union_cs::visit_union (be_union *node) // an enum, this does no harm. if (node->default_index () == -1) { + os->indent (); *os << "default:" << be_nl << "break;" << be_uidt_nl; } - else - { - *os << be_uidt_nl; - } - *os << "}" << be_nl << be_nl; - *os << "return *this;" << be_uidt_nl; + os->decr_indent (); + *os << "}" << be_nl; + *os << "return *this;\n"; + os->decr_indent (); *os << "}\n\n"; // the reset method diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h index 79fa5d50880..601300e9703 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h @@ -44,9 +44,6 @@ public: ~be_visitor_typecode_defn (void); // destructor - virtual int visit_members (AST_Structure *node); - // for use with structs, exceptions, and unions. - virtual int visit_type (be_type *node); // visit a generic be_type node diff --git a/TAO/TAO_IDL/tao_idl.cpp b/TAO/TAO_IDL/tao_idl.cpp index f20b283c06f..8fee379d8a0 100644 --- a/TAO/TAO_IDL/tao_idl.cpp +++ b/TAO/TAO_IDL/tao_idl.cpp @@ -71,7 +71,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "drv_extern.h" #include "be.h" #include "ace/Process.h" -#include "../tao/Version.h" +#include "../../tao/Version.h" ACE_RCSID(TAO_IDL, tao_idl, "$Id$") diff --git a/TAO/configure.in b/TAO/configure.in new file mode 100644 index 00000000000..609ceadb091 --- /dev/null +++ b/TAO/configure.in @@ -0,0 +1,664 @@ +dnl +dnl $Id$ + +AC_REVISION($Revision 0.6 $)dnl + +dnl +dnl An autoconf script to automatically configure TAO. +dnl Process this file with autoconf to produce a configure script. +dnl + +dnl +dnl The autoconf documentation states that this is the recommended +dnl sequence for this file: +dnl +dnl `AC_INIT(FILE)' +dnl checks for programs +dnl checks for libraries +dnl checks for header files +dnl checks for typedefs +dnl checks for structures +dnl checks for variables +dnl checks for compiler characteristics +dnl checks for library functions +dnl checks for system services +dnl `AC_OUTPUT([FILE...])' +dnl +dnl I followed this convention, and added a few sections. +dnl -- Gonzo + + +dnl +dnl SECTION 1: `AC_INIT(FILE)' +dnl +dnl This macro must be the very first invoked. +dnl Its argument names a file that must exist in the directory where +dnl autoconf will run, just to check things. +dnl AC_INIT(ace_unique.m4) +dnl +AC_INIT(tao/TAO.cpp) + +dnl Require GNU Autoconf 2.13 or better. +AC_PREREQ(2.13) + +dnl Check what platform we are running on. +AC_CANONICAL_SYSTEM + +dnl Allow the standard program name transformations. +dnl We probably don't need AC_ARG_PROGRAM any longer since AM_INIT_AUTOMAKE +dnl handles this functionality. -- Ossama +dnl AC_ARG_PROGRAM + +dnl Cause GNU Automake to initialize the state of things and run +dnl some sanity checks +TAO_PACKAGE="tao" +dnl Temporarily change M4 quotes to prevent "regex []" from being eaten +changequote(, )dnl +TAO_VERSION=`head -1 ${srcdir}/VERSION | sed 's/.*version \([0-9.]*\).*/\1/'` +changequote([, ])dnl + +AM_INIT_AUTOMAKE("$TAO_PACKAGE", "$TAO_VERSION", DUMMY) + +dnl Generate a header file with all settings. +dnl AM_CONFIG_HEADER(tao/config.h) + +dnl Move before the AC_ARG_ENABLE stuff to prevent autoconf complaints. +dnl This is a bit messy but it makes life easier for me. +dnl -Ossama +dnl +dnl SECTION: checks for programs +dnl + +dnl Check if system supports "#! /bin/sh" line in scripts +AC_SYS_INTERPRETER + + +dnl Check for ace-config script +AC_CHECK_PROG(ACE_CONFIG, ace-config, ace-config,) dnl +if test -z "$ACE_CONFIG"; then + AC_MSG_WARN(ace-config script not found) + AC_MSG_WARN(TAO may not find all of the necessary ACE related libraries) +fi + +dnl Check the C compiler and preprocessor. +AC_PROG_CC +AC_PROG_CPP +AC_PROG_CC_C_O + +dnl The C++ compiler used to compile TAO must be the same as the one +dnl used to compile ACE. +if test -n $ACE_CONFIG; then + CXX=`$ACE_CONFIG --cxx ace` +fi + +dnl Check the C++ compiler and preprocessor. +AC_PROG_CXX +AC_PROG_CXXCPP + +dnl Disable building of static libraries by default +AC_DISABLE_STATIC + +dnl Enable Libtool module support +AC_LIBTOOL_DLOPEN + +dnl FIXME: Temporary hack to make libtool work with g++. +dnl Shared library support will only work with GNU g++ and GNU ld +dnl right now. +save_CC="$CC" +CC="$CXX" + +dnl Check for libtool and turn on Automake processing for Libtool +AM_PROG_LIBTOOL + +CC="$save_CC" + + +dnl This checks for a binary called gm4, gnum4 or m4, and assigns +dnl whatever was found (or "gonzo") to the M4 macro. +dnl AC_CHECK_PROGS(M4, gm4 gnum4 m4, gonzo) + +dnl Look for the best awk-style program available. +AC_PROG_AWK + +dnl Set some version information +TAO_CURRENT="0" +TAO_AGE="0" +TAO_REVISION="0" + +if test -n "$AWK"; then + TAO_MAJOR=`echo "$TAO_VERSION" | sed 's/\./ /g' | $AWK '{ print \[$]1 }'` + TAO_MINOR=`echo "$TAO_VERSION" | sed 's/\./ /g' | $AWK '{ print \[$]2 }'` + TAO_BETA=`echo "$TAO_VERSION" | sed 's/\./ /g' | $AWK '{ print \[$]3 }'` + +dnl This is a terrible kludge to fool libtool into making it produce a shared +dnl library with the "right" version information. +dnl We really should switch to a version scheme that is compatible with +dnl libtool. +dnl -Ossama + TAO_CURRENT=`expr $TAO_MAJOR + $TAO_MINOR` + TAO_AGE=$TAO_MINOR + TAO_REVISION=$TAO_BETA +fi + +AC_SUBST(TAO_CURRENT) +AC_SUBST(TAO_AGE) +AC_SUBST(TAO_REVISION) + +dnl Do the usual install settings; don't forget to include a +dnl install-sh script, in case the is no BDS compatible install +dnl installed (no pun intended) in your machine. +dnl +dnl We don't need this anymore since AM_INIT_AUTOMAKE calls AM_PROG_INSTALL +dnl yes "AM_PROG_INSTALL," not "AC_PROG_INSTALL." -- Ossama +dnl AC_PROG_INSTALL + +dnl Special handling for some UNIX variants and Cygwin32 +AC_AIX +AC_ISC_POSIX +AC_MINIX +AC_CYGWIN + +dnl The user's/default C++ flags are stored in "CXXFLAGS." We use +dnl the variable "TAO_CXXFLAGS" to set the C++ flags we want. At the end +dnl of the configuration process we combine TAO_CXXFLAGS and CXXFLAGS +dnl into CXXFLAGS (e.g., CXXFLAGS="$TAO_CXXFLAGS $CXXFLAGS"). CXXFLAGS +dnl goes after TAO_CXXFLAGS so that the user's C++ flag command line +dnl choices always override the configure script's choices. +TAO_CXXFLAGS="" +TAO_CFLAGS="" + +dnl Set the test language as C++ +AC_LANG_CPLUSPLUS + +dnl Check if we support symlinks +AC_PROG_LN_S + +dnl Check if a lexical analyzer exists (lex, flex, etc.) +AM_PROG_LEX + +dnl Check if some implementation of YACC exists (yacc, byacc, bison, etc.) +AC_PROG_YACC +dnl if test -z "$YACC"; then +dnl ./missing yacc +dnl fi + +dnl We actually check for this in the user AC_ARG_WITH(--with-gperf) +dnl block since it is more convenient to put it there. +dnl Check for gperf program +dnl AC_CHECK_PROGS(GPERF, gperf-ace gperf,) dnl + +dnl Check for profiling progam +AC_CHECK_PROGS(PROF, gprof prof,) dnl + + +dnl +dnl SECTION 2: Configure script command line options +dnl +AC_ARG_ENABLE(fast, + [ --enable-fast enable -fast flag, e.g. Sun C++ [default=no]], + [ + case "${enableval}" in + yes) + TAO_CXXFLAGS="$TAO_CXXFLAGS -fast" + TAO_CFLAGS="$TAO_CFLAGS -fast" + ;; + no) + ;; + *) + AC_MSG_ERROR(bad value ${enableval} for --enable-fast) + ;; + esac + ],) + +AC_ARG_ENABLE(messaging, + [ --enable-messaging enable CORBA messaging support [default=yes]], + [ + case "${enableval}" in + yes) + AC_DEFINE(TAO_HAS_CORBA_MESSAGING) + ;; + no) + ;; + *) + AC_MSG_ERROR(bad value ${enableval} for --enable-messaging) + ;; + esac + ], + [ + AC_DEFINE(TAO_HAS_CORBA_MESSAGING) + ]) + +AC_ARG_ENABLE(minimum-corba, + [ --enable-minimum-corba enable minimum CORBA support [default=no]], + [ + case "${enableval}" in + yes) + AC_DEFINE(TAO_HAS_MINIMUM_CORBA) + ;; + no) + ;; + *) + AC_MSG_ERROR(bad value ${enableval} for --enable-minimum-corba) + ;; + esac + ],) + +AC_ARG_ENABLE(optimize, + [ --enable-optimize enable additional optimizations [default=no]], + [ + case "${enableval}" in + yes) + AC_MSG_WARN(Optimization configure support not implemented yet.) + ;; + no) + AC_MSG_WARN(Optimization configure support not implemented yet.) + ;; + *) + AC_MSG_ERROR(bad value ${enableval} for --enable-optimize) + ;; + esac + ],) + +AC_ARG_ENABLE(profile, + [ --enable-profile enable profiling [default=no]], + [ + case "${enableval}" in + yes) + if test -z "$PROF"; then + AC_MSG_WARN(No profiling program found. Assuming 'prof' exists) + TAO_CXXFLAGS="$TAO_CXXFLAGS -p" + TAO_CFLAGS="$TAO_CFLAGS -p" + else + case "$PROF" in + gprof) + echo "Building with 'gprof' support" + TAO_CXXFLAGS="$TAO_CXXFLAGS -pg" + TAO_CFLAGS="$TAO_CFLAGS -pg" + ;; + prof) + echo "Building with 'prof' support" + TAO_CXXFLAGS="$TAO_CXXFLAGS -p" + TAO_CFLAGS="$TAO_CFLAGS -p" + ;; + *) + dnl We shouldn't get here. + AC_MSG_WARN(Assuming 'prof' exists) + TAO_CXXFLAGS="$TAO_CXXFLAGS -p" + TAO_CFLAGS="$TAO_CFLAGS -p" + ;; + esac + fi + ;; + no) + dnl Do nothing + ;; + *) + AC_MSG_ERROR(bad value ${enableval} for --enable-profile) + ;; + esac + ],) + +AC_ARG_ENABLE(purify, + [ --enable-purify Purify all executables [default=no]], + [ + case "${enableval}" in + yes) + AC_CHECK_PROG(PURIFY, purify, purify,) + if test -n "$PURIFY"; then + PURE_CACHE_BASE_DIR="/tmp/purifycache" + PURE_CACHE_DIR=${PURE_CACHE_BASE_DIR}-${LOGNAME}-${notdir ${CXX} } + PURELINK="$PURIFY -best-effort -chain-length=20 \ + -cache-dir=$PURE_CACHE_DIR \ + -fds-inuse-at-exit=no -ignore-signals=SIGINT -inuse-at-exit \ + -max_threads=100" + TAO_CXXFLAGS="$TAO_CXXFLAGS -DTAO_HAS_PURIFY" + TAO_CFLAGS="$TAO_CFLAGS -DTAO_HAS_PURIFY" + else + AC_MSG_WARN(Purify program was not found.) + AC_MSG_WARN(Disabling purify support.) + fi + ;; + no) + PURELINK="" + ;; + *) + AC_MSG_ERROR(bad value ${enableval} for --enable-purify) + ;; + esac + ], PURELINK="") + +AC_ARG_ENABLE(quantify, + [ --enable-quantify Quantify all executables [default=no]], + [ + case "${enableval}" in + yes) + AC_CHECK_PROG(QUANTIFY, quantify, quantify,) + if test -n "$QUANTIFY"; then + PURE_CACHE_BASE_DIR="/tmp/purifycache" + PURE_CACHE_DIR=${PURE_CACHE_BASE_DIR}-${LOGNAME}-${notdir ${CXX} } + PRELINK="$QUANTIFY -best-effort -max_threads=100 \ + -cache-dir=$PURE_CACHE_DIR" + TAO_CXXFLAGS="$TAO_CXXFLAGS -DTAO_HAS_QUANTIFY" + TAO_CFLAGS="$TAO_CFLAGS -DTAO_HAS_QUANTIFY" + else + AC_MSG_WARN(Quantify program was not found.) + AC_MSG_WARN(Disabling quantify support.) + fi + ;; + no) + PRELINK="" + ;; + *) + AC_MSG_ERROR(bad value ${enableval} for --enable-quantify) + ;; + esac + ], PRELINK="") + +AC_ARG_ENABLE(rt-corba, + [ --enable-rt-corba enable Real-Time CORBA support [default=yes]], + [ + case "${enableval}" in + yes) + ;; + no) + AC_DEFINE(TAO_DISABLE_RT_CORBA) + ;; + *) + AC_MSG_ERROR(bad value ${enableval} for --enable-rt-corba) + ;; + esac + ],) + +AC_ARG_WITH(ace-includes, + [ --with-ace-includes=DIR ACE include files are in DIR], + [ + case "${withval}" in + yes) + AC_MSG_ERROR(specify a directory where the 'ace' include directory exists.) + ;; + no) + AC_MSG_ERROR(specify a directory where the 'ace' include directory exists.) + ;; + *) + if test -d "${withval}"; then + ACE_INCLUDEDIR="${withval}" + CXXFLAGS="${CXXFLAGS} -I${ACE_INCLUDEDIR}" + else + AC_MSG_ERROR(header directory '${withval}' does not exist.) + fi + ;; + esac + ],) + +AC_ARG_WITH(ace-libs, + [ --with-ace-libs=DIR ACE library files are in DIR], + [ + case "${withval}" in + yes) + AC_MSG_ERROR(specify a directory where the ACE libraries exist.) + ;; + no) + AC_MSG_ERROR(specify a directory where the ACE libraries exist.) + ;; + *) + if test -d "${withval}"; then + ACE_LIBDIR="${withval}" + LDFLAGS="${LDFLAGS} -L${ACE_LIBDIR}" + else + AC_MSG_ERROR(library directory '${withval}' does not exist.) + fi + ;; + esac + ],) + +AC_ARG_WITH(gperf, + [ --with-gperf=PROG gperf program [default=gperf]], + [ + case "${withval}" in + yes) + AC_MSG_ERROR(Specify the gperf program.) + ;; + no) + AC_MSG_ERROR(Specify the gperf program.) + ;; + *) + AC_CHECK_PROGS(GPERF, ${withval},) dnl + if test -n "$GPERF"; then + AC_DEFINE_UNQUOTED(ACE_GPERF, "${withval}") dnl + else + AC_MSG_ERROR(gperf program ${withval} does not exist.) + fi + ;; + esac + ], + [ + AC_CHECK_PROGS(GPERF, gperf-ace gperf,) dnl + if test -n "$GPERF"; then + AC_DEFINE_UNQUOTED(ACE_GPERF, "${GPERF}") dnl + else + AC_MSG_WARN(No gperf program found. TAO will not use perfect hashing.) + fi + ]) + +dnl Check for a working ACE installation +ac_save_CXXFLAGS="$CXXFLAGS" +ac_save_LDFLAGS="$LDFLAGS" +ac_save_LIBS="$LIBS" +if test -n "$ACE_CONFIG"; then + CXXFLAGS=`$ACE_CONFIG --cxxflags ace` + LDFLAGS=`$ACE_CONFIG --libs-only-L ace` + LIBS=`$ACE_CONFIG --libs-only-l ace` +fi +CXXFLAGS="$ac_save_CXXFLAGS $CXXFLAGS" +LDFLAGS="$ac_save_LDFLAGS $LDFLAGS" +LIBS="$ac_save_LIBS -lACE $LIBS" +AC_MSG_CHECKING(for a working ACE installation) +AC_CACHE_VAL(ac_cv_lib_ace_ace_os_exit, +[ + cat > conftest.$ac_ext <<EOF + +#include <ace/OS.h> +changequote(, )dnl +int main(int argc, char *argv[]) +changequote([, ])dnl +{ + ACE_OS::exit(0); +} +EOF + + if (eval "$CXX -o conftest conftest.$ac_ext $CXXFLAGS $LDFLAGS $LIBS") 2>&5; then + ac_cv_lib_ace_ace_os_exit="yes" + rm -f conftest* + else + ac_cv_lib_ace_ace_os_exit="no" + dnl rm -f conftest* + fi +]) +if test "$ac_cv_lib_ace_ace_os_exit" = "yes"; then + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) + AC_MSG_WARN(no functional ACE library found) + AC_MSG_ERROR(specify needed compiler flags using CXXFLAGS variable first) +fi + +dnl We only set the following if the ace-config script doesn't exist! +if test -z "$ACE_CONFIG"; then + + dnl Check if platform supports exceptions using ACE headers + AC_MSG_CHECKING(if ACE supports exceptions) + AC_EGREP_CPP(TAO_EXCEPTIONS, + [ +#include <ace/config.h> + +#if defined (ACE_HAS_EXCEPTIONS) + TAO_EXCEPTIONS +#endif + ], + [ + AC_MSG_RESULT(yes) + ] , + [ + AC_MSG_RESULT(no) + if test -n "$GXX"; then +dnl Temporarily change M4 quotes to prevent "regex []" from being eaten +changequote(, )dnl + if g++ --version | egrep -v '^2\.[0-7]' > /dev/null; then +changequote([, ])dnl + if test -z "$ACE_CONFIG"; then + TAO_CXXFLAGS="$TAO_CXXFLAGS -fno-exceptions" + fi + fi + fi + if test -n "$GCC"; then +dnl Temporarily change M4 quotes to prevent "regex []" from being eaten +changequote(, )dnl + if gcc --version | egrep -v '^2\.[0-7]' > /dev/null; then +changequote([, ])dnl + if test -z "$ACE_CONFIG"; then + TAO_CFLAGS="$TAO_CFLAGS -fno-exceptions" + fi + fi + fi + ]) + + dnl Check if platform supports run-time type identification using ACE headers + AC_MSG_CHECKING(if ACE supports GNU C++ repositories) + AC_EGREP_CPP(TAO_GNU_REPO, + [ +#include <ace/config.h> + +#if defined (ACE_HAS_GNU_REPO) + TAO_GNU_REPO +#endif + ], + [ + AC_MSG_RESULT(yes) + if test -n "$GXX" && test -z "$ACE_CONFIG"; then + TAO_CXXFLAGS="$TAO_CXXFLAGS -frepo" + fi + ] , + [ + AC_MSG_RESULT(no) + if test -n "$GXX" && test -z "$ACE_CONFIG"; then + TAO_CXXFLAGS="$TAO_CXXFLAGS -fno-implicit-templates" + fi + ]) + + dnl Check if platform supports run-time type identification using ACE headers + AC_MSG_CHECKING(if ACE supports run-time type identification) + AC_EGREP_CPP(TAO_RTTI, + [ +#include <ace/config.h> + +#if !defined (ACE_LACKS_RTTI) + TAO_RTTI +#endif + ], + [ + AC_MSG_RESULT(yes) + if test -z "$GXX" && test -z "$ACE_CONFIG"; then + case "$target" in + *solaris*) + TAO_CXXFLAGS="$TAO_CXXFLAGS -features=rtti" + ;; + *) + ;; + esac + fi + ], + [ + AC_MSG_RESULT(no) + ]) + +fi dnl test -z "$ACE_CONFIG" + +dnl Check if templates require source on platform using ACE headers +AC_MSG_CHECKING(if ACE and TAO require template source) +AC_EGREP_CPP(TAO_TEMPLATES_SOURCE, + [ +#include <ace/config.h> + +#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) + TAO_TEMPLATES_SOURCE +#endif + ], + [ + tao_cv_feature_templates_require_source="yes" + AC_MSG_RESULT(yes) + ], + [ + tao_cv_feature_templates_require_source="no" + AC_MSG_RESULT(no) + ]) +AM_CONDITIONAL(TEMPLATES_REQUIRE_SOURCE, + test X$tao_cv_feature_templates_require_source = Xyes) + + +dnl Additional flags to set by the configure script + +if test -n "$GXX" && test -z "$ACE_CONFIG"; then + TAO_CXXFLAGS="$TAO_CXXFLAGS -W -Wall -Wpointer-arith" +fi + +if test -n "$GCC" && test -z "$ACE_CONFIG"; then + TAO_CFLAGS="$TAO_CFLAGS -W -Wall -Wpointer-arith" +fi + +dnl Combine package set flags with user's flags. +dnl User's flags go after package flags to allow user to override +dnl package defaults. +dnl X_CFLAGS comes from AC_PATH_XTRA. It may include, for example, +dnl additional include file paths or macros that need to be defined +dnl in order for X11 related files to be compiled properly. +CXXFLAGS="$TAO_CXXFLAGS $CXXFLAGS" +CFLAGS="$TAO_CFLAGS $CFLAGS" +CPPFLAGS="$TAO_CPPFLAGS $CPPFLAGS" +LDFLAGS="$TAO_LDFLAGS $LDFLAGS" + +dnl Prepend purify and quantify command lines if purify and quantify are +dnl enabled. Otherwise, PURELINK and PRELINK will just be "blank." +LD="$PURELINK $PRELINK $LD" +dnl LDFLAGS="$ACE_LDFLAGS $LDFLAGS" + +dnl AC_SUBST(LDFLAGS) +dnl AC_SUBST(LIBOBJS) + +dnl These definitions are expanded in the makefile and ace-config +TAO_LIBDIR='-L${libdir}' +TAO_LIBS="${LIBS}" +TAO_INCLUDEDIR='-I${includedir}' + +AC_SUBST(TAO_LIBDIR) +AC_SUBST(TAO_LIBS) +AC_SUBST(TAO_INCLUDEDIR) + +dnl Force CXXFLAGS to be substituted in Makefiles that don't "need" them. +AC_SUBST(CXXFLAGS) + +dnl +dnl SECTION 16: `AC_OUTPUT([FILE...])' +dnl +dnl +dnl We can finally create all the files listed here; Makefile is +dnl created from Makefile.in, etc. Top-level Makefiles should be +dnl created first. +AC_OUTPUT([ + Makefile + TAO_IDL/Makefile + TAO_IDL/ast/Makefile + TAO_IDL/be/Makefile + TAO_IDL/be_include/Makefile + TAO_IDL/driver/Makefile + TAO_IDL/fe/Makefile + TAO_IDL/include/Makefile + TAO_IDL/narrow/Makefile + TAO_IDL/util/Makefile + tao/Makefile + tao-config + ], + [ + echo "" + echo "Configuration of TAO is now complete." + echo "" + ]) diff --git a/TAO/docs/cec_options.html b/TAO/docs/cec_options.html index 4f02b07223a..da61a9aa81a 100644 --- a/TAO/docs/cec_options.html +++ b/TAO/docs/cec_options.html @@ -175,7 +175,7 @@ static CEC_Factory "-CECDispatching reactive ....." <CODE>ProxyPullConsumers</CODE>. The argument is a colon separated list of flags, with the following semantics: - <TABLE BORDER="1" CELLSPACING="2" CELLPADDING="0"> + <TABLE> <TR><TH>Flag</TH><TH>Description</TH> </TR> <TR> @@ -183,30 +183,22 @@ static CEC_Factory "-CECDispatching reactive ....." <TD>Use regular mutexes and/or condition variables for serialization. </TD> - </tr> - <TR> <TD>ST</TD> <TD>Use null mutexes and/or condition variables for serialization. </TD> - </tr> - <TR> <TD>LIST</TD> <TD>Implement the collection using an ordered list, fast for iteration (i.e. during event dispatching), but slow for insertion and removal (i.e. when clients connect and disconnect from the EC). </TD> - </tr> - <TR> <TD>RB_TREE</TD> <TD>Implement the collection using a Red-Black tree, slow for iteration (i.e. during event dispatching), but fast for insertion and removal (i.e. when clients connect and disconnect from the EC). </TD> - </tr> - <TR> <TD>IMMEDIATE</TD> <TD>Threads block until they can execute a change on the data structure, the system must use other @@ -214,8 +206,6 @@ static CEC_Factory "-CECDispatching reactive ....." invalidated during event dispatching. For example, use a separate dispatching thread. </TD> - </tr> - <TR> <TD>COPY_ON_READ</TD> <TD>Before initiating an iteration to dispatch events (or similar tasks) a copy of the complete collection @@ -224,14 +214,10 @@ static CEC_Factory "-CECDispatching reactive ....." but introduces a significant source of overhead and priority inversions on the critical path. </TD> - </tr> - <TR> - <TD>COPY_ON_WRITE</TD> + <TD>COPY_ON_WRITE <STRONG>UNIMPLEMENTED</STRONG></TD> <TD>Similar to the previous one, but the copy is only performed when needed. </TD> - </tr> - <TR> <TD>DELAYED</TD> <TD>Threads that need to change the collection can detect if that change will invalidate iterators used @@ -289,7 +275,7 @@ static CEC_Factory "-CECDispatching reactive ....." ConsumerAdmin, SupplierAdmin, ProxyPushConsumer, ProxyPushSupplier, ProxyPullConsumer and the ProxyPullSupplier objects; - these POAs must have the <CODE>IMPLICIT_ACTIVATION</CODE> and the + this POAs must have the <CODE>IMPLICIT_ACTIVATION</CODE> and the <CODE>SYSTEM_ID</CODE> policies (as the RootPOA does). </P> @@ -349,19 +335,6 @@ static CEC_Factory "-CECDispatching reactive ....." updates on the collection. </TD> </TR> - - <TR><TD><CODE>supplier_poa</CODE></TD> - <TD>The POA used by the event channel to activate SupplierAdmin - and SupplierProxy objects. - </TD> - </TR> - - <TR><TD><CODE>consumer_poa</CODE></TD> - <TD>The POA used by the event channel to activate ConsumerAdmin - and ConsumerProxy objects. - </TD> - </TR> - </TABLE> </P> @@ -374,7 +347,7 @@ static CEC_Factory "-CECDispatching reactive ....." <address><a href="mailto:coryan@cs.wustl.edu">Carlos O'Ryan</a></address> <!-- Created: Thu Jul 1 21:44:28 CDT 1999 --> <!-- hhmts start --> -Last modified: Fri Apr 20 15:24:09 CDT 2001 +Last modified: Thu Mar 23 19:10:16 PST 2000 <!-- hhmts end --> </body> </html> diff --git a/TAO/docs/ec_options.html b/TAO/docs/ec_options.html index 4f97849ddc8..94b34315f24 100644 --- a/TAO/docs/ec_options.html +++ b/TAO/docs/ec_options.html @@ -63,23 +63,9 @@ struct RtecEventData can also parse options in the Service Configurator script file. </P> - <P>There are currently four implementations of the factory. The - table below describes all of the options (and values) supported by - these factories. The <em>default</em> factory supports all of - the options below and most of the potential values, except as - specifically indicated. - The <em>sched</em> factory defines new option values as indicated - below that allow the RTES to integrate with the Real-Time - Scheduling Service. Use of the <em>sched</em> factory requires - that you link in the TAO_RTSchedEvent library. - The <em>basic</em> and <em>null</em> factories are hard-coded - factories that do not support any configuration options. - They both define simple configurations that may enable some - applications to use the RTES in a smaller footprint. - See the files - <code>$TAO_ROOT/orbsvcs/orbsvcs/Event/EC_Null_Factory.h</code> - and <code>$TAO_ROOT/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h</code> - for details. + <P>The current implementation provides a default implementation + for this Factory, this document describes the options used by + this default implementation. </P> <H3>The configuration file</H3> @@ -116,14 +102,13 @@ static EC_Factory "-ECFiltering basic ....." <EM>dispatching_strategy</EM> </TD> <TD>Select the dispatching strategy used by the real-time - event service. The <EM>reactive</EM> strategy uses the + event service. A <EM>reactive</EM> strategy will use the same thread that received the event from the supplier to - push the event to all the consumers. - The <EM>priority</EM> strategy (sched factory only) uses - a prioritized pool - of threads and queries the scheduling service to select - the thread that dispatches each event. - The <EM>mt</EM> strategy also uses a pool of threads, + push the event to all the consumers, + the <EM>priority</EM> strategy will use a prioritized pool + of threads and will query the scheduling service to select + the thread that will dispatch each event; + the <EM>mt</EM> strategy will also use a pool of threads, but the thread to dispatch is randomly selected. </TD> </TR> @@ -156,8 +141,7 @@ static EC_Factory "-ECFiltering basic ....." and allows unlimited nesting of filter groups. When using the <EM>prefix</EM> strategy, the source field of the group filter must specify the number of children in the group. - The <EM>priority</EM> filtering strategy (sched factory only) - supports the same + The <EM>priority</EM> filtering strategy supports the same features as the <EM>basic</EM> filtering strategy, but it also collaborates with the scheduling service to build the dependency graph. @@ -197,8 +181,7 @@ static EC_Factory "-ECFiltering basic ....." timeouts, using <EM>reactive</EM> the same reactor used for the ORB is used by the event service. - The <EM>priority</EM> strategy (sched factory only) uses a - prioritized group of + The <EM>priority</EM> strategy uses a prioritized group of threads, timeouts with higher rate are generated by threads of higher priority. <BR><B>NOTE: The <EM>priority</EM> strategy is not @@ -233,7 +216,7 @@ static EC_Factory "-ECFiltering basic ....." and the suppliers. If the <EM>null</EM> scheduling strategy is selected this feature is disabled, - the <EM>priority</EM> strategy (sched factory only) enables this feature. + the <EM>priority</EM> strategy enables this feature. <BR><B>NOTE:<B> The default is to have the feature disabled. </TD> </TR> @@ -323,7 +306,7 @@ static EC_Factory "-ECFiltering basic ....." <CODE>ProxyPushConsumers</CODE>. The argument is a colon separated list of flags, with the following semantics: - <TABLE BORDER="1" CELLSPACING="2" CELLPADDING="0"> + <TABLE> <TR><TH>Flag</TH><TH>Description</TH> </TR> <TR> @@ -331,30 +314,22 @@ static EC_Factory "-ECFiltering basic ....." <TD>Use regular mutexes and/or condition variables for serialization. </TD> - </tr> - <TR> <TD>ST</TD> <TD>Use null mutexes and/or condition variables for serialization. </TD> - </tr> - <TR> <TD>LIST</TD> <TD>Implement the collection using an ordered list, fast for iteration (i.e. during event dispatching), but slow for insertion and removal (i.e. when clients connect and disconnect from the EC). </TD> - </tr> - <TR> <TD>RB_TREE</TD> <TD>Implement the collection using a Red-Black tree, slow for iteration (i.e. during event dispatching), but fast for insertion and removal (i.e. when clients connect and disconnect from the EC). </TD> - </tr> - <TR> <TD>IMMEDIATE</TD> <TD>Threads block until they can execute a change on the data structure, the system must use other @@ -362,8 +337,6 @@ static EC_Factory "-ECFiltering basic ....." invalidated during event dispatching. For example, use a separate dispatching thread. </TD> - </tr> - <TR> <TD>COPY_ON_READ</TD> <TD>Before initiating an iteration to dispatch events (or similar tasks) a copy of the complete collection @@ -372,14 +345,10 @@ static EC_Factory "-ECFiltering basic ....." but introduces a significant source of overhead and priority inversions on the critical path. </TD> - </tr> - <TR> - <TD>COPY_ON_WRITE</TD> + <TD>COPY_ON_WRITE <STRONG>UNIMPLEMENTED</STRONG></TD> <TD>Similar to the previous one, but the copy is only performed when needed. </TD> - </tr> - <TR> <TD>DELAYED</TD> <TD>Threads that need to change the collection can detect if that change will invalidate iterators used @@ -394,20 +363,6 @@ static EC_Factory "-ECFiltering basic ....." </TD> </TR> - <!-- <TR NAME="ECProxyPushSupplierCollection"> --> - <TR> - <TD><CODE>-ECProxyPushSupplierCollection</CODE> - <EM>flag[:flags]</EM> - </TD> - <TD><P>Configure the data structure and strategies used to - implement collections of <CODE>ProxyPushSupplier</CODE> - objects. - Use the same arguments as with the - <CODE>ECProxyPushConsumerCollection</CODE> option. - </P> - </TD> - </TR> - <!-- <TR NAME="ECPushSupplierSet"> --> <TR> <TD><CODE>-ECPushSupplierSet</CODE> @@ -462,7 +417,7 @@ static EC_Factory "-ECFiltering basic ....." Notice that the attributes include the POA used to activate the ConsumerAdmin, SupplierAdmin, ProxyPushConsumer and ProxyPushSupplier objects; - these POAs must have the <CODE>IMPLICIT_ACTIVATION</CODE> and the + this POAs must have the <CODE>IMPLICIT_ACTIVATION</CODE> and the <CODE>SYSTEM_ID</CODE> policies (as the RootPOA does). </P> @@ -519,30 +474,6 @@ static EC_Factory "-ECFiltering basic ....." appropiately. </TD> </TR> - - <TR><TD><CODE>supplier_poa</CODE></TD> - <TD>The POA used by the event channel to activate SupplierAdmin - and SupplierProxy objects. - </TD> - </TR> - - <TR><TD><CODE>consumer_poa</CODE></TD> - <TD>The POA used by the event channel to activate ConsumerAdmin - and ConsumerProxy objects. - </TD> - </TR> - - <TR><TD><CODE>disconnect_callbacks</CODE></TD> - <TD>If not zero, then the event channel sends disconnect - callbacks when a disconnect method is called on a Proxy. - For example, if a consumer calls - disconnect_push_supplier() on its proxy the EC - invokes disconnect_push_consumer() on the consumer. - An analogous call is also made for suppliers when this - attribute is set. - By default, these callbacks are not made in this situation. - </TD> - </TR> </TABLE> </P> @@ -555,7 +486,7 @@ static EC_Factory "-ECFiltering basic ....." <address><a href="mailto:coryan@cs.wustl.edu">Carlos O'Ryan</a></address> <!-- Created: Thu Jul 1 21:44:28 CDT 1999 --> <!-- hhmts start --> -Last modified: Fri Apr 20 15:30:42 CDT 2001 +Last modified: Thu Mar 23 21:17:40 PST 2000 <!-- hhmts end --> </body> </html> diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html index f0fc0d9850a..e1718318829 100644 --- a/TAO/docs/releasenotes/index.html +++ b/TAO/docs/releasenotes/index.html @@ -485,18 +485,17 @@ object. Each profile for an object may encode information pertaining to QoS, network and transport protocols, addresses or routes.<p> <li> -<b>Example Transport protocols</b> - Aside from IIOP, four additional +<b>Example Transport protocols</b> - Aside from IIOP, three additional transport protocols are distributed with TAO: <ol> <P><li>UIOP: GIOP over local IPC (UNIX domain sockets)</li> <P><li>SHMIOP: GIOP over shared memory</li> -<P><li>SSLIOP: IIOP over SSL (Secure Socket Layer).</li> -<P><li>DIOP: GIOP over UDP/IP (currently located under <A HREF="../../examples/PluggableUDP/">$TAO_ROOT/examples/PluggableUDP/</A>)</li> +<P><li>SSLIOP: IIOP over SSL (Secure Socket Layer). </ol> <P> Other interesting transport protocols could be for ATM, Buses (VME or -PCI), TP4, and GSMP. TAO users have also created their own +PCI), TP4, GSMP, and UDP/IP. TAO users have also created their own pluggable transport protocols, such as a ScramNet pluggable protocol. </li> diff --git a/TAO/docs/rtcorba/features.html b/TAO/docs/rtcorba/features.html index 4cfad2f446f..6e2b7b4ed24 100644 --- a/TAO/docs/rtcorba/features.html +++ b/TAO/docs/rtcorba/features.html @@ -204,17 +204,9 @@ leaving it up to implementations. Below is a summary TAO defaults. </p> <h3><a name="threadpools">Threadpools</a></h3> -<ul> - -<li>Initial support for ThreadPools is now available in TAO. Users -can use the standard RT-CORBA APIs to create thread pools. See -<code>$TAO_ROOT/tests/RTCORBA/Thread_Pool</code> for an example. -However, a lot more work needs to go into partitioning ORB resources -among the thread pool lanes before the feature is completely -supported. <p> - -<li> Until it is fully supported, follow these steps to obtain -<i>threadpool with lane</i> functionality in TAO:</p> +<p>This feature is still in progress. Until it is fully supported, follow +these steps to obtain <i>threadpool with lane</i> +functionality in TAO:</p> <ol> <li>Include <CODE>"tao/Pool_Per_Endpoint.h"</CODE> into the server's @@ -238,26 +230,21 @@ and 60, you would specify:<br> <li>Do not use <i>RTCORBA::ThreadpoolPolicy</i></li> </ol> -<p>For an example of following the steps above, see -<CODE>$TAO/tests/RTCORBA/Server_Declared</CODE>. The limitation -of this method is that the threadpool is global, <i>i.e.</i>, -available to all POAs in the ORB. There is no way to create -additional threadpools and associate them with selected POAs. -<i>Threadpool without lanes</i> functionality is not yet +<p>For an example of following the steps above, see <CODE>$TAO/tests/RTCORBA/Server_Declared</CODE>. The limitation of +this method is that the threadpool is global, <i>i.e.</i>, available to all POAs in the +ORB. There is no way to create additional threadpools and associate them with +selected POAs. <i>Threadpool without lanes</i> functionality is not yet available.</p> -<p>Threadpool threads are the ones doing all the work in the ORB: no -additional internal threads are created by the ORB for such tasks as -I/O. </p> +<p>Threadpool threads are the ones doing all the work in the ORB: no additional internal threads +are created by the ORB for such tasks as I/O. </p> -<p>More documentation will be available here once threadpools are -fully supported. Also, see <a -href="#valid_configurations">Priority Policies</a> section, which -contains information on how threadpools interact with <i> +<p>More documentation will be available here once threadpools are fully supported. +Also, see <a href="#valid_configurations">Priority Policies</a> section, which +contains information on how threadpools interact with +<i> PriorityBandedConnectionPolicy</i> and <i>PriorityModelPolicy</i>.</p> -</ul> - <h3><a name="valid_configurations">Priority Policies</a></h3> <p>The table below lists all possible configurations of policies involving priorities, diff --git a/TAO/docs/rtcorba/status.html b/TAO/docs/rtcorba/status.html index b718eae7ebd..2c3a3f4e2a5 100644 --- a/TAO/docs/rtcorba/status.html +++ b/TAO/docs/rtcorba/status.html @@ -45,7 +45,6 @@ indicate "RTCORBA" in the component field when submitting a bug report features see <a href="#supported">this section</a>). <ul> - <li>POA Threadpools</li> <li>Online Documentation</li> <li>New tests</li> <li>New collocation scheme</li> @@ -64,8 +63,8 @@ features see <a href="#supported">this section</a>). </tr> <tr> <td width="33%" align="left"><br> - Complete POA Threadpools support</td> - <td width="33%" align="center">5/15/00</td> + POA Threadpools</td> + <td width="33%" align="center">??</td> <td width="34%" align="center"><a href="mailto:irfan@cs.wustl.edu">Irfan Pyarali</a></td> </tr> </table> @@ -90,7 +89,6 @@ in progress</a>). <li>Private Connections</li> <li>Invocation Timeout</li> <li>RT Mutex</li> - <li>POA Threadpools</li> </ul> <h3><a name="unsupported">Unsupported Features</a></h3> diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp index 8aad581ec55..f416910ee6b 100644 --- a/TAO/examples/Buffered_AMI/client.cpp +++ b/TAO/examples/Buffered_AMI/client.cpp @@ -61,13 +61,42 @@ public: received_all_replies = 1; } - void method_excep (AMI_testExceptionHolder *, + void method_excep (AMI_testExceptionHolder *holder, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) - { - ACE_PRINT_EXCEPTION ((*ACE_TRY_ENV.exception ()), - "AMI exception caught:"); - } + { + ACE_TRY + { + holder->raise_method (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCH(CORBA::SystemException, ex) + { + ACE_PRINT_EXCEPTION (ex, "Reply_Handler::method_excep: "); + } + ACE_ENDTRY; + } + + void shutdown (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) + { + } + + void shutdown_excep (AMI_testExceptionHolder *holder, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { + ACE_TRY + { + holder->raise_shutdown (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCH(CORBA::SystemException, ex) + { + ACE_PRINT_EXCEPTION (ex, "Reply_Handler::shutdown_excep: "); + } + ACE_ENDTRY; + } }; static int diff --git a/TAO/examples/Buffered_AMI/run_test.pl b/TAO/examples/Buffered_AMI/run_test.pl index cc4c782cf58..67d7d38fb4f 100755 --- a/TAO/examples/Buffered_AMI/run_test.pl +++ b/TAO/examples/Buffered_AMI/run_test.pl @@ -19,7 +19,7 @@ $CL = new PerlACE::Process ("client", "-k file://$iorfile -x"); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); exit 1; diff --git a/TAO/examples/Buffered_AMI/test.idl b/TAO/examples/Buffered_AMI/test.idl index cacccf61188..2a1eca586b6 100644 --- a/TAO/examples/Buffered_AMI/test.idl +++ b/TAO/examples/Buffered_AMI/test.idl @@ -7,5 +7,5 @@ interface test void method (in unsigned long request_number, out unsigned long reply_number); - oneway void shutdown (); + void shutdown (); }; diff --git a/TAO/examples/Buffered_Oneways/run_test.pl b/TAO/examples/Buffered_Oneways/run_test.pl index ff810f280c4..5d64b90f060 100755 --- a/TAO/examples/Buffered_Oneways/run_test.pl +++ b/TAO/examples/Buffered_Oneways/run_test.pl @@ -29,7 +29,7 @@ print STDERR "\nFlushing based on implicit message counts\n\n"; $CL->Arguments ("-k file://$iorfile -c 5 -b -1 -f -1 -t -1"); -$client = $CL->SpawnWaitKill (60); +$client = $CL->SpawnWaitKill (300); if ($client != 0) { print STDERR "ERROR: client returned $client\n"; @@ -40,7 +40,7 @@ print STDERR "\nFlushing based on implicit message bytes\n\n"; $CL->Arguments ("-k file://$iorfile -b 250 -c -1 -f -1 -t -1"); -$client = $CL->SpawnWaitKill (60); +$client = $CL->SpawnWaitKill (300); if ($client != 0) { print STDERR "ERROR: client returned $client\n"; @@ -51,7 +51,7 @@ print STDERR "\nFlushing based on implicit timeout\n\n"; $CL->Arguments ("-k file://$iorfile -t 5000 -b -1 -c -1 -f -1"); -$client = $CL->SpawnWaitKill (60); +$client = $CL->SpawnWaitKill (300); if ($client != 0) { print STDERR "ERROR: client returned $client\n"; @@ -62,7 +62,7 @@ print STDERR "\nExplicit queue flushing (and server shutdown)\n\n"; $CL->Arguments ("-k file://$iorfile -f 5 -b -1 -c 100 -t -1 -x"); -$client = $CL->SpawnWaitKill (60); +$client = $CL->SpawnWaitKill (300); if ($client != 0) { print STDERR "ERROR: client returned $client\n"; diff --git a/TAO/examples/POA/Default_Servant/Makefile.bor b/TAO/examples/POA/Default_Servant/Makefile.bor deleted file mode 100644 index c6e5289ded3..00000000000 --- a/TAO/examples/POA/Default_Servant/Makefile.bor +++ /dev/null @@ -1,7 +0,0 @@ -# -# Makefile for building the poa default_servant example -# - -MAKEFILES = client.bor server.bor - -!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/examples/POA/Default_Servant/client.bor b/TAO/examples/POA/Default_Servant/client.bor deleted file mode 100644 index 4271670deb9..00000000000 --- a/TAO/examples/POA/Default_Servant/client.bor +++ /dev/null @@ -1,28 +0,0 @@ - -# -# Makefile for building the poa default servant example -# - -NAME = client - -OBJFILES = \ - $(OBJDIR)\FileC.obj \ - $(OBJDIR)\FileS.obj \ - $(OBJDIR)\client.obj - -IDLFILES = \ - $(IDLDIR)\File.idl - -CPPDIR = .;.. - -IDLDIR = . - -!include <$(ACE_ROOT)\include\makeinclude\build_example.bor> - -# -# IDL Build rules -# - -$(IDLDIR)\FileC.cpp $(IDLDIR)\FileS.cpp: $(IDLDIR)\File.idl - $(TAO_IDL) $** - diff --git a/TAO/examples/POA/Default_Servant/server.bor b/TAO/examples/POA/Default_Servant/server.bor deleted file mode 100644 index 0284546fb18..00000000000 --- a/TAO/examples/POA/Default_Servant/server.bor +++ /dev/null @@ -1,29 +0,0 @@ - -# -# Makefile for building the poa default servant example -# - -NAME = server - -OBJFILES = \ - $(OBJDIR)\FileC.obj \ - $(OBJDIR)\FileS.obj \ - $(OBJDIR)\File_i.obj \ - $(OBJDIR)\server.obj - -IDLFILES = \ - $(IDLDIR)\File.idl - -CPPDIR = .;.. - -IDLDIR = . - -!include <$(ACE_ROOT)\include\makeinclude\build_example.bor> - -# -# IDL Build rules -# - -$(IDLDIR)\FileC.cpp $(IDLDIR)\FileS.cpp: $(IDLDIR)\File.idl - $(TAO_IDL) $** - diff --git a/TAO/examples/POA/Makefile.bor b/TAO/examples/POA/Makefile.bor index 3252c787f26..30fce43157c 100644 --- a/TAO/examples/POA/Makefile.bor +++ b/TAO/examples/POA/Makefile.bor @@ -1,7 +1,8 @@ +# # Makefile for building the TAO POA examples +# DIRS = \ - Default_Servant \ DSI \ FindPOA \ Forwarding \ diff --git a/TAO/examples/POA/On_Demand_Loading/Makefile.bor b/TAO/examples/POA/On_Demand_Loading/Makefile.bor index 517c1107c23..9ea932fa7f3 100644 --- a/TAO/examples/POA/On_Demand_Loading/Makefile.bor +++ b/TAO/examples/POA/On_Demand_Loading/Makefile.bor @@ -1,4 +1,6 @@ +# # Makefile for building the POA On_Demand_Loading executable +# NAME = server diff --git a/TAO/examples/POA/TIE/client.dsp b/TAO/examples/POA/TIE/client.dsp index 82d6d9aedf7..6e057006e8c 100644 --- a/TAO/examples/POA/TIE/client.dsp +++ b/TAO/examples/POA/TIE/client.dsp @@ -97,6 +97,10 @@ SOURCE=.\client.cpp SOURCE=.\FooC.cpp
# End Source File
+# Begin Source File
+
+SOURCE=.\FooS.cpp
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -105,6 +109,14 @@ SOURCE=.\FooC.cpp SOURCE=.\FooC.h
# End Source File
+# Begin Source File
+
+SOURCE=.\FooS.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\FooS_T.h
+# End Source File
# End Group
# Begin Group "IDL Files"
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.cpp index 9c7cf55d9cf..ec06afddfc2 100644 --- a/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.cpp +++ b/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.cpp @@ -6,6 +6,7 @@ #include "DIOP_Profile.h" #include "tao/MProfile.h" #include "tao/ORB_Core.h" +#include "tao/Server_Strategy_Factory.h" #include "tao/debug.h" #include "tao/Protocols_Hooks.h" @@ -25,8 +26,7 @@ TAO_DIOP_Acceptor::TAO_DIOP_Acceptor (CORBA::Boolean flag) endpoint_count_ (0), version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR), orb_core_ (0), - lite_flag_ (flag), - connection_handler_ (0) + lite_flag_ (flag) { } @@ -208,7 +208,6 @@ int TAO_DIOP_Acceptor::close (void) { delete this->connection_handler_; - this->connection_handler_ = 0; return 0; } @@ -386,8 +385,10 @@ TAO_DIOP_Acceptor::open_i (const ACE_INET_Addr& addr) this->connection_handler_->local_addr (addr); this->connection_handler_->open_server (); + this->orb_core_->reactor ()->register_handler (this->connection_handler_, ACE_Event_Handler::READ_MASK); + // ------------------------------------ diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.h b/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.h index 73b68955484..a240f12df02 100644 --- a/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.h +++ b/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.h @@ -28,6 +28,8 @@ #include "DIOP_Connection_Handler.h" #include "tao/Acceptor_Impl.h" +#include "ace/Acceptor.h" +#include "ace/SOCK_Acceptor.h" #include "tao/GIOP_Message_State.h" #include "diop_export.h" diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp index 1582bccf625..2a1930d7551 100644 --- a/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp +++ b/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp @@ -59,23 +59,7 @@ TAO_DIOP_Connection_Handler::TAO_DIOP_Connection_Handler (TAO_ORB_Core *orb_core TAO_DIOP_Connection_Handler::~TAO_DIOP_Connection_Handler (void) { - if (this->transport () != 0) { - // If the socket has not already been closed. - if (this->get_handle () != ACE_INVALID_HANDLE) - { - // Cannot deal with errors, and therefore they are ignored. - this->transport ()->send_buffered_messages (); - } - else - { - // Dequeue messages and delete message blocks. - this->transport ()->dequeue_all (); - } - } - // @@ Frank: Added from DIOP_Connect.cpp - this->handle_cleanup (); - - udp_socket_.close (); + this->udp_socket_.close (); } // DIOP Additions - Begin @@ -247,9 +231,6 @@ TAO_DIOP_Connection_Handler::handle_close (ACE_HANDLE handle, // Close the handle.. if (this->get_handle () != ACE_INVALID_HANDLE) { - // Send the buffered messages first - this->transport ()->send_buffered_messages (); - // Purge the entry too this->transport ()->mark_invalid (); @@ -257,11 +238,14 @@ TAO_DIOP_Connection_Handler::handle_close (ACE_HANDLE handle, // a reference to it. This will eventually call // TAO_Transport::release (). this->transport (0); + + this->peer ().close (); } // Follow usual Reactor-style lifecycle semantics and commit // suicide. - this->destroy (); + delete this; + } return 0; @@ -278,18 +262,11 @@ int TAO_DIOP_Connection_Handler::handle_timeout (const ACE_Time_Value &, const void *) { - // This method is called when buffering timer expires. - // - ACE_Time_Value *max_wait_time = 0; - - TAO_Stub *stub = 0; - int has_timeout; - this->orb_core ()->call_timeout_hook (stub, - has_timeout, - *max_wait_time); - // Cannot deal with errors, and therefore they are ignored. - this->transport ()->send_buffered_messages (max_wait_time); + if (this->transport ()->handle_output () == -1) + { + return -1; + } return 0; } @@ -385,10 +362,9 @@ TAO_DIOP_Connection_Handler::handle_input_i (ACE_HANDLE, if (--this->pending_upcalls_ <= 0) result = -1; - // @@ Michael: - // We always return 0, as we do not have any + // We always return a positive number, as we do not have any // send errors. - return 0; + return 1; } // @@ Frank: From DIOP_Connect.cpp @@ -419,13 +395,9 @@ TAO_DIOP_Connection_Handler::handle_cleanup (void) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>; -template class ACE_Concurrency_Strategy<TAO_DIOP_Connection_Handler>; -template class ACE_Creation_Strategy<TAO_DIOP_Connection_Handler>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> -#pragma instantiate ACE_Concurrency_Strategy<TAO_DIOP_Connection_Handler> -#pragma instantiate ACE_Creation_Strategy<TAO_DIOP_Connection_Handler> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.cpp index 0b74c29d6a6..1342c34e712 100644 --- a/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.cpp +++ b/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.cpp @@ -1,17 +1,18 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ -#include "ace/Connector.h" + +#include "DIOP_Connector.h" +#include "DIOP_Profile.h" #include "tao/debug.h" #include "tao/ORB_Core.h" +#include "tao/Client_Strategy_Factory.h" #include "tao/Environment.h" +#include "ace/Auto_Ptr.h" #include "tao/Base_Transport_Property.h" #include "tao/Protocols_Hooks.h" - -#include "DIOP_Connector.h" -#include "DIOP_Profile.h" - +#include "ace/Strategies_T.h" ACE_RCSID (DIOP, DIOP_Connector, @@ -19,31 +20,43 @@ ACE_RCSID (DIOP, #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +template class ACE_Node<ACE_INET_Addr>; +template class ACE_Unbounded_Stack<ACE_INET_Addr>; +template class ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr>; +template class TAO_Connect_Concurrency_Strategy<TAO_DIOP_Connection_Handler>; +template class TAO_Connect_Creation_Strategy<TAO_DIOP_Connection_Handler>; +template class ACE_Strategy_Connector<TAO_DIOP_Connection_Handler, ACE_SOCK_CONNECTOR>; +template class ACE_Connect_Strategy<TAO_DIOP_Connection_Handler, ACE_SOCK_CONNECTOR>; +template class ACE_Connector<TAO_DIOP_Connection_Handler, ACE_SOCK_CONNECTOR>; template class ACE_Svc_Tuple<TAO_DIOP_Connection_Handler>; + template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_DIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>; template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_DIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>; template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_DIOP_Connection_Handler>*>; - -template class ACE_Map_Entry<ACE_INET_Addr, TAO_DIOP_Connection_Handler *>; - template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_DIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>; template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_DIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex < ACE_INET_Addr, TAO_DIOP_Connection_Handler *, ACE_Hash < ACE_INET_Addr >, ACE_Equal_To < ACE_INET_Addr >, ACE_Null_Mutex >; +template class ACE_Auto_Basic_Array_Ptr<TAO_DIOP_Connection_Handler*>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +#pragma instantiate ACE_Node<ACE_INET_Addr> +#pragma instantiate ACE_Unbounded_Stack<ACE_INET_Addr> +#pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr> + +#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_DIOP_Connection_Handler> +#pragma instantiate TAO_Connect_Creation_Strategy<TAO_DIOP_Connection_Handler> +#pragma instantiate ACE_Strategy_Connector<TAO_DIOP_Connection_Handler, ACE_SOCK_CONNECTOR> +#pragma instantiate ACE_Connect_Strategy<TAO_DIOP_Connection_Handler, ACE_SOCK_CONNECTOR> +#pragma instantiate ACE_Connector<TAO_DIOP_Connection_Handler, ACE_SOCK_CONNECTOR> #pragma instantiate ACE_Svc_Tuple<TAO_DIOP_Connection_Handler> + #pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_DIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX> #pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_DIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX> #pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_DIOP_Connection_Handler>*> - -#pragma instantiate ACE_Map_Entry<ACE_INET_Addr, TAO_DIOP_Connection_Handler *>; - #pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_DIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX> #pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_DIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX> - -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex < ACE_INET_Addr,TAO_DIOP_Connection_Handler *, ACE_Hash < ACE_INET_Addr >, ACE_Equal_To < ACE_INET_Addr >, ACE_Null_Mutex > +#pragma instantiate ACE_Auto_Basic_Array_Ptr<TAO_DIOP_Connection_Handler*> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -248,20 +261,3 @@ TAO_DIOP_Connector::init_tcp_properties (void) // @@ Michael: We have not TCP, so we have no TCP properties. return 0; } - - -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash <ACE_INET_Addr>; -template class ACE_Equal_To <ACE_INET_Addr>; -template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, TAO_DIOP_Connection_Handler *, ACE_Hash <ACE_INET_Addr>, ACE_Equal_To <ACE_INET_Addr>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<ACE_INET_Addr, TAO_DIOP_Connection_Handler *>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash <ACE_INET_Addr>; -#pragma instantiate ACE_Equal_To <ACE_INET_Addr> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, TAO_DIOP_Connection_Handler *, ACE_Hash <ACE_INET_Addr>, ACE_Equal_To <ACE_INET_Addr>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<ACE_INET_Addr, TAO_DIOP_Connection_Handler *>; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.h b/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.h index f2bf1174b37..a91765d6dd2 100644 --- a/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.h +++ b/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.h @@ -14,18 +14,23 @@ */ //============================================================================= + #ifndef TAO_DIOP_CONNECTOR_H #define TAO_DIOP_CONNECTOR_H #include "ace/pre.h" -#include "tao/Pluggable.h" -#include "DIOP_Connection_Handler.h" -#include "diop_export.h" +#include "ace/Connector.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/SOCK_Connector.h" +#include "tao/Pluggable.h" +#include "tao/Connector_Impl.h" +#include "DIOP_Connection_Handler.h" +#include "diop_export.h" + // **************************************************************** /** @@ -72,6 +77,22 @@ protected: /// initialize <tcp_properties_>. int init_tcp_properties (void); +public: + + typedef TAO_Connect_Concurrency_Strategy<TAO_DIOP_Connection_Handler> + TAO_DIOP_CONNECT_CONCURRENCY_STRATEGY; + + typedef TAO_Connect_Creation_Strategy<TAO_DIOP_Connection_Handler> + TAO_DIOP_CONNECT_CREATION_STRATEGY; + + typedef ACE_Connect_Strategy<TAO_DIOP_Connection_Handler, + ACE_SOCK_CONNECTOR> + TAO_DIOP_CONNECT_STRATEGY ; + + typedef ACE_Strategy_Connector<TAO_DIOP_Connection_Handler, + ACE_SOCK_CONNECTOR> + TAO_DIOP_BASE_CONNECTOR; + protected: /// TCP configuration properties to be used for all diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.cpp index d8fc10372d0..06005ab724e 100644 --- a/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.cpp +++ b/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.cpp @@ -1,6 +1,10 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ +#include "DIOP_Transport.h" +#include "DIOP_Connection_Handler.h" +#include "DIOP_Acceptor.h" +#include "DIOP_Profile.h" #include "tao/Acceptor_Registry.h" #include "tao/operation_details.h" #include "tao/Timeprobe.h" @@ -14,12 +18,6 @@ #include "tao/GIOP_Message_Base.h" #include "tao/GIOP_Message_Lite.h" - -#include "DIOP_Transport.h" -#include "DIOP_Connection_Handler.h" -#include "DIOP_Acceptor.h" -#include "DIOP_Profile.h" - #if !defined (__ACE_INLINE__) # include "DIOP_Transport.i" #endif /* ! __ACE_INLINE__ */ @@ -69,155 +67,17 @@ TAO_DIOP_Transport::messaging_object (void) return this->messaging_object_; } - ssize_t -TAO_DIOP_Transport::send_i (const ACE_Message_Block *message_block, - const ACE_Time_Value * /*max_wait_time*/, - size_t *bt) +TAO_DIOP_Transport::send_i (iovec *iov, int iovcnt, + size_t &bytes_transferred, + const ACE_Time_Value *max_wait_time) { - const ACE_INET_Addr &addr = this->connection_handler_->addr (); - - /*size_t temp = 0; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - bytes_transferred = 0;*/ - ssize_t bytes_transferred = 0; - if (bt) - { - bytes_transferred = *bt; - } - - char stack_buffer[ACE_MAX_DGRAM_SIZE]; - size_t stack_offset=0; - size_t message_length=0; - - iovec iov[IOV_MAX]; - int iovcnt = 0; - - while (message_block != 0) - { - // Our current message block chain. - const ACE_Message_Block *current_message_block = message_block; - - while (current_message_block != 0) - { - size_t current_message_block_length = - current_message_block->length (); - - message_length += current_message_block_length; - - if(message_length > ACE_MAX_DGRAM_SIZE) - { - // This is an error as we do not send more. - // Silently drop the message but log an error. - - // Pluggable_Messaging::transport_message only - // cares if it gets -1 or 0 so we can return a - // partial length and it will think all has gone - // well. - - - if (TAO_debug_level > 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\n\nTAO (%P|%t) ") - ACE_TEXT ("DIOP_Transport::send ") - ACE_TEXT ("Message length %d exceeds ACE_MAX_DGRAM_SIZE=%d\n"), - message_length, - ACE_MAX_DGRAM_SIZE)); - } - - return 1; // Pretend it is o.k. - // This is a problem in the message - // catalogue. - } - - // Check if this block has any data to be sent. - if (current_message_block_length > 0) - { - if(iovcnt < (IOV_MAX-1)) - { - // Collect the data in the iovec. - iov[iovcnt].iov_base = current_message_block->rd_ptr (); - iov[iovcnt].iov_len = current_message_block_length; - - // Increment iovec counter. - iovcnt++; - - // The buffer is full make a OS call. @@ TODO find a way to - // find IOV_MAX for platforms that do not define it rather - // than simply setting IOV_MAX to some arbitrary value such - // as 16. - } - else - { - // @@ John Mackenzie. If we reach IOVMAX-1 we need to pack - // the remanining blocks into the last available buffer. - - ACE_OS::memcpy(stack_buffer+stack_offset, - current_message_block->rd_ptr (), - current_message_block_length); - stack_offset += current_message_block_length; - - iovcnt = IOV_MAX; // We just stay with the last buffer. - iov[iovcnt-1].iov_base = stack_buffer; - iov[iovcnt-1].iov_len = stack_offset; - } - } - - // Select the next message block in the chain. - current_message_block = current_message_block->cont (); - } - - // Selection of the next message block chain. - message_block = message_block->next (); - } - - if (TAO_debug_level > 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\n\nTAO (%P|%t) ") - ACE_TEXT ("iovcnt is %d \n."),iovcnt)); - } - - // Send the buffers. - - if (iovcnt != 0) - { - bytes_transferred = - this->connection_handler_->dgram ().send (iov, - iovcnt, - addr); + ssize_t retval = this->connection_handler_->peer ().sendv (iov, iovcnt, + max_wait_time); + if (retval > 0) + bytes_transferred = retval; - if (TAO_debug_level > 0) - { - ACE_DEBUG ((LM_DEBUG, - "TAO_DIOP_Transport::send_i: sent %d bytes to %s:%d\n", - bytes_transferred, - addr.get_host_name (), - addr.get_port_number ())); - } - - // Errors. - // @@ John Mackenzie. We cannot propogate errors up in DIOP - // as it will cause transport recycle which makes no sense - // Error could be ECONNREFUSED if transport reports ICMP errors. - } - - if (bytes_transferred == -1 || bytes_transferred == 0) - { - if (TAO_debug_level > 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\n\nTAO (%P|%t) ") - ACE_TEXT ("DIOP_Transport::send") - ACE_TEXT (" %p\n\n"), - ACE_TEXT ("Error returned from transport:"))); - } - return 1; // Fake a good return. - } - - // Return total bytes transferred. - return bytes_transferred; + return retval; } ssize_t @@ -231,15 +91,12 @@ TAO_DIOP_Transport::recv_i (char *buf, len, from_addr); - if (TAO_debug_level > 0) - { - ACE_DEBUG ((LM_DEBUG, - "TAO_DIOP_Transport::recv_i: received %d bytes from %s:%d %d\n", - n, - from_addr.get_host_name (), - from_addr.get_port_number (), - errno)); - } + ACE_DEBUG ((LM_DEBUG, + "TAO_DIOP_Transport::recv_i: received %d bytes from %s:%d %d\n", + n, + from_addr.get_host_name (), + from_addr.get_port_number (), + errno)); // Remember the from addr to eventually use it as remote // addr for the reply. @@ -288,7 +145,7 @@ int TAO_DIOP_Transport::register_handler_i (void) { // @@ Michael: - // + // // We do never register register the handler with the reactor // as we never need to be informed about any incoming data, // assuming we only use one-ways. @@ -352,7 +209,7 @@ TAO_DIOP_Transport::send_message (TAO_OutputCDR &stream, // versions seem to need it though. Leaving it costs little. // This guarantees to send all data (bytes) or return an error. - ssize_t n = this->send_or_buffer (stub, + ssize_t n = this->send_message_i (stub, twoway, stream.begin (), max_wait_time); @@ -368,17 +225,6 @@ TAO_DIOP_Transport::send_message (TAO_OutputCDR &stream, return -1; } - // EOF. - if (n == 0) - { - if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO: (%P|%t|%N|%l) send_message () \n") - ACE_TEXT ("EOF, closing transport %d\n"), - this->id ())); - return -1; - } - return 1; } @@ -675,4 +521,3 @@ TAO_DIOP_Transport::transition_handler_state_i (void) { this->connection_handler_ = 0; } - diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.h b/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.h index c4585141dd1..3e4abd9c43e 100644 --- a/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.h +++ b/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.h @@ -72,10 +72,9 @@ protected: virtual TAO_Pluggable_Messaging *messaging_object (void); /// Write the complete Message_Block chain to the connection. - virtual ssize_t send_i (const ACE_Message_Block *mblk, - const ACE_Time_Value *s = 0, - size_t *bytes_transferred = 0); - + virtual ssize_t send_i (iovec *iov, int iovcnt, + size_t &bytes_transferred, + const ACE_Time_Value *max_wait_time); /// Read len bytes from into buf. virtual ssize_t recv_i (char *buf, diff --git a/TAO/examples/PluggableUDP/DIOP/README b/TAO/examples/PluggableUDP/DIOP/README index d2dd98faa2b..3f00555185c 100644 --- a/TAO/examples/PluggableUDP/DIOP/README +++ b/TAO/examples/PluggableUDP/DIOP/README @@ -2,33 +2,34 @@ DIOP - UDP Based Pluggable Protocol =================================== This directory contains all of the code needed to use the UDP -Pluggable Protocol (DIOP). It is work-in-progress that when complete -will be integrated with the other standard pluggable protocols in -$TAO_ROOT/tao/Strategies/. +Pluggable Protocol (DIOP). It should be considered a work in progress +and will eventually be integrated in with the other standard pluggable +protocols in tao/Strategies. Notes on the DIOP implementation: -- The DIOP implemenation uses connectionless UDP sockets. +- The DIOP implemenation uses unconnected UDP sockets. -- The server DIOP implementation bypasses the actual TAO Acceptor +- The server side implementation bypasses the actual TAO acceptor and opens always a UDP socket on start-up. -- The address of that UDP socket can be configured via -ORBendpoint, - e.g., -ORBEndpoint diop://:1303 +- The address of that UDP socket can be configured via + e.g. -ORBEndpoint diop://:1303 - If nothing is specified, the implementation will select a port and - open a socket on all network interfaces. This is the default ORB - behavior and can be overwritten using the -ORBEndpoint switch. + If nothing is specified, the implementation will select a port + and open a socket on all network interfaces. + (This is the default ORB behavior and can be overwritten using + the -ORBEndpoint switch) - Because no connections - no state - exist, all client requests from different clients arrive at the same socket! -- The client DIOP implementation bypasses the actual - TAO Connector. It installs a connection handler on the first +- The client side DIOP implementation bypasses the actual + TAO connector. It installs a connection handler on the first invocation on a remote CORBA object. -DIOP Installation (this will be simplified when DIOP is integrated in the -$TAO_ROOT/tao/Strategies/ directory): + +DIOP Installation: - Compile TAO/examples/PluggableUDP/DIOP to create the DIOP library. @@ -42,56 +43,57 @@ $TAO_ROOT/tao/Strategies/ directory): dynamic DIOP_Factory Service_Object * TAO_DIOP:_make_TAO_DIOP_Protocol_Factory() "" static Resource_Factory "-ORBProtocolFactory DIOP_Factory" -Limitations: -- No preconnections are supported. +Issues: -- No thread-per-connection is supported. +- Optimization of DIOP_Transport::{send,recv} -- Requests from multiple clients are received on the same socket. +- Default port is the same on client and server, therefore + the client ports need to be explicitly set by -ORBEndpoint option. + Maybe there is a way to find free ports? -- Only oneway invocations operations are supported. +- Remove commented out code from DIOP_* files. - Using exclusive connections (see ORB configuration) twoways might - work, but are not supported yet. Please note that you need to use - timeouts in combination with twoways in order to avoid deadlocking - your application. +Limitations: -Open Issues: +- No preconnections are supported. -- Default port is the same on client and server, therefore - the client ports need to be explicitly set by -ORBEndpoint option. - Maybe there is a way to find free ports? +- Only single threaded servers are supported as we cache parts of a UDP + packet. If we would allow multiple threads this buffer could be corrupted. -- GIOP invocations containing more than ACE_MAX_DGRAM_SIZE bytes of header - and invocation data will not be sent to the remote side, they will - be dropped without error notification. The reason for this is that - we want to ensure all invocation information is received at once by - the server. Supporting multiple UDP packets would require keeping - state in the server and is therefore avoided. +- No thread-per connection is supported. + +- Requests from multiple clients are received on the same socket. - A hook might be provided in the future in order to notify - applications about dropped invocations. Disclaimer: - This UDP Pluggable Protocol has been developed for a particular - set of assumptions: + This UDP Pluggable Protocol has been developed for Siemens base station + software. We assumed certain requriements, which do not fit everybody, so + be careful applying this pluggable protocol to your application. + + The assumptions we had: - - Almost 100% reliable UDP communication, e.g., IP over ATM. - Even if it would be less reliable you can manage it by using - one-way request operations and one-way response operations in - combination with application level timeouts. + - Almost 100% reliable UDP communication as we use IP over ATM + + (Even if it would be less reliable you can manage it by using one-way + request operations and one-way response operations in combination with + application level timeouts.) - - TCP is inappropriate due to its sluggish on sudden disconnections, - e.g., it must be possible to "plug & play" CPU cards without - impacting any ORB communicating to a CPU. This is the main reason - why we do not keep any state in the client of the Pluggable Protocol. + - TCP got ruled out as it behaves to sluggish on sudden disconnections, we + needed to be able to plug & play CPU cards without impacting any ORB + communicating to that CPU. + + (This is the main reason why we do not keep any state in the client side + of the Pluggable Protocol) + + - As we use a special hardware configuration we defined that every GIOP message + (and therefore every IDL signature) message is shorter than 4kB, which is the + maximum length of a UDP packet anyway. + + (Support for fragmentation, as GIOP 1.2 supports it might help, this is + a future option) - - Every GIOP message (and therefore every IDL signature) message is - <= 4kB, i.e., ACE_MAX_DGRAM_SIZE. Support for fragmentation, as - GIOP 1.2 supports it might help, this is a future option. - Thus, no data sent via DIOP can be larger than ACE_MAX_DGRAM_SIZE. Appendix: @@ -100,3 +102,9 @@ Appendix: -k <ior> -t <timeout in ms> -i <iterations> + +Comments, Suggestions, or Feedback: + + mailto:Michael.Kircher@mchp.siemens.de or, + mailto:John.Mackenzie.extern@icn.siemens.de or, + mailto:fhunleth@cs.wustl.edu diff --git a/TAO/examples/PluggableUDP/DIOP/TAO_DIOP.dsw b/TAO/examples/PluggableUDP/DIOP/TAO_DIOP.dsw index f41ddb25b81..cfe57697ba7 100644 --- a/TAO/examples/PluggableUDP/DIOP/TAO_DIOP.dsw +++ b/TAO/examples/PluggableUDP/DIOP/TAO_DIOP.dsw @@ -11,9 +11,6 @@ Package=<5> Package=<4>
{{{
- Begin Project Dependency
- Project_Dep_Name Simple Performance Server
- End Project Dependency
}}}
###############################################################################
@@ -26,9 +23,6 @@ Package=<5> Package=<4>
{{{
- Begin Project Dependency
- Project_Dep_Name TAO_DIOP
- End Project Dependency
}}}
###############################################################################
@@ -45,7 +39,7 @@ Package=<4> ###############################################################################
-Project: "UDP Basic Client"=..\tests\Basic\client.dsp - Package Owner=<4>
+Project: "UDP Client"=..\tests\Basic\client.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -53,14 +47,11 @@ Package=<5> Package=<4>
{{{
- Begin Project Dependency
- Project_Dep_Name UDP Basic Server
- End Project Dependency
}}}
###############################################################################
-Project: "UDP Basic Server"=..\tests\Basic\server.dsp - Package Owner=<4>
+Project: "UDP Performance Client"=..\tests\Performance\client.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -71,11 +62,14 @@ Package=<4> Begin Project Dependency
Project_Dep_Name TAO_DIOP
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name UDP Performance Server
+ End Project Dependency
}}}
###############################################################################
-Project: "UDP Performance Client"=..\tests\Performance\client.dsp - Package Owner=<4>
+Project: "UDP Performance Server"=..\tests\Performance\server.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -83,14 +77,11 @@ Package=<5> Package=<4>
{{{
- Begin Project Dependency
- Project_Dep_Name UDP Performance Server
- End Project Dependency
}}}
###############################################################################
-Project: "UDP Performance Server"=..\tests\Performance\server.dsp - Package Owner=<4>
+Project: "UDP Server"=..\tests\Basic\server.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -98,9 +89,6 @@ Package=<5> Package=<4>
{{{
- Begin Project Dependency
- Project_Dep_Name TAO_DIOP
- End Project Dependency
}}}
###############################################################################
diff --git a/TAO/examples/PluggableUDP/tests/Basic/Makefile b/TAO/examples/PluggableUDP/tests/Basic/Makefile index 411fa345872..31d7138709b 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/Makefile +++ b/TAO/examples/PluggableUDP/tests/Basic/Makefile @@ -23,7 +23,7 @@ SERVER_OBJS = UDP_Client_i.o server.o UDP_i.o $(IDL_SRC:.cpp=.o) BUILD = $(BIN) VBIN = $(BIN:%=%$(VAR)) -TAO_IDLFLAGS += -Ge 1 -Sp -Sd +TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp index 4adda921381..82030744d42 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp @@ -67,7 +67,7 @@ UDP_Client_i::svc (void) udp_->shutdown (ACE_TRY_ENV); ACE_TRY_CHECK; - ACE_Time_Value tv (0, 500); // 50ms + ACE_Time_Value tv (0, 50); // 50ms ACE_OS::sleep (tv); // let the previous request go through // Shut down local ORB, trigger the end of the ORB event loop diff --git a/TAO/examples/PluggableUDP/tests/Basic/client.cpp b/TAO/examples/PluggableUDP/tests/Basic/client.cpp index f8ee478bb5d..e31bfa397ea 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/client.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/client.cpp @@ -30,7 +30,7 @@ ACE_RCSID(AMI, client, "$Id$") const char *ior = "file://test.ior"; unsigned int msec = 500; -unsigned int iterations = 1; +unsigned int iterations = 500; int parse_args (int argc, char *argv[]) @@ -152,7 +152,6 @@ main (int argc, char *argv[]) orb->destroy (ACE_TRY_ENV); ACE_TRY_CHECK; - client->wait (); // it is save to delete the client, because the client was actually // the one calling orb->shutdown () triggering the end of the ORB // event loop. diff --git a/TAO/examples/PluggableUDP/tests/Basic/client.dsp b/TAO/examples/PluggableUDP/tests/Basic/client.dsp index e0e41781617..f12ff26e542 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/client.dsp +++ b/TAO/examples/PluggableUDP/tests/Basic/client.dsp @@ -1,11 +1,11 @@ -# Microsoft Developer Studio Project File - Name="UDP Basic Client" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="UDP Client" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=UDP Basic Client - Win32 Debug
+CFG=UDP Client - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,14 +14,14 @@ CFG=UDP Basic Client - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "client.mak" CFG="UDP Basic Client - Win32 Debug"
+!MESSAGE NMAKE /f "client.mak" CFG="UDP Client - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "UDP Basic Client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "UDP Basic Client - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "UDP Basic Client - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "UDP Basic Client - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE "UDP Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "UDP Client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "UDP Client - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE "UDP Client - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -29,7 +29,7 @@ CFG=UDP Basic Client - Win32 Debug # PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
-!IF "$(CFG)" == "UDP Basic Client - Win32 Release"
+!IF "$(CFG)" == "UDP Client - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -54,9 +54,9 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao\PortableServer"
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Debug"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -83,7 +83,7 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Alpha Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -112,7 +112,7 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib TAOd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
# ADD LINK32 aced.lib TAOd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao\PortableServer"
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Alpha Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -146,7 +146,7 @@ InputName=client SOURCE="$(InputPath)"
"d" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- ..\..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
+ ..\..\..\..\..\tao_idl\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
@@ -154,10 +154,10 @@ SOURCE="$(InputPath)" # Begin Target
-# Name "UDP Basic Client - Win32 Release"
-# Name "UDP Basic Client - Win32 Debug"
-# Name "UDP Basic Client - Win32 Alpha Debug"
-# Name "UDP Basic Client - Win32 Alpha Release"
+# Name "UDP Client - Win32 Release"
+# Name "UDP Client - Win32 Debug"
+# Name "UDP Client - Win32 Alpha Debug"
+# Name "UDP Client - Win32 Alpha Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -165,13 +165,13 @@ SOURCE="$(InputPath)" SOURCE=.\client.cpp
-!IF "$(CFG)" == "UDP Basic Client - Win32 Release"
+!IF "$(CFG)" == "UDP Client - Win32 Release"
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Debug"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Debug"
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Alpha Release"
!ENDIF
@@ -180,13 +180,13 @@ SOURCE=.\client.cpp SOURCE=.\UDP_Client_i.cpp
-!IF "$(CFG)" == "UDP Basic Client - Win32 Release"
+!IF "$(CFG)" == "UDP Client - Win32 Release"
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Debug"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Debug"
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Alpha Release"
!ENDIF
@@ -195,13 +195,13 @@ SOURCE=.\UDP_Client_i.cpp SOURCE=.\UDP_i.cpp
-!IF "$(CFG)" == "UDP Basic Client - Win32 Release"
+!IF "$(CFG)" == "UDP Client - Win32 Release"
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Debug"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Debug"
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Alpha Release"
!ENDIF
@@ -210,13 +210,13 @@ SOURCE=.\UDP_i.cpp SOURCE=.\UDPC.cpp
-!IF "$(CFG)" == "UDP Basic Client - Win32 Release"
+!IF "$(CFG)" == "UDP Client - Win32 Release"
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Debug"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Debug"
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Alpha Release"
!ENDIF
@@ -225,13 +225,13 @@ SOURCE=.\UDPC.cpp SOURCE=.\UDPS.cpp
-!IF "$(CFG)" == "UDP Basic Client - Win32 Release"
+!IF "$(CFG)" == "UDP Client - Win32 Release"
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Debug"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Debug"
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Alpha Release"
!ENDIF
@@ -260,16 +260,16 @@ SOURCE=.\UDPC.h SOURCE=.\UDP.idl
-!IF "$(CFG)" == "UDP Basic Client - Win32 Release"
+!IF "$(CFG)" == "UDP Client - Win32 Release"
# PROP Ignore_Default_Tool 1
-USERDEP__UDP_I="..\..\..\..\..\bin\Release\tao_idl.exe"
+USERDEP__UDP_I="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
InputPath=.\UDP.idl
InputName=UDP
BuildCmds= \
- ..\..\..\..\..\bin\Release\tao_idl -Ge 1 -Sp -Sd $(InputName).idl
+ ..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -299,7 +299,7 @@ BuildCmds= \ $(BuildCmds)
# End Custom Build
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Debug"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Debug"
# PROP Ignore_Default_Tool 1
USERDEP__UDP_I="..\..\..\..\..\bin\tao_idl.exe"
@@ -308,7 +308,7 @@ InputPath=.\UDP.idl InputName=UDP
BuildCmds= \
- ..\..\..\..\..\bin\tao_idl -Ge 1 -Sp -Sd $(InputName).idl
+ ..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -338,17 +338,17 @@ BuildCmds= \ $(BuildCmds)
# End Custom Build
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Alpha Debug"
# PROP BASE Ignore_Default_Tool 1
# PROP Ignore_Default_Tool 1
-USERDEP__UDP_I="..\..\..\..\..\bin\tao_idl.exe"
+USERDEP__UDP_I="..\..\..\..\tao_idl\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\UDP.idl
InputName=UDP
BuildCmds= \
- ..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
+ ..\..\..\..\tao_idl\tao_idl -Ge 1 $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -378,17 +378,17 @@ BuildCmds= \ $(BuildCmds)
# End Custom Build
-!ELSEIF "$(CFG)" == "UDP Basic Client - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "UDP Client - Win32 Alpha Release"
# PROP BASE Ignore_Default_Tool 1
# PROP Ignore_Default_Tool 1
-USERDEP__UDP_I="..\..\..\..\..\bin\Release\tao_idl.exe"
+USERDEP__UDP_I="..\..\..\..\tao_idl\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\UDP.idl
InputName=UDP
BuildCmds= \
- ..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
+ ..\..\..\..\tao_idl\Release\tao_idl -Ge 1 $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/examples/PluggableUDP/tests/Basic/run_test.pl b/TAO/examples/PluggableUDP/tests/Basic/run_test.pl index 175e3eb46d4..41ca7f667f9 100755 --- a/TAO/examples/PluggableUDP/tests/Basic/run_test.pl +++ b/TAO/examples/PluggableUDP/tests/Basic/run_test.pl @@ -5,30 +5,30 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -use lib '../../../../../bin'; +use lib '../../../../bin'; use PerlACE::Run_Test; $status = 0; -$iorfile = PerlACE::LocalFile ("test.ior"); +$iorfile = PerlACE::LocalFile ("time.ior"); $SV = new PerlACE::Process ("server", "-o $iorfile -ORBendpoint diop://:12345"); -$CL = new PerlACE::Process ("client", "-k file://$iorfile -t 10 -i 10"); +$CL = new PerlACE::Process ("client", "-k file://$iorfile -t 10 -i 1000"); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { print STDERR "ERROR: could not find file <$iorfile>\n"; $SV->Kill (); exit 1; } -$client = $CL->SpawnWaitKill (90); +$client = $CL->SpawnWaitKill (60); if ($client != 0) { print STDERR "ERROR: client returned $client\n"; $status = 1; } -$server = $SV->WaitKill (10); +$server = $SV->WaitKill (5); if ($server != 0) { print STDERR "ERROR: server returned $server\n"; diff --git a/TAO/examples/PluggableUDP/tests/Basic/server.cpp b/TAO/examples/PluggableUDP/tests/Basic/server.cpp index ce33a36ac6d..2de02be5478 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/server.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/server.cpp @@ -26,7 +26,7 @@ ACE_RCSID(AMI, server, "$Id$") -const char *ior_output_file = "test.ior"; +const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) diff --git a/TAO/examples/PluggableUDP/tests/Basic/server.dsp b/TAO/examples/PluggableUDP/tests/Basic/server.dsp index eb1f116f7fa..a49a35ed632 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/server.dsp +++ b/TAO/examples/PluggableUDP/tests/Basic/server.dsp @@ -1,11 +1,11 @@ -# Microsoft Developer Studio Project File - Name="UDP Basic Server" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="UDP Server" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=UDP Basic Server - Win32 Debug
+CFG=UDP Server - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,14 +14,14 @@ CFG=UDP Basic Server - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "server.mak" CFG="UDP Basic Server - Win32 Debug"
+!MESSAGE NMAKE /f "server.mak" CFG="UDP Server - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "UDP Basic Server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "UDP Basic Server - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "UDP Basic Server - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "UDP Basic Server - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE "UDP Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "UDP Server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "UDP Server - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE "UDP Server - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -29,7 +29,7 @@ CFG=UDP Basic Server - Win32 Debug # PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
-!IF "$(CFG)" == "UDP Basic Server - Win32 Release"
+!IF "$(CFG)" == "UDP Server - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -54,9 +54,9 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\PortableServer"
-!ELSEIF "$(CFG)" == "UDP Basic Server - Win32 Debug"
+!ELSEIF "$(CFG)" == "UDP Server - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -83,7 +83,7 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"
-!ELSEIF "$(CFG)" == "UDP Basic Server - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "UDP Server - Win32 Alpha Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -112,7 +112,7 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib TAOd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
# ADD LINK32 aced.lib TAOd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
-!ELSEIF "$(CFG)" == "UDP Basic Server - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "UDP Server - Win32 Alpha Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -145,10 +145,10 @@ LINK32=link.exe # Begin Target
-# Name "UDP Basic Server - Win32 Release"
-# Name "UDP Basic Server - Win32 Debug"
-# Name "UDP Basic Server - Win32 Alpha Debug"
-# Name "UDP Basic Server - Win32 Alpha Release"
+# Name "UDP Server - Win32 Release"
+# Name "UDP Server - Win32 Debug"
+# Name "UDP Server - Win32 Alpha Debug"
+# Name "UDP Server - Win32 Alpha Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -156,13 +156,13 @@ LINK32=link.exe SOURCE=.\server.cpp
-!IF "$(CFG)" == "UDP Basic Server - Win32 Release"
+!IF "$(CFG)" == "UDP Server - Win32 Release"
-!ELSEIF "$(CFG)" == "UDP Basic Server - Win32 Debug"
+!ELSEIF "$(CFG)" == "UDP Server - Win32 Debug"
-!ELSEIF "$(CFG)" == "UDP Basic Server - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "UDP Server - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "UDP Basic Server - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "UDP Server - Win32 Alpha Release"
!ENDIF
@@ -171,13 +171,13 @@ SOURCE=.\server.cpp SOURCE=.\UDP_i.cpp
-!IF "$(CFG)" == "UDP Basic Server - Win32 Release"
+!IF "$(CFG)" == "UDP Server - Win32 Release"
-!ELSEIF "$(CFG)" == "UDP Basic Server - Win32 Debug"
+!ELSEIF "$(CFG)" == "UDP Server - Win32 Debug"
-!ELSEIF "$(CFG)" == "UDP Basic Server - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "UDP Server - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "UDP Basic Server - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "UDP Server - Win32 Alpha Release"
!ENDIF
@@ -186,13 +186,13 @@ SOURCE=.\UDP_i.cpp SOURCE=.\UDPC.cpp
-!IF "$(CFG)" == "UDP Basic Server - Win32 Release"
+!IF "$(CFG)" == "UDP Server - Win32 Release"
-!ELSEIF "$(CFG)" == "UDP Basic Server - Win32 Debug"
+!ELSEIF "$(CFG)" == "UDP Server - Win32 Debug"
-!ELSEIF "$(CFG)" == "UDP Basic Server - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "UDP Server - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "UDP Basic Server - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "UDP Server - Win32 Alpha Release"
!ENDIF
@@ -201,13 +201,13 @@ SOURCE=.\UDPC.cpp SOURCE=.\UDPS.cpp
-!IF "$(CFG)" == "UDP Basic Server - Win32 Release"
+!IF "$(CFG)" == "UDP Server - Win32 Release"
-!ELSEIF "$(CFG)" == "UDP Basic Server - Win32 Debug"
+!ELSEIF "$(CFG)" == "UDP Server - Win32 Debug"
-!ELSEIF "$(CFG)" == "UDP Basic Server - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "UDP Server - Win32 Alpha Debug"
-!ELSEIF "$(CFG)" == "UDP Basic Server - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "UDP Server - Win32 Alpha Release"
!ENDIF
@@ -236,15 +236,15 @@ SOURCE=.\UDPS.h SOURCE=.\UDP.idl
-!IF "$(CFG)" == "UDP Basic Server - Win32 Release"
+!IF "$(CFG)" == "UDP Server - Win32 Release"
-USERDEP__UDP_I="..\..\..\..\..\bin\Release\tao_idl.exe"
+USERDEP__UDP_I="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
InputPath=.\UDP.idl
InputName=UDP
BuildCmds= \
- ..\..\..\..\..\bin\Release\tao_idl -Ge 1 -Sp -Sd $(InputName).idl
+ ..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -274,7 +274,7 @@ BuildCmds= \ $(BuildCmds)
# End Custom Build
-!ELSEIF "$(CFG)" == "UDP Basic Server - Win32 Debug"
+!ELSEIF "$(CFG)" == "UDP Server - Win32 Debug"
# PROP Ignore_Default_Tool 1
USERDEP__UDP_I="..\..\..\..\..\bin\tao_idl.exe"
@@ -283,7 +283,7 @@ InputPath=.\UDP.idl InputName=UDP
BuildCmds= \
- ..\..\..\..\..\bin\tao_idl -Ge 1 -Sp -Sd $(InputName).idl
+ ..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -313,17 +313,17 @@ BuildCmds= \ $(BuildCmds)
# End Custom Build
-!ELSEIF "$(CFG)" == "UDP Basic Server - Win32 Alpha Debug"
+!ELSEIF "$(CFG)" == "UDP Server - Win32 Alpha Debug"
# PROP BASE Ignore_Default_Tool 1
# PROP Ignore_Default_Tool 1
-USERDEP__UDP_I="..\..\..\..\..\bin\tao_idl.exe"
+USERDEP__UDP_I="..\..\..\..\tao_idl\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\UDP.idl
InputName=UDP
BuildCmds= \
- ..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
+ ..\..\..\..\tao_idl\tao_idl -Ge 1 $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -353,15 +353,15 @@ BuildCmds= \ $(BuildCmds)
# End Custom Build
-!ELSEIF "$(CFG)" == "UDP Basic Server - Win32 Alpha Release"
+!ELSEIF "$(CFG)" == "UDP Server - Win32 Alpha Release"
-USERDEP__UDP_I="..\..\..\..\..\bin\Release\tao_idl.exe"
+USERDEP__UDP_I="..\..\..\..\tao_idl\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\UDP.idl
InputName=UDP
BuildCmds= \
- ..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
+ ..\..\..\..\tao_idl\Release\tao_idl -Ge 1 $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/examples/PluggableUDP/tests/Basic/svc.conf b/TAO/examples/PluggableUDP/tests/Basic/svc.conf index 4d6eaae769e..710efbf5209 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/svc.conf +++ b/TAO/examples/PluggableUDP/tests/Basic/svc.conf @@ -1,3 +1,3 @@ dynamic DIOP_Factory Service_Object * TAO_DIOP:_make_TAO_DIOP_Protocol_Factory() "" -static Resource_Factory "-ORBProtocolFactory DIOP_Factory -ORBReactor tp" +static Resource_Factory "-ORBProtocolFactory DIOP_Factory" diff --git a/TAO/examples/PluggableUDP/tests/Performance/Makefile b/TAO/examples/PluggableUDP/tests/Performance/Makefile index 86bdb19f3a1..fdf5fa99e21 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/Makefile +++ b/TAO/examples/PluggableUDP/tests/Performance/Makefile @@ -12,20 +12,36 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif +LDLIBS = -lTAO + IDL_FILES = UDP IDL_SRC = UDPC.cpp UDPS.cpp -BIN = client server -SRC = $(addsuffix .cpp, $(BIN) UDP_PerformanceClient UDP_i ) $(IDL_SRC) +PROG_SRCS = \ + client.cpp \ + server.cpp \ + UDP_i.cpp \ + UDP_PerformanceClient.cpp + +SRC = $(IDL_SRC) $(PROG_SRCS) -CLIENT_OBJS = client.o UDP_i.o UDP_PerformanceClient.o $(IDL_SRC:.cpp=.o) +CLT_OBJS = \ + UDPC.o \ + UDPS.o \ + UDP_i.o \ + client.o \ + UDP_PerformanceClient.o -SERVER_OBJS = UDP_i.o server.o $(IDL_SRC:.cpp=.o) +SVR_OBJS = \ + UDPC.o \ + UDPS.o \ + UDP_i.o \ + server.o -BUILD = $(BIN) -VBIN = $(BIN:%=%$(VAR)) -TAO_IDLFLAGS += -Ge 1 -Sd -Sp +BIN2 = server \ + client +TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- @@ -42,17 +58,21 @@ include $(TAO_ROOT)/taoconfig.mk # Local targets #---------------------------------------------------------------------------- -.PRECIOUS: $(foreach ext, $(IDL_EXT), UDP$(ext)) -server: $(addprefix $(VDIR),$(SERVER_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) +LDFLAGS += -L$(TAO_ROOT)/tao -client: $(addprefix $(VDIR),$(CLIENT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) +.PRECIOUS: UDPC.cpp UDPC.i UDPC.h +.PRECIOUS: UDPS.cpp UDPS.i UDPS.h +.PRECIOUS: UDPS_T.cpp UDPS_T.i UDPS_T.h -realclean: clean - -$(RM) $(foreach ext, $(IDL_EXT), UDP$(ext)) +server: $(addprefix $(VDIR),$(SVR_OBJS)) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +client: $(addprefix $(VDIR),$(CLT_OBJS)) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) +realclean: clean + -$(RM) -rf UDPC.* UDPS.* UDPS_T.* #---------------------------------------------------------------------------- # Dependencies @@ -62,12 +82,9 @@ realclean: clean # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ +.obj/UDPC.o .obj/UDPC.so .shobj/UDPC.o .shobj/UDPC.so: UDPC.cpp UDPC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -76,6 +93,13 @@ realclean: clean $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ @@ -86,8 +110,6 @@ realclean: clean $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -101,74 +123,38 @@ realclean: clean $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ @@ -177,67 +163,16 @@ realclean: clean $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp UDPC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ @@ -247,6 +182,8 @@ realclean: clean $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ @@ -262,6 +199,9 @@ realclean: clean $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -312,6 +252,11 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ @@ -323,33 +268,127 @@ realclean: clean $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i UDPC.i UDP_i.h UDPS.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/StringSeqC.i \ + UDPC.i $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ - $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - UDPS_T.h UDPS_T.i UDPS_T.cpp UDPS.i UDP_PerformanceClient.h + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/RequestInfo_Util.h -.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ +.obj/UDPS.o .obj/UDPS.so .shobj/UDPS.o .shobj/UDPS.so: UDPS.cpp UDPS.h UDPC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -358,6 +397,13 @@ realclean: clean $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ @@ -368,8 +414,6 @@ realclean: clean $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -383,64 +427,33 @@ realclean: clean $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ @@ -454,6 +467,11 @@ realclean: clean $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ @@ -485,6 +503,9 @@ realclean: clean $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -535,6 +556,11 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ @@ -546,10 +572,13 @@ realclean: clean $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i UDP_i.h UDPS.h UDPC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ UDPC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ @@ -567,14 +596,17 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ UDPS_T.h UDPS_T.i UDPS_T.cpp UDPS.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ + $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ @@ -593,15 +625,107 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ + $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ + $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ + $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/tao/RequestInfo_Util.h \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ + $(ACE_ROOT)/ace/Dynamic_Service.i \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp -.obj/UDP_PerformanceClient.o .obj/UDP_PerformanceClient.so .shobj/UDP_PerformanceClient.o .shobj/UDP_PerformanceClient.so: UDP_PerformanceClient.cpp \ - $(ACE_ROOT)/ace/High_Res_Timer.h \ - $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \ +.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -635,7 +759,7 @@ realclean: clean $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/High_Res_Timer.i UDP_PerformanceClient.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ @@ -769,7 +893,7 @@ realclean: clean $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(TAO_ROOT)/tao/corba.h \ + UDPC.h $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/CDR_Base.inl \ @@ -860,8 +984,8 @@ realclean: clean $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i UDP_i.h UDPS.h UDPC.h \ - UDPC.i \ + $(TAO_ROOT)/tao/StringSeqC.i \ + UDPC.i UDP_i.h UDPS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ @@ -877,14 +1001,13 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - UDPS_T.h UDPS_T.i UDPS_T.cpp UDPS.i + UDPS_T.h UDPS_T.i UDPS_T.cpp UDPS.i UDP_PerformanceClient.h -.obj/UDP_i.o .obj/UDP_i.so .shobj/UDP_i.o .shobj/UDP_i.so: UDP_i.cpp UDP_i.h UDPS.h UDPC.h \ - $(TAO_ROOT)/tao/corba.h \ +.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \ + $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -893,12 +1016,6 @@ realclean: clean $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ @@ -909,6 +1026,8 @@ realclean: clean $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -922,33 +1041,64 @@ realclean: clean $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ @@ -962,11 +1112,6 @@ realclean: clean $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ @@ -998,9 +1143,6 @@ realclean: clean $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/NVList.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -1051,11 +1193,6 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ @@ -1067,13 +1204,11 @@ realclean: clean $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/Interceptor_List.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i UDPC.i \ + $(TAO_ROOT)/tao/StringSeqC.i \ + UDP_i.h UDPS.h UDPC.h UDPC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ @@ -1118,11 +1253,9 @@ realclean: clean $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h -.obj/UDPC.o .obj/UDPC.so .shobj/UDPC.o .shobj/UDPC.so: UDPC.cpp UDPC.h $(TAO_ROOT)/tao/corba.h \ +.obj/UDP_i.o .obj/UDP_i.so .shobj/UDP_i.o .shobj/UDP_i.so: UDP_i.cpp UDP_i.h UDPS.h UDPC.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1136,7 +1269,8 @@ realclean: clean $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ @@ -1311,38 +1445,37 @@ realclean: clean $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i UDPC.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/Pluggable.i \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/Profile.h \ - $(TAO_ROOT)/tao/Tagged_Components.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.i \ - $(TAO_ROOT)/tao/Tagged_Components.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Profile.i \ - $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/Policy_Manager.i \ - $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + UDPC.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + UDPS_T.h UDPS_T.i UDPS_T.cpp UDPS.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ - $(TAO_ROOT)/tao/Protocol_Factory.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -1356,79 +1489,13 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(TAO_ROOT)/tao/Parser_Registry.h \ - $(TAO_ROOT)/tao/Parser_Registry.i \ - $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ - $(TAO_ROOT)/tao/Endpoint.h \ - $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ - $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ - $(TAO_ROOT)/tao/Object_Ref_Table.h \ - $(TAO_ROOT)/tao/RT_Policy_i.h \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/RT_Policy_i.i \ - $(TAO_ROOT)/tao/Protocols_Hooks.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/TAOC.h \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ - $(TAO_ROOT)/tao/Priority_Mapping.h \ - $(TAO_ROOT)/tao/Priority_Mapping.i \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ - $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/tao/operation_details.h \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/target_specification.h \ - $(TAO_ROOT)/tao/target_specification.i \ - $(TAO_ROOT)/tao/operation_details.i \ - $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ - $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ - $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - $(TAO_ROOT)/tao/RequestInfo_Util.h + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h -.obj/UDPS.o .obj/UDPS.so .shobj/UDPS.o .shobj/UDPS.so: UDPS.cpp UDPS.h UDPC.h \ - $(TAO_ROOT)/tao/corba.h \ +.obj/UDP_PerformanceClient.o .obj/UDP_PerformanceClient.so .shobj/UDP_PerformanceClient.o .shobj/UDP_PerformanceClient.so: UDP_PerformanceClient.cpp \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1437,12 +1504,6 @@ realclean: clean $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ @@ -1453,6 +1514,8 @@ realclean: clean $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -1466,38 +1529,75 @@ realclean: clean $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ + UDP_PerformanceClient.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ @@ -1506,16 +1606,67 @@ realclean: clean $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ @@ -1525,8 +1676,6 @@ realclean: clean $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ @@ -1542,9 +1691,6 @@ realclean: clean $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/NVList.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -1595,11 +1741,6 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ @@ -1611,13 +1752,11 @@ realclean: clean $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/Interceptor_List.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i UDPC.i \ + $(TAO_ROOT)/tao/StringSeqC.i \ + UDP_i.h UDPS.h UDPC.h UDPC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ @@ -1633,130 +1772,6 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - UDPS_T.h UDPS_T.i UDPS_T.cpp UDPS.i \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ - $(ACE_ROOT)/ace/Map.h \ - $(ACE_ROOT)/ace/Map_T.h \ - $(ACE_ROOT)/ace/Pair.h \ - $(ACE_ROOT)/ace/Pair_T.h \ - $(ACE_ROOT)/ace/Pair_T.i \ - $(ACE_ROOT)/ace/Pair_T.cpp \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Active_Map_Manager.h \ - $(ACE_ROOT)/ace/Active_Map_Manager.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ - $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ - $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ - $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ - $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/TAO_Server_Request.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/Policy_Manager.i \ - $(TAO_ROOT)/tao/Resource_Factory.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/Pluggable.i \ - $(TAO_ROOT)/tao/Protocol_Factory.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ - $(TAO_ROOT)/tao/Parser_Registry.h \ - $(TAO_ROOT)/tao/Parser_Registry.i \ - $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ - $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ - $(TAO_ROOT)/tao/Endpoint.h \ - $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ - $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ - $(TAO_ROOT)/tao/Object_Ref_Table.h \ - $(TAO_ROOT)/tao/RT_Policy_i.h \ - $(TAO_ROOT)/tao/RT_Policy_i.i \ - $(TAO_ROOT)/tao/Protocols_Hooks.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/Profile.h \ - $(TAO_ROOT)/tao/Tagged_Components.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.i \ - $(TAO_ROOT)/tao/Tagged_Components.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Profile.i \ - $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ - $(TAO_ROOT)/tao/RequestInfo_Util.h \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ - $(ACE_ROOT)/ace/Dynamic_Service.i \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp + UDPS_T.h UDPS_T.i UDPS_T.cpp UDPS.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp index f5ecdec245f..ab16f3b6046 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp @@ -56,6 +56,7 @@ UDP_PerformanceClient::svc () ACE_TRY_CHECK; ACE_High_Res_Timer timer; + ACE_UINT32 i = 0; while (1) { ACE_DEBUG ((LM_DEBUG, @@ -130,30 +131,27 @@ UDP_PerformanceClient::svc () "\nError: No callbacks received!\n\n")); } - + if (delta_micro_seconds <= final_delta_micro_seconds_ + && current_wrong_messages == 0) { ACE_Time_Value tv; timer.elapsed_time (tv); - ACE_UINT32 calls_per_second = (1000L * burst_messages_) / tv.msec (); + ACE_UINT64 calls_per_second = + (1000 * burst_messages_) / tv.msec (); ACE_DEBUG ((LM_DEBUG, - "\n Time needed %d s %d us (%d ms) for %d messages" - "\n Performance = %d asynch calls per second\n\n", + "\n Time needed %u s %u us (%d ms) for %d messages" + "\n Performance = %u asynch calls per second\n\n", tv.sec (), tv.usec (), tv.msec (), burst_messages_, calls_per_second)); - } - - if (delta_micro_seconds <= final_delta_micro_seconds_ - && current_wrong_messages == 0) - { break; } - } - + } + // shut down remote ORB udp_->shutdown (ACE_TRY_ENV); ACE_TRY_CHECK; diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp index 9071fa68605..efbe56c6073 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp @@ -30,16 +30,22 @@ UDP_i::orb (CORBA::ORB_ptr orb) void UDP_i::setResponseHandler (UDP_ptr udpHandler, - CORBA::Environment &) + CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - if (CORBA::is_nil (udpHandler)) - ACE_DEBUG ((LM_DEBUG, - "response handler is nil\n")); - - this->responseHandler_ = UDP::_duplicate (udpHandler); + ACE_TRY + { + this->responseHandler_ = UDP::_duplicate (udpHandler); + } + ACE_CATCHANY + { + ACE_DEBUG ((LM_DEBUG, + "UDP_i::svc: Received exception\n")); + } + ACE_ENDTRY; } + void UDP_i::invoke (const char * client_name, CORBA::Long request_id, @@ -76,7 +82,7 @@ UDP_i::invoke (const char * client_name, request_id_table_.rebind (client_name, request_id); - if (!CORBA::is_nil (responseHandler_.in ())) + if (!CORBA::is_nil (responseHandler_)) { responseHandler_->invoke (client_name, request_id, @@ -106,7 +112,7 @@ UDP_i::reset (const char * client_name, request_id_table_.rebind (client_name, 0); - if (!CORBA::is_nil (responseHandler_.in ())) + if (!CORBA::is_nil (responseHandler_)) { responseHandler_->reset (client_name, ACE_TRY_ENV); @@ -164,21 +170,3 @@ UDP_i::getMessagesCount () return tmp; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Manager_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<CORBA::String_var, int>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Manager_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<CORBA::String_var, int> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h index e993c6a42ac..813b5b48a43 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h @@ -75,7 +75,7 @@ private: CORBA::Long, ACE_Hash < const char * >, ACE_Equal_To < const char * >, - ACE_Null_Mutex > request_id_table_; + ACE_Thread_Mutex > request_id_table_; ACE_UINT32 messages_count_; diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.dsp b/TAO/examples/PluggableUDP/tests/Performance/client.dsp index c868a4f4e45..6d02bbb6c28 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/client.dsp +++ b/TAO/examples/PluggableUDP/tests/Performance/client.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao\PortableServer"
!ELSEIF "$(CFG)" == "UDP Performance Client - Win32 Debug"
@@ -498,7 +498,7 @@ InputPath=.\UDP.idl InputName=UDP
BuildCmds= \
- ..\..\..\..\..\bin\Release\tao_idl -Ge 1 -Sp -Sd $(InputName).idl
+ ..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -536,7 +536,7 @@ InputPath=.\UDP.idl InputName=UDP
BuildCmds= \
- ..\..\..\..\..\bin\tao_idl -Ge 1 -Sp -Sd $(InputName).idl
+ ..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -568,8 +568,82 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "UDP Performance Client - Win32 Alpha Debug"
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler
+InputPath=.\UDP.idl
+InputName=UDP
+
+BuildCmds= \
+ ..\..\tao_idl\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ELSEIF "$(CFG)" == "UDP Performance Client - Win32 Alpha Release"
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler
+InputPath=.\UDP.idl
+InputName=UDP
+
+BuildCmds= \
+ ..\..\..\..\..\tao_idl\Release\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ENDIF
# End Source File
diff --git a/TAO/examples/PluggableUDP/tests/Performance/run_test.pl b/TAO/examples/PluggableUDP/tests/Performance/run_test.pl index 3b8b2e0ce46..b5c012b0abe 100755 --- a/TAO/examples/PluggableUDP/tests/Performance/run_test.pl +++ b/TAO/examples/PluggableUDP/tests/Performance/run_test.pl @@ -5,12 +5,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -unshift @INC, '../../../../../bin'; +unshift @INC, '../../../../bin'; require ACEutils; require Process; $status = 0; -$iorfile = "test.ior"; +$iorfile = "time.ior"; unlink $iorfile; $SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-o $iorfile -ORBendpoint diop://:12345"); diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.cpp b/TAO/examples/PluggableUDP/tests/Performance/server.cpp index 2fa7c062852..9cca5f32129 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/server.cpp @@ -26,7 +26,7 @@ ACE_RCSID(Performance, server, "$Id$") -const char *ior_output_file = "test.ior"; +const char *ior_output_file = 0; int orb_threads = 1; // Number of threads running inside the ORB. int @@ -151,7 +151,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; - UDP_var udp_var = UDP::_narrow (obj.in (), ACE_TRY_ENV); + UDP_var udp_var = UDP::_narrow (obj, ACE_TRY_ENV); ACE_TRY_CHECK; if (CORBA::is_nil (udp_var.in ())) @@ -183,7 +183,7 @@ main (int argc, char *argv[]) if (orb_threads > 1) ACE_Thread_Manager::instance ()->spawn_n (orb_threads-1, svc, - orb.in ()); + orb); orb->run (ACE_TRY_ENV); ACE_TRY_CHECK; diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.dsp b/TAO/examples/PluggableUDP/tests/Performance/server.dsp index 7d0cf280eb3..a366a81a482 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/server.dsp +++ b/TAO/examples/PluggableUDP/tests/Performance/server.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao\PortableServer"
!ELSEIF "$(CFG)" == "UDP Performance Server - Win32 Debug"
@@ -485,13 +485,12 @@ SOURCE=.\UDP.idl !IF "$(CFG)" == "UDP Performance Server - Win32 Release"
-# PROP Ignore_Default_Tool 1
# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
InputPath=.\UDP.idl
InputName=UDP
BuildCmds= \
- ..\..\..\..\..\bin\Release\tao_idl -Ge 1 -Sp -Sd $(InputName).idl
+ ..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -529,7 +528,7 @@ InputPath=.\UDP.idl InputName=UDP
BuildCmds= \
- ..\..\..\..\..\bin\tao_idl -Ge 1 -Sp -Sd $(InputName).idl
+ ..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -561,8 +560,80 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "UDP Performance Server - Win32 Alpha Debug"
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Invoking TAO_IDL Compiler
+InputPath=.\UDP.idl
+InputName=UDP
+
+BuildCmds= \
+ ..\..\..\tao_idl\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ELSEIF "$(CFG)" == "UDP Performance Server - Win32 Alpha Release"
+# Begin Custom Build - Invoking TAO_IDL Compiler
+InputPath=.\UDP.idl
+InputName=UDP
+
+BuildCmds= \
+ ..\..\..\..\tao_idl\Release\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
!ENDIF
# End Source File
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile index 711ebab91eb..97f08c92611 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile @@ -12,6 +12,12 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT +#ifndef VXWORKS +LDLIBS = -lTAO -lSystemTrace +#else +LDLIBS = +#endif + IDL_FILES = test IDL_SRC = testC.cpp testS.cpp BIN = client server @@ -21,10 +27,9 @@ SRC = $(addsuffix .cpp, $(BIN) test_i) $(IDL_SRC) CLIENT_OBJS = client.o $(IDL_SRC:.cpp=.o) SERVER_OBJS = server.o test_i.o $(IDL_SRC:.cpp=.o) -BUILD = $(BIN) -VBIN = $(BIN:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 -Sp -Sd + #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- @@ -37,6 +42,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU include $(TAO_ROOT)/taoconfig.mk +INCLDIRS += -I./../.. +LDFLAGS += -L./../.. + #---------------------------------------------------------------------------- # Local targets #---------------------------------------------------------------------------- @@ -49,6 +57,7 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS)) client: $(addprefix $(VDIR),$(CLIENT_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) + realclean: clean -$(RM) $(foreach ext, $(IDL_EXT), test$(ext)) @@ -56,12 +65,11 @@ realclean: clean # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \ +.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -230,8 +238,8 @@ realclean: clean $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/High_Res_Timer.h \ - $(ACE_ROOT)/ace/High_Res_Timer.i testC.h \ - $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ + testC.h $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/CDR_Base.inl \ @@ -322,14 +330,14 @@ realclean: clean $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i testC.i + $(TAO_ROOT)/tao/StringSeqC.i \ + testC.i -.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \ +.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -363,7 +371,8 @@ realclean: clean $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Get_Opt.i test_i.h testS.h testC.h \ + $(ACE_ROOT)/ace/Get_Opt.i test_i.h \ + testS.h testC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -519,7 +528,8 @@ realclean: clean $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i testC.i \ + $(TAO_ROOT)/tao/StringSeqC.i \ + testC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ @@ -540,9 +550,6 @@ realclean: clean .obj/test_i.o .obj/test_i.so .shobj/test_i.o .shobj/test_i.so: test_i.cpp test_i.h testS.h testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -556,7 +563,8 @@ realclean: clean $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ @@ -731,7 +739,8 @@ realclean: clean $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i testC.i \ + $(TAO_ROOT)/tao/StringSeqC.i \ + testC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ @@ -749,11 +758,9 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ testS_T.h testS_T.i testS_T.cpp testS.i -.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h $(TAO_ROOT)/tao/corba.h \ +.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -767,7 +774,8 @@ realclean: clean $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ @@ -942,8 +950,8 @@ realclean: clean $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i testC.i \ - $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + testC.i $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/MProfile.h \ @@ -1057,9 +1065,6 @@ realclean: clean .obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1073,7 +1078,8 @@ realclean: clean $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ @@ -1248,7 +1254,8 @@ realclean: clean $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i testC.i \ + $(TAO_ROOT)/tao/StringSeqC.i \ + testC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp index 3105ac1eff2..8c239a6261a 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp @@ -27,8 +27,8 @@ #endif const char *iorFile = "file://test.ior"; -ACE_UINT32 niter = 10; -ACE_UINT32 SIZE_BLOCK= 256; +int niter = 10; +int SIZE_BLOCK= 256; class Client { @@ -39,7 +39,7 @@ class Client // Use the ACE_Task_Base class to run the client threads. // public: - Client (Simple_Server_ptr server, ACE_UINT32 niterations); + Client (Simple_Server_ptr server, int niterations); // ctor virtual ~Client (void) {}; @@ -51,7 +51,7 @@ private: Simple_Server_var server_; // The server. - ACE_UINT32 niterations_; + int niterations_; // The number of iterations on each client thread. }; @@ -84,11 +84,7 @@ int main (int argc, char *argv[]) 1); } - CORBA::String_var string = - orb->object_to_string (server.in (), - ACE_TRY_ENV); - ACE_TRY_CHECK; - + CORBA::String_var string = orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Client: orb->object_to_string:\n%s\n", string.in ())); @@ -97,7 +93,7 @@ int main (int argc, char *argv[]) client.svc (); - //ACE_DEBUG ((LM_DEBUG, "threads finished\n")); + ACE_DEBUG ((LM_DEBUG, "threads finished\n")); orb->destroy (ACE_TRY_ENV); ACE_TRY_CHECK; @@ -117,12 +113,13 @@ int main (int argc, char *argv[]) // **************************************************************** Client::Client (Simple_Server_ptr server, - ACE_UINT32 niterations) + int niterations) : server_ (Simple_Server::_duplicate (server)), niterations_ (niterations) { } +int client_count=0; int Client::svc (void) @@ -144,8 +141,7 @@ Client::svc (void) timer.start (); - ACE_UINT32 client_count = 0; - for (ACE_UINT32 i = 0; i < this->niterations_; ++i) + for (int i = 0; i < this->niterations_; ++i) { client_count++; @@ -160,22 +156,17 @@ Client::svc (void) ACE_Time_Value measured; timer.elapsed_time (measured); - - //ACE_DEBUG ((LM_DEBUG, "...finished\n")); - + ACE_DEBUG ((LM_DEBUG, "...finished\n")); long dur = measured.sec () * 1000000 + measured.usec (); ACE_DEBUG ((LM_DEBUG, - "Time for %u Msgs: %u usec \n", + "Zeit fuer %u Msgs: %u usec \n", this->niterations_, measured.sec () * 1000000 + measured.usec ())); - ACE_DEBUG ((LM_DEBUG, "Time for 1 Msg: %u usec, %u calls/sec\n", + ACE_DEBUG ((LM_DEBUG, "Zeit fuer 1 Msg: %u usec, calls/sec %u\n", dur / this->niterations_, 1000000 / (dur / this->niterations_))); - server_->shutdown (ACE_TRY_ENV); - ACE_TRY_CHECK; - } ACE_CATCHANY { diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.dsp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.dsp index 8cc2d4e5bb7..9179b54728f 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.dsp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.dsp @@ -39,10 +39,9 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,7 +49,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "Simple Performance Client - Win32 Debug"
@@ -65,8 +64,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -112,13 +111,12 @@ SOURCE=.\test.idl !IF "$(CFG)" == "Simple Performance Client - Win32 Release"
-# PROP Ignore_Default_Tool 1
# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
BuildCmds= \
- ..\..\..\..\..\bin\Release\tao_idl -Ge 1 -Sp -Sd $(InputName).idl
+ ..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl b/TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl deleted file mode 100755 index 61a77205705..00000000000 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl +++ /dev/null @@ -1,40 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib '../../../../../bin'; -use PerlACE::Run_Test; - -$status = 0; -$iorfile = PerlACE::LocalFile ("test.ior"); - -$SV = new PerlACE::Process ("server", "-o $iorfile"); -$CL = new PerlACE::Process ("client", "-k file://$iorfile"); - -$SV->Spawn (); - -if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { - print STDERR "ERROR: could not find file <$iorfile>\n"; - $SV->Kill (); - exit 1; -} - -$client = $CL->SpawnWaitKill (60); -if ($client != 0) { - print STDERR "ERROR: client returned $client\n"; - $status = 1; -} - -$server = $SV->WaitKill (5); - -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; - $status = 1; -} - -unlink $iorfile; - -exit $status; diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.dsp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.dsp index 9e8bebd830d..2e4691164c6 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.dsp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.dsp @@ -39,10 +39,9 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,7 +49,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao\PortableServer"
!ELSEIF "$(CFG)" == "Simple Performance Server - Win32 Debug"
@@ -65,8 +64,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -129,7 +128,7 @@ InputPath=.\test.idl InputName=test
BuildCmds= \
- ..\..\..\..\..\bin\Release\tao_idl -Ge 1 -Sp -Sd $(InputName).idl
+ ..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/examples/TypeCode_Creation/TypeCode_Creation.dsp b/TAO/examples/TypeCode_Creation/TypeCode_Creation.dsp index 7ce9aa92e85..4218ae3d730 100644 --- a/TAO/examples/TypeCode_Creation/TypeCode_Creation.dsp +++ b/TAO/examples/TypeCode_Creation/TypeCode_Creation.dsp @@ -111,16 +111,6 @@ SOURCE=.\test.idl !IF "$(CFG)" == "TypeCode_Creation - Win32 Release"
-USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
-InputPath=.\test.idl
-InputName=test
-
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- ..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
-
-# End Custom Build
-
!ELSEIF "$(CFG)" == "TypeCode_Creation - Win32 Debug"
USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
diff --git a/TAO/orbsvcs/FT_Service/Makefile b/TAO/orbsvcs/FT_Service/Makefile deleted file mode 100644 index 38ece35ccf7..00000000000 --- a/TAO/orbsvcs/FT_Service/Makefile +++ /dev/null @@ -1,720 +0,0 @@ -#---------------------------------------------------------------------------- -# -# $Id$ -# -#---------------------------------------------------------------------------- -ifndef TAO_ROOT - TAO_ROOT = $(ACE_ROOT)/TAO -endif # ! TAO_ROOT - -LIBNAME = libTAO_FTService -LIB = $(LIBNAME).a -SHLIB = $(LIBNAME).$(SOEXT) - -VPATH=.: - -ACE_SHLIBS = -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO -lACE - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(TAO_ROOT)/rules.tao.GNU - -# On non-Windows environment, we should at least define -# the export_include IDL flag. -CPP_SRCS += \ - FT_CORBA_ServiceC \ - FT_CORBA_ServiceS - -FILES = $(CPP_SRCS) -DEFS = $(addsuffix .h,$(FILES)) -LSRC = $(addsuffix .cpp,$(FILES)) - -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets (and local hacks) -#---------------------------------------------------------------------------- - -LDFLAGS += -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/orbsvcs -CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/FT_CORBA_ServiceC.o .obj/FT_CORBA_ServiceC.so .shobj/FT_CORBA_ServiceC.o .shobj/FT_CORBA_ServiceC.so: FT_CORBA_ServiceC.cpp FT_CORBA_ServiceC.h \ - $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/tao/FT_CORBAC.h \ - $(TAO_ROOT)/tao/ftcorbafwd.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/CORBA_macros.h \ - $(TAO_ROOT)/tao/varbase.h \ - $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Managed_Types.h \ - $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/FT_CORBAC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/IOR_LookupTable.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/IORManipulation.h \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/IORC.h \ - $(TAO_ROOT)/tao/IORC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/Request_Info.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynAnyC.h \ - $(TAO_ROOT)/tao/DynAnyC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/POA.h \ - $(TAO_ROOT)/tao/Object_Adapter.h \ - $(TAO_ROOT)/tao/Key_Adapters.h \ - $(ACE_ROOT)/ace/Map.h \ - $(ACE_ROOT)/ace/Map_T.h \ - $(ACE_ROOT)/ace/Pair.h \ - $(ACE_ROOT)/ace/Pair_T.h \ - $(ACE_ROOT)/ace/Pair_T.i \ - $(ACE_ROOT)/ace/Pair_T.cpp \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Active_Map_Manager.h \ - $(ACE_ROOT)/ace/Active_Map_Manager.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - $(TAO_ROOT)/tao/PortableServerC.h \ - $(TAO_ROOT)/tao/PortableServerC.i \ - $(TAO_ROOT)/tao/Key_Adapters.i \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/Servant_Base.i \ - $(TAO_ROOT)/tao/Active_Object_Map.h \ - $(TAO_ROOT)/tao/Active_Object_Map.i \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/Object_Adapter.i \ - $(TAO_ROOT)/tao/POAManager.h \ - $(TAO_ROOT)/tao/POAManager.i \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(TAO_ROOT)/tao/Pluggable.i \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/Profile.h \ - $(TAO_ROOT)/tao/Tagged_Components.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.i \ - $(TAO_ROOT)/tao/Tagged_Components.i \ - $(TAO_ROOT)/tao/Profile.i \ - $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/Policy_Manager.i \ - $(TAO_ROOT)/tao/Resource_Factory.h \ - $(TAO_ROOT)/tao/Protocol_Factory.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/tao/Operation_Table.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/TAOC.h \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ - $(TAO_ROOT)/tao/Priority_Mapping.h \ - $(TAO_ROOT)/tao/Priority_Mapping.i \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ - $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/tao/operation_details.h \ - $(TAO_ROOT)/tao/target_specification.h \ - $(TAO_ROOT)/tao/target_specification.i \ - $(TAO_ROOT)/tao/operation_details.i \ - $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ - $(TAO_ROOT)/tao/DynAny_i.h \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/InterfaceC.h \ - $(TAO_ROOT)/tao/ifrfwd.h \ - $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/MessagingS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/tao/MessagingS_T.h \ - $(TAO_ROOT)/tao/MessagingS_T.i \ - $(TAO_ROOT)/tao/MessagingS_T.cpp \ - $(TAO_ROOT)/tao/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - FT_CORBA_ServiceC.i - -.obj/FT_CORBA_ServiceS.o .obj/FT_CORBA_ServiceS.so .shobj/FT_CORBA_ServiceS.o .shobj/FT_CORBA_ServiceS.so: FT_CORBA_ServiceS.cpp FT_CORBA_ServiceS.h \ - $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/tao/ftpoafwd.h \ - $(TAO_ROOT)/tao/ftcorbafwd.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/CORBA_macros.h \ - $(TAO_ROOT)/tao/varbase.h \ - $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/FT_CORBAS.h \ - $(TAO_ROOT)/tao/FT_CORBAC.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Managed_Types.h \ - $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/FT_CORBAC.i \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/DynAnyC.h \ - $(TAO_ROOT)/tao/DynAnyC.i \ - $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/PortableServerC.h \ - $(TAO_ROOT)/tao/PortableServerC.i \ - $(TAO_ROOT)/tao/Servant_Base.i \ - $(TAO_ROOT)/tao/FT_CORBAS.i \ - FT_CORBA_ServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/IOR_LookupTable.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/IORManipulation.h \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/IORC.h \ - $(TAO_ROOT)/tao/IORC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/Request_Info.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/POA.h \ - $(TAO_ROOT)/tao/Object_Adapter.h \ - $(TAO_ROOT)/tao/Key_Adapters.h \ - $(ACE_ROOT)/ace/Map.h \ - $(ACE_ROOT)/ace/Map_T.h \ - $(ACE_ROOT)/ace/Pair.h \ - $(ACE_ROOT)/ace/Pair_T.h \ - $(ACE_ROOT)/ace/Pair_T.i \ - $(ACE_ROOT)/ace/Pair_T.cpp \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Active_Map_Manager.h \ - $(ACE_ROOT)/ace/Active_Map_Manager.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - $(TAO_ROOT)/tao/Key_Adapters.i \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/Active_Object_Map.h \ - $(TAO_ROOT)/tao/Active_Object_Map.i \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/Object_Adapter.i \ - $(TAO_ROOT)/tao/POAManager.h \ - $(TAO_ROOT)/tao/POAManager.i \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(TAO_ROOT)/tao/Pluggable.i \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/Profile.h \ - $(TAO_ROOT)/tao/Tagged_Components.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.i \ - $(TAO_ROOT)/tao/Tagged_Components.i \ - $(TAO_ROOT)/tao/Profile.i \ - $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/Policy_Manager.i \ - $(TAO_ROOT)/tao/Resource_Factory.h \ - $(TAO_ROOT)/tao/Protocol_Factory.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/tao/Operation_Table.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/TAOC.h \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ - $(TAO_ROOT)/tao/Priority_Mapping.h \ - $(TAO_ROOT)/tao/Priority_Mapping.i \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ - $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/tao/operation_details.h \ - $(TAO_ROOT)/tao/target_specification.h \ - $(TAO_ROOT)/tao/target_specification.i \ - $(TAO_ROOT)/tao/operation_details.i \ - $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ - $(TAO_ROOT)/tao/DynAny_i.h \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/InterfaceC.h \ - $(TAO_ROOT)/tao/ifrfwd.h \ - $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/MessagingS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/tao/MessagingS_T.h \ - $(TAO_ROOT)/tao/MessagingS_T.i \ - $(TAO_ROOT)/tao/MessagingS_T.cpp \ - $(TAO_ROOT)/tao/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - FT_CORBA_ServiceC.i FT_CORBA_ServiceS.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/Naming_Service/README b/TAO/orbsvcs/Naming_Service/README index 475e2490d88..e47e040f859 100644 --- a/TAO/orbsvcs/Naming_Service/README +++ b/TAO/orbsvcs/Naming_Service/README @@ -1,4 +1,4 @@ -// README,v 1.19 2001/02/02 20:21:38 schmidt Exp +// $Id$ This directory contains files that implement a server for the TAO Naming Service. In addition, it contains files that run the TAO @@ -297,78 +297,3 @@ standard out. In order to debug the service's execution itself, use the -d option. - -Troubleshooting -============================================ - -Q1. Error Message: "subscribe: no such device" - -A1. On starting, the error message "subscribe: no such device" is a rather cryp -tic message saying that basically either you don't support multicasting or ther -e is no route for multicasting on one of your network interfaces( e.g. eth0 ). - ---------------------------------------- -(Step 1) -Check to see if you have mutlicasting enabled. In the case of Linux you will ne -ed to check the configuration of your kernel. RedHat users have multicasting en -abled by default. Once you are sure that you have multicast enabled then move t -o the next step. Alternative is to start Naming_Service with multicast disabled -. - - ---------------------------------------- -(Step 2) -Check to see if you have the route for multicasting. Linux users can do this by - running: - - /sbin/route - -You should see something like this: - -Kernel IP routing table -Destination Gateway Genmask Flags Metric Ref Use Iface -10.0.0.0 * 255.255.255.0 U 0 0 0 eth0 -127.0.0.0 * 255.0.0.0 U 0 0 0 lo -224.0.0.0 * 240.0.0.0 U 0 0 0 eth0 - -If you don't see the line for multicast routing: - -224.0.0.0 * 240.0.0.0 U 0 0 0 eth0 - -You will need to add in the next step. If you do see that line and the probelm -is still there then contact the tao-users list by using email. Please remember -to use the problem form. It helps developers to have a more educated guess at t -he exact problem you are having. - - ---------------------------------------- -(Step 3) - -You can do this manually in a script that start the Naming service: - -(Linux/Unix): - - /sbin/route add -net 224.0.0.0 netmask 240.0.0.0 dev eth0 - -Alternatively for RedHat users you can add this into a file "/etc/sysconfig/sta -tic-routes". As of Redhat 7, you might have to create this file, you can make a -n entry: - - eth0 net 240.0.0.0 netmask 240.0.0.0 - -On startup when the network interfaces that will be supporting multicast routin -g are started the route will be added. In my case it adds multicasting routing -to eth0 (the first NIC). - ----------------------------------------- -(Step 4) - -Double check that the route has been added correctly using /sbin/route. - -Kernel IP routing table -Destination Gateway Genmask Flags Metric Ref Use Iface -10.0.0.0 * 255.255.255.0 U 0 0 0 eth0 -127.0.0.0 * 255.0.0.0 U 0 0 0 lo -224.0.0.0 * 240.0.0.0 U 0 0 0 eth0 - -At this point you should be able to run Naming_Service. Have fun! diff --git a/TAO/orbsvcs/examples/CosEC/Simple/README b/TAO/orbsvcs/examples/CosEC/Simple/README index 6090cd7419e..c2d673485ff 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/README +++ b/TAO/orbsvcs/examples/CosEC/Simple/README @@ -1,7 +1,7 @@ # $Id$ This directory contains what possibly is the simplest example -for a COS Event Service. It contains three executables; a consumer, +for a COS Event Service. It contains three executables; a consumer, supplier and a program to create the event channel itself. To test is use the run_test.pl script, or: diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 305b061ab14..346d2f342e4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -114,7 +114,6 @@ TAO_Basic_StreamCtrl::TAO_Basic_StreamCtrl (void) { } - // Stop the transfer of data of the stream // Empty the_spec means apply operation to all flows void @@ -267,7 +266,7 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec, // Empty the_spec means apply operation to all flows CORBA::Boolean TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & new_qos, - const AVStreams::flowSpec &flowspec, + const AVStreams::flowSpec &the_spec, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, @@ -275,49 +274,11 @@ TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & new_qos, { ACE_TRY { - - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_Basic_StreamCtrl::modify_QoS\n")); - - AVStreams::flowSpec in_flowspec; - AVStreams::flowSpec out_flowspec; - - in_flowspec.length (0); - out_flowspec.length (0); - - int in_index = 0; - int out_index = 0; - - for (u_int i=0;i < flowspec.length ();i++) - { - TAO_Forward_FlowSpec_Entry entry; - entry.parse (flowspec [i].in ()); - int direction = entry.direction (); - if (direction == 0) - { - in_flowspec.length (in_index + 1); - in_flowspec [in_index++] = CORBA::string_dup (entry.entry_to_string ()); - } - else - { - out_flowspec.length (out_index + 1); - out_flowspec [out_index++] = CORBA::string_dup (entry.entry_to_string ()); - } - } - - if (in_flowspec.length () != 0) - { - this->vdev_a_->modify_QoS (new_qos, in_flowspec, ACE_TRY_ENV); - ACE_TRY_CHECK; - } - - if (out_flowspec.length () != 0) - { - this->vdev_b_->modify_QoS (new_qos, out_flowspec, ACE_TRY_ENV); - ACE_TRY_CHECK; - } - } + this->vdev_a_->modify_QoS (new_qos, the_spec, ACE_TRY_ENV); + ACE_TRY_CHECK; + this->vdev_b_->modify_QoS (new_qos, the_spec, ACE_TRY_ENV); + ACE_TRY_CHECK; + } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Basic_StreamCtrl::modify_QoS"); @@ -749,15 +710,6 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, streamctrl_any, ACE_TRY_ENV); ACE_TRY_CHECK; - - CORBA::Any streamendpoint_a_any; - streamendpoint_a_any <<= this->sep_a_.in (); - this->vdev_a_->define_property ("Related_StreamEndpoint_A", - streamendpoint_a_any, - ACE_TRY_ENV); - - ACE_TRY_CHECK; - // add the mmdevice, sep and vdev to the map. MMDevice_Map_Entry map_entry; MMDevice_Map_Hash_Key key (a_party); @@ -812,14 +764,6 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, ACE_TRY_ENV); ACE_TRY_CHECK; - CORBA::Any streamendpoint_b_any; - streamendpoint_b_any <<= this->sep_b_.in (); - this->vdev_b_->define_property ("Related_StreamEndpoint_B", - streamendpoint_b_any, - ACE_TRY_ENV); - - ACE_TRY_CHECK; - // add the mmdevice, sep and vdev to the map. MMDevice_Map_Entry map_entry; MMDevice_Map_Hash_Key key (b_party); @@ -1386,11 +1330,6 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &the_qos, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)) { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_StreamCtrl::modify_QoS\n")); - - if (this->mcastconfigif_ != 0) { // call modify_Qos on the root VDev which is the mcast configif. @@ -1753,27 +1692,15 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, AVStreams::streamQoS network_qos; if (qos.length () > 0) { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "QoS is Specified\n")); - - int result = this->translate_qos (qos, - network_qos); + int result = this->translate_qos (qos, network_qos); if (result != 0) if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "QoS translation failed\n")); - - this->qos ().set (network_qos); + ACE_DEBUG ((LM_DEBUG, "QoS translation failed\n")); } - - AVStreams::flowSpec flow_spec (the_spec); this->handle_preconnect (flow_spec); - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_StreamEndPoint::connect: flow_spec_length = %d\n", + ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::connect: flow_spec_length = %d\n", flow_spec.length ())); u_int i; for (i=0;i<flow_spec.length ();i++) @@ -1819,27 +1746,17 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, TAO_Reverse_FlowSpec_Entry, 0); if (entry->parse (flow_spec[i].in ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "Reverse_Flow_Spec_Set::parse failed\n"), - 0); - + ACE_ERROR_RETURN ((LM_ERROR, "Reverse_Flow_Spec_Set::parse failed\n"), 0); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_StreamEndPoint::Connect: Reverse Flow Spec %s\n", - entry->entry_to_string ())); - + ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::Connect: Reverse Flow Spec %s\n", entry->entry_to_string ())); this->reverse_flow_spec_set.insert (entry); } - result = TAO_AV_CORE::instance ()->init_reverse_flows (this, this->forward_flow_spec_set, this->reverse_flow_spec_set, TAO_AV_Core::TAO_AV_ENDPOINT_A); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, - "TAO_AV_Core::init_reverse_flows failed\n"), - 0); - + ACE_ERROR_RETURN ((LM_ERROR, "TAO_AV_Core::init_reverse_flows failed\n"), 0); // Make the upcall to the app retv = this->handle_postconnect (flow_spec); } @@ -1862,7 +1779,6 @@ TAO_StreamEndPoint::translate_qos (const AVStreams::streamQoS& application_qos, for (u_int i=0;i<len;i++) { network_qos [i].QoSType = application_qos [i].QoSType; - network_qos [i].QoSParams = application_qos [i].QoSParams; } return 0; } @@ -2065,7 +1981,7 @@ TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec, CORBA::Boolean TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiator*/, CORBA::Boolean /*is_mcast*/, - AVStreams::streamQoS &qos, + AVStreams::streamQoS &/*qos*/, AVStreams::flowSpec &flow_spec, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException, @@ -2075,29 +1991,11 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato AVStreams::FPError)) { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "\n(%P|%t) TAO_StreamEndPoint::request_connection called")); - - int result = 0; ACE_TRY { - AVStreams::streamQoS network_qos; - if (qos.length () > 0) - { - - ACE_DEBUG ((LM_DEBUG, - "QoS is Specified\n")); - - int result = this->translate_qos (qos, network_qos); - if (result != 0) - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "QoS translation failed\n")); - - this->qos ().set (network_qos); - } - + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) TAO_StreamEndPoint::request_connection called")); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) TAO_StreamEndPoint::request_connection: " @@ -2115,10 +2013,7 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato if (entry->parse (flow_spec[i]) == -1) return 0; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_StreamEndPoint::request_connection Flow Spec %s", - entry->entry_to_string ())); - + ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::request_connection Flow Spec %s", entry->entry_to_string ())); this->forward_flow_spec_set.insert (entry); } @@ -2137,8 +2032,7 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "TAO_StreamEndpoint::request_connection"); + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndpoint::request_connection"); return 0; } ACE_ENDTRY; @@ -2155,11 +2049,7 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &/* new_qos */, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)) { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_StreamEndPoint::modify_QoS\n")); - return 1; - + return 0; } // Sets the list of protocols this streamendpoint can understand. @@ -3049,53 +2939,18 @@ TAO_VDev::set_dev_params (const char *flowName, // QoS Modification should be handled by the application currently. CORBA::Boolean TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &flowspec, + const AVStreams::flowSpec &the_spec, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)) { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_VDev::modify_QoS\n")); - - if (flowspec.length () != 0) - { - TAO_Forward_FlowSpec_Entry entry; - entry.parse (flowspec [0]); - int direction = entry.direction (); - if (direction == 0) - { - AVStreams::StreamEndPoint_A_ptr sep_a; - - CORBA::Any_ptr streamendpoint_a_any = - this->get_property_value ("Related_StreamEndpoint_A", - ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - *streamendpoint_a_any >>= sep_a; - if (sep_a != 0) - { - sep_a->modify_QoS (the_qos, flowspec, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - } - else ACE_DEBUG ((LM_DEBUG, - "Stream EndPoint Not Found\n")); - } - else - { - AVStreams::StreamEndPoint_B_ptr sep_b; - - CORBA::Any_ptr streamendpoint_b_any = - this->get_property_value ("Related_StreamEndpoint_B", - ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - *streamendpoint_b_any >>= sep_b; - sep_b->modify_QoS (the_qos, flowspec, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - } - } - return 1; + ACE_UNUSED_ARG (the_qos); + ACE_UNUSED_ARG (the_spec); + ACE_UNUSED_ARG (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return 0; } TAO_VDev::~TAO_VDev (void) diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index 8c5e2b2239a..352c6fc95f5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -465,38 +465,6 @@ protected: ACE_DLList_Iterator<Peer_Info> peer_list_iterator_; }; -/** - * @class TAO_AV_QoS - * @brief Class for getting and setting the QoS characteristics of - * an AV Stream. - */ -class TAO_AV_Export TAO_AV_QoS -{ -public: - /// constructor. - TAO_AV_QoS (void); - - /// constructor taking a stream qos parameter. - TAO_AV_QoS (AVStreams::streamQoS &stream_qos); - - /// sets the maps with the QoS paramter. - int set (AVStreams::streamQoS &stream_qos); - - /// gets the flow_qos. - int get_flow_qos (const char *flowname,AVStreams::QoS &flow_qos); - - /// converts the application level QoS to Network-level QoS. - int convert (AVStreams::streamQoS &network_qos); - - -protected: - /// Stream Qos. - AVStreams::streamQoS stream_qos_; - - ACE_Hash_Map_Manager<TAO_String_Hash_Key,AVStreams::QoS,ACE_Null_Mutex> qos_map_; -}; - - // Forward declarations. class TAO_AV_TCP_Flow_Handler; class TAO_AV_UDP_Flow_Handler; @@ -562,11 +530,6 @@ public: virtual void set_flow_handler (const char *flowname, TAO_AV_Flow_Handler *handler); - - TAO_AV_QoS &qos (void); - -private: - TAO_AV_QoS qos_; }; // Forward declarations. @@ -1594,6 +1557,36 @@ public: }; +/** + * @class TAO_AV_QoS + * @brief Class for getting and setting the QoS characteristics of + * an AV Stream. + */ +class TAO_AV_Export TAO_AV_QoS +{ +public: + /// constructor. + TAO_AV_QoS (void); + + /// constructor taking a stream qos parameter. + TAO_AV_QoS (AVStreams::streamQoS &stream_qos); + + /// sets the maps with the QoS paramter. + int set (AVStreams::streamQoS &stream_qos); + + /// gets the flow_qos. + int get_flow_qos (const char *flowname,AVStreams::QoS &flow_qos); + + /// converts the application level QoS to Network-level QoS. + int convert (AVStreams::streamQoS &network_qos); + + +protected: + /// Stream Qos. + AVStreams::streamQoS stream_qos_; + + ACE_Hash_Map_Manager<TAO_String_Hash_Key,AVStreams::QoS,ACE_Null_Mutex> qos_map_; +}; #include "Transport.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i index 43e6b8db61f..6476b9736ee 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i @@ -4,13 +4,6 @@ // AVStreams_i.i ACE_INLINE -TAO_AV_QoS & -TAO_Base_StreamEndPoint::qos (void) -{ - return this->qos_; -} - -ACE_INLINE int TAO_AV_QoS::set (AVStreams::streamQoS &stream_qos) { @@ -29,15 +22,10 @@ TAO_AV_QoS::set (AVStreams::streamQoS &stream_qos) ACE_INLINE int -TAO_AV_QoS::get_flow_qos (const char *flowname, - AVStreams::QoS &flow_qos) +TAO_AV_QoS::get_flow_qos (const char *flowname,AVStreams::QoS &flow_qos) { - int result = this->qos_map_.find (flowname, - flow_qos); - + int result = this->qos_map_.find (flowname, flow_qos); if (result < 0) ACE_ERROR_RETURN ((LM_DEBUG,"qos_map::find failed\n"),-1); return 0; } - - diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index cbe489743fe..cf3a2395a6a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -10,10 +10,6 @@ #include "orbsvcs/AV/RTCP.h" #include "orbsvcs/AV/sfp.h" -#ifdef ACE_HAS_RAPI -#include "orbsvcs/AV/QoS_UDP.h" -#endif /*ACE_HAS_RAPI*/ - #include "tao/debug.h" #include "tao/ORB_Core.h" @@ -138,10 +134,7 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, TAO_AV_Core::EndPoint direction, AVStreams::flowSpec &flow_spec) { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_AV_Core::init_forward_flows\n")); - + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Core::init_forward_flows\n")); TAO_AV_FlowSpecSet address_flow_set; TAO_AV_FlowSpecSet flow_set; TAO_AV_FlowSpecSetItor end = flow_spec_set.end (); @@ -156,17 +149,12 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, switch (entry->direction ()) { case TAO_FlowSpec_Entry::TAO_AV_DIR_IN: - { - entry->role (TAO_FlowSpec_Entry::TAO_AV_CONSUMER); - break; - } + entry->role (TAO_FlowSpec_Entry::TAO_AV_CONSUMER); + break; case TAO_FlowSpec_Entry::TAO_AV_DIR_OUT: - { - entry->role (TAO_FlowSpec_Entry::TAO_AV_PRODUCER); - break; - } + entry->role (TAO_FlowSpec_Entry::TAO_AV_PRODUCER); + break; } - break; } case TAO_AV_Core::TAO_AV_ENDPOINT_A: { @@ -187,11 +175,7 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, ACE_Addr *address = entry->address (); if (address != 0) { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "address given for flow %s", - entry->flowname ())); - + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"address given for flow %s",entry->flowname ())); address_flow_set.insert (entry); } else @@ -209,9 +193,7 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, this, address_flow_set); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, - "TAO_AV_Core::init_forward_flows::acceptor_registry::open failed\n"), - -1); + ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_Core::init_forward_flows::acceptor_registry::open failed\n"),-1); TAO_AV_FlowSpecSetItor end = address_flow_set.end (); for (TAO_AV_FlowSpecSetItor start = address_flow_set.begin (); start != end; ++start) @@ -223,18 +205,12 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, { if (entry->handler () != 0) { - //Yamuna:PLEASE CHECK THIS LATER -#ifndef ACE_HAS_RAPI // For IN flows on the A side we should remove the handlers from the reactor. - ACE_Event_Handler *event_handler = entry->handler ()->event_handler (); - result = event_handler->reactor ()->remove_handler (event_handler, - ACE_Event_Handler::READ_MASK); - if (result < 0) - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_AV_Core::init_forward_flows: remove_handler failed\n")); -#endif /*ACE_HAS_RAPI*/ - + ACE_Event_Handler *event_handler = entry->handler ()->event_handler (); + result = event_handler->reactor ()->remove_handler (event_handler, + ACE_Event_Handler::READ_MASK); + if (result < 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Core::init_forward_flows: remove_handler failed\n")); } } default: @@ -246,9 +222,9 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, { // entry doesn't exist so add it. flow_spec_set.insert (entry); - // size_t len = flow_spec.length (); - // flow_spec.length (len+1); - // flow_spec [len] = entry->entry_to_string (); +// size_t len = flow_spec.length (); +// flow_spec.length (len+1); +// flow_spec [len] = entry->entry_to_string (); } } } @@ -257,9 +233,6 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, { if (address_flow_set.size () > 0) { - ACE_DEBUG ((LM_DEBUG, - "This connector registry is called ONE\n")); - result = this->connector_registry_->open (endpoint, this, address_flow_set); @@ -471,14 +444,11 @@ TAO_AV_Core::init_reverse_flows (TAO_Base_StreamEndPoint *endpoint, int result = -1; switch (direction) { - case TAO_AV_Core::TAO_AV_ENDPOINT_A: - { - result = this->connector_registry_->open (endpoint, - this, - connector_flow_set); - } - break; + result = this->connector_registry_->open (endpoint, + this, + connector_flow_set); + break; default: break; } @@ -552,8 +522,8 @@ TAO_AV_Core::init_transport_factories (void) TAO_AV_TransportFactorySetItor end = this->transport_factories_.end (); TAO_AV_TransportFactorySetItor factory = this->transport_factories_.begin (); - const char *udp_factory_str = "UDP_Factory"; - const char *tcp_factory_str = "TCP_Factory"; + const char* foo = "UDP_Factory"; + const char * bar = "TCP_Factory"; if (factory == end) { @@ -561,7 +531,7 @@ TAO_AV_Core::init_transport_factories (void) TAO_AV_Transport_Item *udp_item = 0; udp_factory = - ACE_Dynamic_Service<TAO_AV_Transport_Factory>::instance (udp_factory_str); + ACE_Dynamic_Service<TAO_AV_Transport_Factory>::instance (foo); if (udp_factory == 0) { if (TAO_debug_level) @@ -584,7 +554,7 @@ TAO_AV_Core::init_transport_factories (void) TAO_AV_Transport_Item *tcp_item = 0; tcp_factory = - ACE_Dynamic_Service<TAO_AV_Transport_Factory>::instance (tcp_factory_str); + ACE_Dynamic_Service<TAO_AV_Transport_Factory>::instance (bar); if (tcp_factory == 0) { if (TAO_debug_level) @@ -603,35 +573,6 @@ TAO_AV_Core::init_transport_factories (void) this->transport_factories_.insert (tcp_item); -#ifdef ACE_HAS_RAPI - const char *udp_qos_factory_str = "UDP_QoS_Factory"; - - TAO_AV_Transport_Factory *udp_qos_factory = 0; - TAO_AV_Transport_Item *udp_qos_item = 0; - - udp_qos_factory = - ACE_Dynamic_Service<TAO_AV_Transport_Factory>::instance (udp_qos_factory_str); - if (udp_qos_factory == 0) - { - if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, - "(%P|%t) WARNING - No %s found in Service Repository." - " Using default instance.\n", - "UDP QoS Factory")); - - ACE_NEW_RETURN (udp_qos_factory, - TAO_AV_UDP_QoS_Factory, - -1); - } - - ACE_NEW_RETURN (udp_qos_item, - TAO_AV_Transport_Item ("UDP_QoS_Factory"), - -1); - - udp_qos_item->factory (udp_qos_factory); - - this->transport_factories_.insert (udp_qos_item); -#endif /*ACE_HAS_RAPI*/ } return 0; @@ -648,7 +589,6 @@ TAO_AV_Core::init_flow_protocol_factories (void) const char *rtp_flow = "RTP_Flow_Factory"; const char *rtcp_flow = "RTCP_Flow_Factory"; const char *sfp_flow = "SFP_Flow_Factory"; - if (factory == end) { TAO_AV_Flow_Protocol_Factory *udp_flow_factory = 0; @@ -674,34 +614,6 @@ TAO_AV_Core::init_flow_protocol_factories (void) this->flow_protocol_factories_.insert (udp_item); -#ifdef ACE_HAS_RAPI - - const char *udp_qos_flow = "UDP_QoS_Flow_Factory"; - TAO_AV_Flow_Protocol_Factory *udp_qos_flow_factory = 0; - TAO_AV_Flow_Protocol_Item *udp_qos_flow_item = 0; - - udp_qos_flow_factory = - ACE_Dynamic_Service<TAO_AV_Flow_Protocol_Factory>::instance (udp_qos_flow); - if (udp_qos_flow_factory == 0) - { - if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, - "(%P|%t) WARNING - No %s found in Service Repository." - " Using default instance.\n", - "UDP QoS Flow Factory")); - - ACE_NEW_RETURN (udp_qos_flow_factory, - TAO_AV_UDP_QoS_Flow_Factory, - -1); - } - - ACE_NEW_RETURN (udp_qos_flow_item, TAO_AV_Flow_Protocol_Item ("UDP_QoS_Flow_Factory"), -1); - udp_qos_flow_item->factory (udp_qos_flow_factory); - - this->flow_protocol_factories_.insert (udp_qos_flow_item); - -#endif /*ACE_HAS_RAPI*/ - TAO_AV_Flow_Protocol_Factory *tcp_flow_factory = 0; TAO_AV_Flow_Protocol_Item *tcp_item = 0; diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h index 66a2d5c7b9d..cc0e297c3c9 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h @@ -65,8 +65,7 @@ public: TAO_AV_SFP_UDP = 8, TAO_AV_UDP_MCAST = 9, TAO_AV_RTP_UDP_MCAST = 10, - TAO_AV_SFP_UDP_MCAST = 11, - TAO_AV_QOS_UDP = 12 + TAO_AV_SFP_UDP_MCAST = 11 }; /// Default constructor. diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp deleted file mode 100644 index 5a492031b8f..00000000000 --- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp +++ /dev/null @@ -1,84 +0,0 @@ -// Fill_ACE_QoS.cpp -// $Id$ - -#include "Fill_ACE_QoS.h" - -ACE_RCSID(QOS, Fill_ACE_QoS,"$Id$") - -const iovec Fill_ACE_QoS::iov_ = {0,0}; - -Fill_ACE_QoS::Fill_ACE_QoS (void) -{ - ACE_NEW (this->default_traffic_, - ACE_Flow_Spec (ACE_QOS_NOT_SPECIFIED, - ACE_QOS_NOT_SPECIFIED, - ACE_QOS_NOT_SPECIFIED, - ACE_QOS_NOT_SPECIFIED, - ACE_QOS_NOT_SPECIFIED, - ACE_SERVICETYPE_NOTRAFFIC, - ACE_QOS_NOT_SPECIFIED, - ACE_QOS_NOT_SPECIFIED, - 25, - 1)); -} - -// destructor. -Fill_ACE_QoS::~Fill_ACE_QoS (void) -{} - -int -Fill_ACE_QoS::fill_simplex_receiver_qos (ACE_QoS &ace_qos, - const ACE_Flow_Spec *ace_flow_spec) -{ - ace_qos.receiving_flowspec (*ace_flow_spec); - ace_qos.sending_flowspec (*(this->default_traffic_)); - ace_qos.provider_specific (Fill_ACE_QoS::iov_); - - return 0; -} - - -int -Fill_ACE_QoS::fill_simplex_sender_qos (ACE_QoS &ace_qos, - const ACE_Flow_Spec *sender_flow_spec) -{ - ace_qos.receiving_flowspec (*(this->default_traffic_)); - ace_qos.sending_flowspec (*sender_flow_spec); - ace_qos.provider_specific (Fill_ACE_QoS::iov_); - - return 0; -} - -int -Fill_ACE_QoS::fill_duplex_qos (ACE_QoS &ace_qos, - const ACE_Flow_Spec *recv_flow_spec, - const ACE_Flow_Spec *sender_flow_spec) -{ - ace_qos.receiving_flowspec (*recv_flow_spec); - ace_qos.sending_flowspec (*sender_flow_spec); - ace_qos.provider_specific (Fill_ACE_QoS::iov_); - - return 0; -} - -Fill_ACE_QoS::FLOW_SPEC_HASH_MAP& -Fill_ACE_QoS::map (void) -{ - return this->flow_spec_map_; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Manager<ACE_CString,ACE_Flow_Spec *,ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<ACE_CString, ACE_Flow_Spec *>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Thread_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Thread_Mutex>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString,ACE_Flow_Spec *,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, ACE_Flow_Spec *> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Thread_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Thread_Mutex> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h deleted file mode 100644 index e2252af7d8f..00000000000 --- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h +++ /dev/null @@ -1,75 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ACE_wrappers/examples/QOS -// -// = FILENAME -// Fill_ACE_QoS.h -// -// = AUTHOR -// Vishal Kachroo <vishal@cs.wustl.edu> -// -// ============================================================================ - -#ifndef FILL_ACE_QOS_H -#define FILL_ACE_QOS_H - -#include "ace/SString.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Synch.h" -#include "ace/ACE.h" -#include "ace/OS.h" - -class Fill_ACE_QoS -{ - // TITLE - // This class helps users to add new flow specs and provides - // utility functions for filling up the flow specs for simplex/duplex - // sessions. - -public: - typedef ACE_Hash_Map_Manager <ACE_CString, ACE_Flow_Spec *, ACE_Null_Mutex> FLOW_SPEC_HASH_MAP; - - //Initialization and termination methods. - Fill_ACE_QoS (void); - // constructor. - - ~Fill_ACE_QoS (void); - // destructor. - - int fill_simplex_receiver_qos (ACE_QoS &ace_qos, - const ACE_Flow_Spec *recv_flow_spec); - // To be used by receivers. Fills the receiver qos and sets the - // sender qos to NO_TRAFFIC. - - int fill_simplex_sender_qos (ACE_QoS &ace_qos, - const ACE_Flow_Spec *recv_flow_spec); - // To be used by senders. Fills the sender qos and sets the receiver - // qos to NO_TRAFFIC. - - int fill_duplex_qos (ACE_QoS &ace_qos, - const ACE_Flow_Spec *recv_flow_spec, - const ACE_Flow_Spec *sender_flow_spec); - // To be used by applications that wish to be both receivers and - // senders. - - FLOW_SPEC_HASH_MAP& map (void); - // Returns the hash map of flowspecs indexed by flowspec name. - -private: - - // The Service Provider is currently set to NULL for all ACE_QoS. - static const iovec iov_; - - // A NO_TRAFFIC flow spec. Senders set the receiving qos to this - // while the receivers set the sending qos to this. - ACE_Flow_Spec *default_traffic_; - - // A list of flowspecs indexed by the flowspec name. - FLOW_SPEC_HASH_MAP flow_spec_map_; -}; - -#endif /* FILL_ACE_QOS_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp index 09374995947..ad8f3577f43 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -110,8 +110,6 @@ TAO_FlowSpec_Entry::set_protocol (void) this->protocol_ = TAO_AV_Core::TAO_AV_TCP; else if (ACE_OS::strcasecmp (this->carrier_protocol_.c_str(),"UDP") == 0) this->protocol_ = TAO_AV_Core::TAO_AV_UDP; - else if (ACE_OS::strcasecmp (this->carrier_protocol_.c_str(),"QoS_UDP") == 0) - this->protocol_ = TAO_AV_Core::TAO_AV_QOS_UDP; else if (ACE_OS::strcasecmp (this->carrier_protocol_.c_str(),"AAL5") == 0) this->protocol_ = TAO_AV_Core::TAO_AV_AAL5; else if (ACE_OS::strcasecmp (this->carrier_protocol_.c_str(),"AAL3_4") == 0) @@ -206,7 +204,6 @@ TAO_FlowSpec_Entry::parse_address (const char *address) case TAO_AV_Core::TAO_AV_RTP_UDP: case TAO_AV_Core::TAO_AV_TCP: case TAO_AV_Core::TAO_AV_UDP: - case TAO_AV_Core::TAO_AV_QOS_UDP: { this->address_str_ = addr; ACE_INET_Addr *inet_addr; @@ -374,7 +371,6 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) case TAO_AV_Core::TAO_AV_RTP_UDP: case TAO_AV_Core::TAO_AV_RTP_UDP_MCAST: case TAO_AV_Core::TAO_AV_UDP: - case TAO_AV_Core::TAO_AV_QOS_UDP: case TAO_AV_Core::TAO_AV_UDP_MCAST: case TAO_AV_Core::TAO_AV_TCP: { @@ -510,7 +506,6 @@ TAO_Reverse_FlowSpec_Entry::entry_to_string (void) { case TAO_AV_Core::TAO_AV_RTP_UDP: case TAO_AV_Core::TAO_AV_UDP: - case TAO_AV_Core::TAO_AV_QOS_UDP: case TAO_AV_Core::TAO_AV_UDP_MCAST: case TAO_AV_Core::TAO_AV_TCP: case TAO_AV_Core::TAO_AV_SFP_UDP: diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp deleted file mode 100644 index 73eccfcd240..00000000000 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ /dev/null @@ -1,1125 +0,0 @@ -// $Id$ - -#include "QoS_UDP.h" -#include "UDP.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/MCast.h" -//#include "orbsvcs/AV/QoS_MCast.h" -#include "orbsvcs/AV/Fill_ACE_QoS.h" - -#if !defined (__ACE_INLINE__) -#include "orbsvcs/AV/QoS_UDP.i" -#endif /* __ACE_INLINE__ */ - -//------------------------------------------------------------ -// TAO_AV_UDP_Flow_Handler -//------------------------------------------------------------ - - -int -FillQoSParams (ACE_QoS_Params &qos_params, - iovec* iov, - ACE_QoS* qos) -{ - qos_params.callee_data (iov); - qos_params.caller_data (0); - qos_params.socket_qos (qos); - qos_params.group_socket_qos (0); - qos_params.flags (ACE_JL_BOTH); - - return 0; -} - - -TAO_AV_UDP_QoS_Flow_Handler::TAO_AV_UDP_QoS_Flow_Handler (void) -{ - ACE_NEW (this->transport_, - TAO_AV_UDP_QoS_Transport (this)); -} - -TAO_AV_UDP_QoS_Flow_Handler::~TAO_AV_UDP_QoS_Flow_Handler (void) -{ - delete this->transport_; -} - -TAO_AV_Transport * -TAO_AV_UDP_QoS_Flow_Handler::transport (void) -{ - return this->transport_; -} - -int -TAO_AV_UDP_QoS_Flow_Handler::handle_input (ACE_HANDLE /*fd*/) -{ - this->protocol_object_->handle_input (); - return 0; -} - -int -TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/) -{ - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_AV_UDP_QoS_Flow_Handler::handle_qos\n")); - - if (this->qos_session_->update_qos () == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "Error in updating QoS\n"), - -1); - else - ACE_DEBUG ((LM_DEBUG, - " Updating QOS succeeds.\n")); - - return 0; -} - -int -TAO_AV_UDP_QoS_Flow_Handler::handle_timeout (const ACE_Time_Value &tv, - const void *arg) -{ - return TAO_AV_Flow_Handler::handle_timeout (tv,arg); -} - -int -TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address) -{ - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_AV_UDP_QoS_Flow_Handler::set_remote_address\n")); - - ACE_INET_Addr *inet_addr = - ACE_dynamic_cast (ACE_INET_Addr*,address); - - this->peer_addr_ = *inet_addr; - - TAO_AV_UDP_QoS_Transport *transport = - ACE_dynamic_cast (TAO_AV_UDP_QoS_Transport*,this->transport_); - - return transport->set_remote_address (*inet_addr); -} - - -ACE_HANDLE -TAO_AV_UDP_QoS_Flow_Handler::get_handle (void) const -{ - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_AV_UDP_QoS_Flow_Handler::get_handle:%d\n", - this->qos_sock_dgram_.get_handle ())); - - return this->qos_sock_dgram_.get_handle () ; -} - -//------------------------------------------------------------ -// TAO_AV_UDP_Transport -//------------------------------------------------------------ - -TAO_AV_UDP_QoS_Transport::TAO_AV_UDP_QoS_Transport (void) - :handler_ (0) -{ -} - -TAO_AV_UDP_QoS_Transport::TAO_AV_UDP_QoS_Transport (TAO_AV_UDP_QoS_Flow_Handler *handler) - :handler_ (handler), - addr_ (0) -{ -} - -TAO_AV_UDP_QoS_Transport::~TAO_AV_UDP_QoS_Transport (void) -{ -} - -int -TAO_AV_UDP_QoS_Transport::set_remote_address (const ACE_INET_Addr &address) -{ - this->peer_addr_ = address; - return 0; -} - -int -TAO_AV_UDP_QoS_Transport::open (ACE_Addr * /*address*/) -{ - return 0; -} - -int -TAO_AV_UDP_QoS_Transport::close (void) -{ - return 0; -} - -int -TAO_AV_UDP_QoS_Transport::mtu (void) -{ - return ACE_MAX_DGRAM_SIZE; -} - -ACE_Addr* -TAO_AV_UDP_QoS_Transport::get_peer_addr (void) -{ - return &this->peer_addr_; -} - -ssize_t -TAO_AV_UDP_QoS_Transport::send (const ACE_Message_Block *mblk, - ACE_Time_Value *) -{ - // For the most part this was copied from GIOP::send_request and - // friends. - - iovec iov[IOV_MAX]; - int iovcnt = 0; - ssize_t n = 0; - ssize_t nbytes = 0; - - for (const ACE_Message_Block *i = mblk; - i != 0; - i = i->cont ()) - { - // Make sure there is something to send! - if (i->length () > 0) - { - iov[iovcnt].iov_base = i->rd_ptr (); - iov[iovcnt].iov_len = i->length (); - iovcnt++; - - // The buffer is full make a OS call. @@ TODO this should - // be optimized on a per-platform basis, for instance, some - // platforms do not implement writev() there we should copy - // the data into a buffer and call send_n(). In other cases - // there may be some limits on the size of the iovec, there - // we should set IOV_MAX to that limit. - - size_t bytes_sent = 0; - - if (iovcnt == IOV_MAX) - { - if (this->handler_->get_socket ()->send (iov, - 1, - bytes_sent, - 0, - this->handler_->qos_session ()->dest_addr (), - 0, - 0) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "Error in dgram_mcast.send ()\n"), - -1); - else - ACE_DEBUG ((LM_DEBUG, - "Using ACE_OS::sendto () : Bytes sent : %d", - bytes_sent)); - - if (n < 1) - return n; - - nbytes += bytes_sent; - iovcnt = 0; - } - } - } - - size_t bytes_sent = 0; - - // Check for remaining buffers to be sent! - if (iovcnt != 0) - { - if (this->handler_->get_socket ()->send (iov, - 1, - bytes_sent, - 0, - this->handler_->qos_session ()->dest_addr (), - 0, - 0) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "Error in dgram_mcast.send ()\n"), - -1); - else - ACE_DEBUG ((LM_DEBUG, - "Using ACE_OS::sendto () : Bytes sent : %d", - bytes_sent)); - - if (n < 1) - return n; - - nbytes += bytes_sent; - } - - return nbytes; -} - -ssize_t -TAO_AV_UDP_QoS_Transport::send (const char *buf, - size_t len, - ACE_Time_Value *) -{ - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_AV_UDP_QoS_Transport::send ")); - - char addr [BUFSIZ]; - this->peer_addr_.addr_to_string (addr,BUFSIZ); - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "to %s\n", - addr)); - - return this->handler_->get_socket ()->send (buf, - len, - this->handler_->qos_session ()->dest_addr (), - 0, - 0, - 0); -} - -ssize_t -TAO_AV_UDP_QoS_Transport::send (const iovec *iov, - int /*iovcnt*/, - ACE_Time_Value *) -{ - size_t bytes_sent = 0; - if (this->handler_->get_socket ()->send (iov, - 1, - bytes_sent, - 0, - this->handler_->qos_session ()->dest_addr (), - 0, - 0) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "Error in dgram_mcast.send ()\n"), - -1); - else - ACE_DEBUG ((LM_DEBUG, - "Using ACE_OS::sendto () : Bytes sent : %d", - bytes_sent)); - - return bytes_sent; -} - -ssize_t -TAO_AV_UDP_QoS_Transport::recv (char *buf, - size_t len, - ACE_Time_Value *) -{ - return this->handler_->get_socket ()->recv (buf, len,this->peer_addr_); -} - -ssize_t -TAO_AV_UDP_QoS_Transport::recv (char *buf, - size_t len, - int flags, - ACE_Time_Value *timeout) -{ - return this->handler_->get_socket ()->recv (buf, - len, - this->peer_addr_, - flags, - timeout); -} - -ssize_t -TAO_AV_UDP_QoS_Transport::recv (iovec *iov, - int /*iovcnt*/, - ACE_Time_Value *timeout) -{ - return handler_->get_socket ()->recv (iov,this->peer_addr_,0,timeout); -} - - -//------------------------------------------------------------ -// TAO_AV_UDP_Acceptor -//------------------------------------------------------------ - -TAO_AV_UDP_QoS_Acceptor::TAO_AV_UDP_QoS_Acceptor (void) -{ -} - -TAO_AV_UDP_QoS_Acceptor::~TAO_AV_UDP_QoS_Acceptor (void) -{ -} - -int -TAO_AV_UDP_QoS_Acceptor::activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *handler) -{ - int result = 0; - - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "Acceptor Svc Handler QOS ENABLED \n")); - - ACE_QoS_Decorator* qos_decorator; - - // Decorate the above handler with QoS functionality. - ACE_NEW_RETURN (qos_decorator, - ACE_QoS_Decorator (handler, - handler->qos_session (), - this->av_core_->reactor ()), - -1); - - // Initialize the Decorator. - if (qos_decorator->init () != 0) - ACE_ERROR_RETURN ((LM_ERROR, - "QoS Decorator init () failed.\n"), - -1); - - // Register the decorated Event Handler with the Reactor. - result = this->av_core_->reactor ()->register_handler (qos_decorator, - ACE_Event_Handler::QOS_MASK | - ACE_Event_Handler::READ_MASK); - if (result == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "Error in registering the Decorator with the Reactor\n"), - -1); - - return result; -} - -int -TAO_AV_UDP_QoS_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, - TAO_AV_Core *av_core, - TAO_FlowSpec_Entry *entry, - TAO_AV_Flow_Protocol_Factory *factory) -{ - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_AV_UDP_QoS_Acceptor::open ")); - - this->av_core_ = av_core; - this->endpoint_ = endpoint; - this->entry_ = entry; - - - this->flow_protocol_factory_ = factory; - this->flowname_ = entry->flowname (); - ACE_INET_Addr *inet_addr = (ACE_INET_Addr *) entry->address (); -// inet_addr->set (inet_addr->get_port_number (), -// inet_addr->get_host_name ()); - char buf[BUFSIZ]; - inet_addr->addr_to_string (buf, - BUFSIZ); - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_AV_UDP_QoS_Acceptor::open: %s", - buf)); - - int result = this->open_i (inet_addr); - - if (result < 0) - return result; - - return 0; -} - -int -TAO_AV_UDP_QoS_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint, - TAO_AV_Core *av_core, - TAO_FlowSpec_Entry *entry, - TAO_AV_Flow_Protocol_Factory *factory) -{ - this->av_core_ = av_core; - this->endpoint_ = endpoint; - this->entry_ = entry; - this->flow_protocol_factory_ = factory; - this->flowname_ = entry->flowname (); - ACE_INET_Addr *address; - ACE_NEW_RETURN (address, - ACE_INET_Addr ("0"), - -1); - int result = this->open_i (address); - if (result < 0) - return result; - return 0; -} - -int -TAO_AV_UDP_QoS_Acceptor::translate (CosPropertyService::Properties &qos_params, - ACE_Flow_Spec *ace_flow_spec) -{ - for (unsigned int i = 0; - i < qos_params.length (); - i++) - { - if (ACE_OS::strcmp (qos_params [i].property_name, "Service_Type") == 0) - { - CORBA::Short type; - qos_params [i].property_value >>= type; - ace_flow_spec->service_type (type); - } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Token_Rate") == 0) - { - CORBA::ULong tok_rate; - qos_params [i].property_value >>= tok_rate; - ace_flow_spec->token_rate (tok_rate); - } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Token_Bucket_Size") == 0) - { - CORBA::ULong tok_buck_size; - qos_params [i].property_value >>= tok_buck_size; - ace_flow_spec->token_bucket_size (tok_buck_size); - } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Peak_Bandwidth") == 0) - { - CORBA::ULong peak_bw; - qos_params [i].property_value >>= peak_bw; - ace_flow_spec->peak_bandwidth (peak_bw); - } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Latency") == 0) - { - CORBA::ULong lat; - qos_params [i].property_value >>= lat; - ace_flow_spec->latency (lat); - } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Delay_Variation") == 0) - { - CORBA::ULong delay_var; - qos_params [i].property_value >>= delay_var; - ace_flow_spec->delay_variation (delay_var); - } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Max_SDU_Size") == 0) - { - CORBA::ULong max_sdu; - qos_params [i].property_value >>= max_sdu; - ace_flow_spec->delay_variation (max_sdu); - } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Minimum_Policed_Size") == 0) - { - CORBA::ULong min_pol_size; - qos_params [i].property_value >>= min_pol_size; - ace_flow_spec->delay_variation (min_pol_size); - } - else if (ACE_OS::strcmp (qos_params [i].property_name, "TTL") == 0) - { - CORBA::ULong ttl; - qos_params [i].property_value >>= ttl; - ace_flow_spec->delay_variation (ttl); - } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Priority") == 0) - { - CORBA::ULong priority; - qos_params [i].property_value >>= priority; - ace_flow_spec->delay_variation (priority); - } - } - - return 0; -} - -int -TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) -{ - int result = -1; - // TAO_AV_Callback *callback = 0; - // this->endpoint_->get_callback (this->flowname_.c_str (), - // callback); - ACE_INET_Addr *local_addr; - - AVStreams::QoS qos; - this->endpoint_->qos ().get_flow_qos (this->flowname_.c_str (), - qos); - - ACE_Flow_Spec *ace_flow_spec; - ACE_NEW_RETURN (ace_flow_spec, - ACE_Flow_Spec, - -1); - - this->translate (qos.QoSParams, - ace_flow_spec); - - ACE_QoS* ace_qos; - - ACE_NEW_RETURN (ace_qos, - ACE_QoS, - -1); - - Fill_ACE_QoS fill_ace_qos; - - if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER) - { - if (fill_ace_qos.fill_simplex_sender_qos (*ace_qos, - ace_flow_spec) !=0) - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to fill simplex sender qos\n"), - -1); - else - ACE_DEBUG ((LM_DEBUG, - "Filled up the Sender QoS parameters\n")); - } - else if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_CONSUMER) - { - if (fill_ace_qos.fill_simplex_receiver_qos (*ace_qos, - ace_flow_spec) !=0) - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to fill simplex receiver qos\n"), - -1); - else - ACE_DEBUG ((LM_DEBUG, - "Filled up the Receiver QoS parameters\n")); - - } - - ACE_QoS_Params qos_params; - FillQoSParams (qos_params, - 0, - ace_qos); - - // Create a QoS Session Factory. - ACE_QoS_Session_Factory session_factory; - - // Ask the factory to create a QoS session. This could be RAPI or - // GQoS based on the parameter passed. - - //@@YAmuna : Later make this generic for GQoS - this->qos_session_ = - session_factory.create_session (ACE_QoS_Session_Factory::ACE_RAPI_SESSION); - - // Create a destination address for the QoS session. The same - // address should be used for the subscribe call later. A copy - // is made below only to distinguish the two usages of the dest - // address. - ACE_INET_Addr dest_addr (*inet_addr); - - // A QoS session is defined by the 3-tuple [DestAddr, DestPort, - // Protocol]. Initialize the QoS session. - if (this->qos_session_->open (*inet_addr, - IPPROTO_UDP) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "Error in opening the QoS session\n"), - -1); - else - ACE_DEBUG ((LM_DEBUG, - "QoS session opened successfully\n")); - - TAO_AV_UDP_QoS_Flow_Handler* handler; - ACE_NEW_RETURN (handler, - TAO_AV_UDP_QoS_Flow_Handler, - -1); - - TAO_AV_Flow_Handler *flow_handler = 0; - flow_handler = handler; - - result = handler->get_socket ()->subscribe (*inet_addr, - qos_params, - 1, - 0, - AF_INET, - // ACE_FROM_PROTOCOL_INFO, - 0, - 0, // ACE_Protocol_Info, - 0, - ACE_OVERLAPPED_SOCKET_FLAG - | ACE_FLAG_MULTIPOINT_C_LEAF - | ACE_FLAG_MULTIPOINT_D_LEAF, - this->qos_session_); - - if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_QOS_UDP_MCast_Acceptor::subscribe failed\n"),-1); - else ACE_DEBUG ((LM_DEBUG, - "Subscribe succeeded\n")); - - handler->qos_session (this->qos_session_); - - ACE_NEW_RETURN (local_addr, - ACE_INET_Addr (*inet_addr), - -1); - - if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER) - { - // This is a sender - this->qos_session_->flags (ACE_QoS_Session::ACE_QOS_SENDER); - } - else if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_CONSUMER) - { - // This is a receiver - this->qos_session_->flags (ACE_QoS_Session::ACE_QOS_RECEIVER); - } - - this->qos_manager_ - = handler->get_socket ()->qos_manager (); - - // Set the QoS for the session. Replaces the ioctl () call that - // was being made previously. - if (this->qos_session_->qos (handler->get_socket (), - &this->qos_manager_, - *ace_qos) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to set QoS\n"), - -1); - else - ACE_DEBUG ((LM_DEBUG, - "Setting QOS succeeds.\n")); - - // ACE_Time_Value era (10); - //this->adaptor ().flowspec_entry (this->entry_); - //this->adaptor ().endpoint (this->endpoint_); -// TAO_AV_CORE::instance ()->monitor ().register_session (this->qos_session_, - // adaptor, - // (void *) TAO_AV_CORE::instance ()->get_adaptor ((char*)this->flowname ()), - // era, - // QoS_Monitor::PEAK_BANDWIDTH); - - //ll_ace_qos.map ().unbind (g_711); - - TAO_AV_Protocol_Object *object = - this->flow_protocol_factory_->make_protocol_object (this->entry_, - this->endpoint_, - flow_handler, - flow_handler->transport ()); - flow_handler->protocol_object (object); - // callback->protocol_object (object); -// this->endpoint_->set_protocol_object (this->flowname_.c_str (), -// object); - this->endpoint_->set_flow_handler (this->flowname_.c_str (),flow_handler); - this->entry_->protocol_object (object); - - char buf[BUFSIZ]; - local_addr->addr_to_string (buf,BUFSIZ); - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_AV_UDP_QoS_ACCEPTOR::open:%s \n", - buf)); - - this->entry_->set_local_addr (local_addr); - this->entry_->handler (flow_handler); - - // call activate svc handler. - return this->activate_svc_handler (handler); -} - -int -TAO_AV_UDP_QoS_Acceptor::close (void) -{ - return 0; -} - -//------------------------------------------------------------ -// TAO_AV_UDP_Connector -//------------------------------------------------------------ -TAO_AV_UDP_QoS_Connector::TAO_AV_UDP_QoS_Connector (void) -{ -} - -TAO_AV_UDP_QoS_Connector::~TAO_AV_UDP_QoS_Connector (void) -{ -} - -int -TAO_AV_UDP_QoS_Connector::open (TAO_Base_StreamEndPoint *endpoint, - TAO_AV_Core *av_core, - TAO_AV_Flow_Protocol_Factory *factory) - -{ - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_AV_UDP_QoS_Connector::open ")); - - this->endpoint_ = endpoint; - this->av_core_ = av_core; - this->flow_protocol_factory_ = factory; - return 0; -} - -int -TAO_AV_UDP_QoS_Connector::translate (CosPropertyService::Properties &qos_params, - ACE_Flow_Spec *ace_flow_spec) -{ - for (unsigned int i = 0; - i < qos_params.length (); - i++) - { - if (ACE_OS::strcmp (qos_params [i].property_name, "Service_Type") == 0) - { - CORBA::Short type; - qos_params [i].property_value >>= type; - ace_flow_spec->service_type (type); - } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Token_Rate") == 0) - { - CORBA::ULong tok_rate; - qos_params [i].property_value >>= tok_rate; - ace_flow_spec->token_rate (tok_rate); - } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Token_Bucket_Rate") == 0) - { - CORBA::ULong tok_buck_size; - qos_params [i].property_value >>= tok_buck_size; - ace_flow_spec->token_bucket_size (tok_buck_size); - } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Peak_Bandwidth") == 0) - { - CORBA::ULong peak_bw; - qos_params [i].property_value >>= peak_bw; - ace_flow_spec->peak_bandwidth (peak_bw); - } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Latency") == 0) - { - CORBA::ULong lat; - qos_params [i].property_value >>= lat; - ace_flow_spec->latency (lat); - } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Delay_Variation") == 0) - { - CORBA::ULong delay_var; - qos_params [i].property_value >>= delay_var; - ace_flow_spec->delay_variation (delay_var); - } - - } - - return 0; -} - - -int -TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, - TAO_AV_Transport *&transport) -{ - int result = -1; - this->entry_ = entry; - this->flowname_ = entry->flowname (); - -// ACE_INET_Addr *local_addr; -// ACE_NEW_RETURN (local_addr, -// ACE_INET_Addr ("0"), -// -1); - - Fill_ACE_QoS fill_ace_qos; - - AVStreams::QoS qos; - this->endpoint_->qos ().get_flow_qos (this->flowname_.c_str (), - qos); - ACE_Flow_Spec *ace_flow_spec; - ACE_NEW_RETURN (ace_flow_spec, - ACE_Flow_Spec, - -1); - - this->translate (qos.QoSParams, - ace_flow_spec); - - ACE_QoS* ace_qos; - - ACE_NEW_RETURN (ace_qos, - ACE_QoS, - -1); - - if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_CONSUMER) - { - if (fill_ace_qos.fill_simplex_receiver_qos (*ace_qos, - ace_flow_spec) !=0) - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to fill simplex receiver qos\n"), - -1); - else - ACE_DEBUG ((LM_DEBUG, - "Filled up the Receiver QoS parameters\n")); - } - else if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER) - { - if (fill_ace_qos.fill_simplex_sender_qos (*ace_qos, - ace_flow_spec) !=0) - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to fill simplex sender qos\n"), - -1); - else - ACE_DEBUG ((LM_DEBUG, - "Filled up the Sender QoS parameters\n")); - } - - ACE_QoS_Params qos_params; - FillQoSParams (qos_params, - 0, - ace_qos); - - ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*, - entry->address ()); - TAO_AV_Flow_Handler *flow_handler = 0; - - // Create a QoS Session Factory. - ACE_QoS_Session_Factory session_factory; - - // Ask the factory to create a QoS session. This could be RAPI or - // GQoS based on the parameter passed. - - //@@YAmuna : Later make this generic for GQoS - this->qos_session_ = - session_factory.create_session (ACE_QoS_Session_Factory::ACE_RAPI_SESSION); - - - // Create a destination address for the QoS session. The same - // address should be used for the subscribe call later. A copy - // is made below only to distinguish the two usages of the dest - // address. - ACE_INET_Addr dest_addr (*inet_addr); - - // A QoS session is defined by the 3-tuple [DestAddr, DestPort, - // Protocol]. Initialize the QoS session. - if (this->qos_session_->open (*inet_addr, - IPPROTO_UDP) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "Error in opening the QoS session\n"), - -1); - else - ACE_DEBUG ((LM_DEBUG, - "QoS session opened successfully\n")); - - TAO_AV_UDP_QoS_Flow_Handler *handler; - ACE_NEW_RETURN (handler, - TAO_AV_UDP_QoS_Flow_Handler, - -1); - - handler->qos_session (this->qos_session_); - - flow_handler = handler; - - - - - result = handler->get_socket ()->subscribe (*inet_addr, - qos_params, - 1, - 0, - AF_INET, - // ACE_FROM_PROTOCOL_INFO, - 0, - 0, // ACE_Protocol_Info, - 0, - ACE_OVERLAPPED_SOCKET_FLAG - | ACE_FLAG_MULTIPOINT_C_LEAF - | ACE_FLAG_MULTIPOINT_D_LEAF, - this->qos_session_); - if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_QOS_UDP_MCast_Acceptor::subscribe failed\n"),-1); - // Now disable Multicast loopback. - // @@Should we make this a policy? - - ACE_INET_Addr *local_addr; - - ACE_NEW_RETURN (local_addr, - ACE_INET_Addr (*inet_addr), - -1); - - - if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER) - { - // This is a sender - this->qos_session_->flags (ACE_QoS_Session::ACE_QOS_SENDER); - } - else if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_CONSUMER) - { - // This is a receiver - this->qos_session_->flags (ACE_QoS_Session::ACE_QOS_RECEIVER); - } - - this->qos_manager_ = - handler->get_socket ()->qos_manager (); - - // Set the QoS for the session. Replaces the ioctl () call that - // was being made previously. - if (this->qos_session_->qos (handler->get_socket (), - &this->qos_manager_, - *ace_qos) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to set QoS\n"), - -1); - else - ACE_DEBUG ((LM_DEBUG, - "Setting QOS succeeds.\n")); - - - TAO_AV_Protocol_Object *object = - this->flow_protocol_factory_->make_protocol_object (this->entry_, - this->endpoint_, - flow_handler, - flow_handler->transport ()); - flow_handler->protocol_object (object); - // callback->protocol_object (object); - // this->endpoint_->set_protocol_object (this->flowname_.c_str (), - // object); - this->endpoint_->set_flow_handler (this->flowname_.c_str (),flow_handler); - this->entry_->protocol_object (object); - - char buf[BUFSIZ]; - local_addr->addr_to_string (buf,BUFSIZ); - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_AV_UDP_CONNECTOR::connect:%s \n", - buf)); - - entry->set_local_addr (local_addr); - entry->handler (flow_handler); - transport = flow_handler->transport (); - // call activate svc handler. - return this->activate_svc_handler (handler); -} - -int -TAO_AV_UDP_QoS_Connector::activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *handler) -{ - int result = 0; - ACE_QoS_Decorator* qos_decorator; - - // Decorate the above handler with QoS functionality. - ACE_NEW_RETURN (qos_decorator, - ACE_QoS_Decorator (handler, - handler->qos_session (), - this->av_core_->reactor ()), - -1); - - // Initialize the Decorator. - if (qos_decorator->init () != 0) - ACE_ERROR_RETURN ((LM_ERROR, - "QoS Decorator init () failed.\n"), - -1); - - // Register the decorated Event Handler with the Reactor. - result = this->av_core_->reactor ()->register_handler (qos_decorator, - ACE_Event_Handler::QOS_MASK | - ACE_Event_Handler::READ_MASK); - - if (result == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "Error in registering the Decorator with the Reactor\n"), - -1); - - return result; -} - -int -TAO_AV_UDP_QoS_Connector::close (void) -{ - return 0; -} - -//------------------------------------------------------------ -// TAO_AV_UDP_Protocol_Factory -//------------------------------------------------------------ - -TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory (void) -{ - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory\n")); -} - -TAO_AV_UDP_QoS_Factory::~TAO_AV_UDP_QoS_Factory (void) -{ -} - -int -TAO_AV_UDP_QoS_Factory::match_protocol (const char *protocol_string) -{ - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_AV_UDP_QoS_Factory::match_protocol\n")); - - if (ACE_OS::strcasecmp (protocol_string,"QoS_UDP") == 0) - return 1; - return 0; -} - -TAO_AV_Acceptor* -TAO_AV_UDP_QoS_Factory::make_acceptor (void) -{ - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_AV_UDP_QoS_Factory::make_acceptor ")); - - TAO_AV_Acceptor *acceptor = 0; - ACE_NEW_RETURN (acceptor, - TAO_AV_UDP_QoS_Acceptor, - 0); - return acceptor; -} - -TAO_AV_Connector* -TAO_AV_UDP_QoS_Factory::make_connector (void) -{ - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_AV_UDP_QoS_Factory::make_connector ")); - - TAO_AV_Connector *connector = 0; - ACE_NEW_RETURN (connector, - TAO_AV_UDP_QoS_Connector, - 0); - return connector; -} - -int -TAO_AV_UDP_QoS_Factory::init (int /* argc */, - char * /* argv */ []) -{ - return 0; -} - - -//------------------------------------------------------------ -// TAO_AV_UDP_Flow_Factory -//------------------------------------------------------------ -TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory (void) -{ - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory\n")); -} - -TAO_AV_UDP_QoS_Flow_Factory::~TAO_AV_UDP_QoS_Flow_Factory (void) -{ -} - -int -TAO_AV_UDP_QoS_Flow_Factory::init (int /* argc */, - char * /* argv */ []) -{ - return 0; -} - -int -TAO_AV_UDP_QoS_Flow_Factory::match_protocol (const char *flow_string) -{ - if (ACE_OS::strcasecmp (flow_string,"QoS_UDP") == 0) - return 1; - return 0; -} - -TAO_AV_Protocol_Object* -TAO_AV_UDP_QoS_Flow_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, - TAO_Base_StreamEndPoint *endpoint, - TAO_AV_Flow_Handler *handler, - TAO_AV_Transport *transport) -{ - TAO_AV_Callback *callback = 0; - endpoint->get_callback (entry->flowname (), - callback); - - - TAO_AV_UDP_Object *object = 0; - ACE_NEW_RETURN (object, - TAO_AV_UDP_Object (callback, - transport), - 0); - callback->open (object, - handler); - endpoint->set_protocol_object (entry->flowname (), - object); - return object; -} - -ACE_FACTORY_DEFINE (AV, TAO_AV_UDP_QoS_Flow_Factory) -ACE_STATIC_SVC_DEFINE (TAO_AV_UDP_QoS_Flow_Factory, - ACE_TEXT ("UDP_QoS_Flow_Factory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (TAO_AV_UDP_QoS_Flow_Factory), - ACE_Service_Type::DELETE_THIS | - ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_DEFINE (AV, TAO_AV_UDP_QoS_Factory) - -ACE_STATIC_SVC_DEFINE (TAO_AV_UDP_QoS_Factory, - ACE_TEXT ("UDP_QoS_Factory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (TAO_AV_UDP_QoS_Factory), - ACE_Service_Type::DELETE_THIS | - ACE_Service_Type::DELETE_OBJ, - 0) - - diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h deleted file mode 100644 index eb5ae43c455..00000000000 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h +++ /dev/null @@ -1,247 +0,0 @@ -/* -*- C++ -*- */ - -// $Id$ -// ============================================================================ -// -// = LIBRARY -// ORBSVCS AVStreams -// -// = FILENAME -// UDP.h -// -// = AUTHOR -// Yamuna Krishnamurthy <yamuna@cs.wustl.edu> -// -// -// ============================================================================ - -#ifndef TAO_AV_QOS_UDP_H -#define TAO_AV_QOS_UDP_H -#include "ace/pre.h" - - -#include "ace/OS.h" -#include "ace/QoS/QoS_Session_Factory.h" -#include "ace/QoS/QoS_Decorator.h" -#include "ace/QoS/SOCK_Dgram_Mcast_QoS.h" - -#include "orbsvcs/AV/Protocol_Factory.h" - - -class TAO_AV_Export TAO_AV_UDP_QoS_Factory : public TAO_AV_Transport_Factory -{ -public: - TAO_AV_UDP_QoS_Factory (void); - virtual ~TAO_AV_UDP_QoS_Factory (void); - virtual int init (int argc, char *argv[]); - // Initialization hook. - virtual int match_protocol (const char *protocol_string); - virtual TAO_AV_Acceptor *make_acceptor (void); - virtual TAO_AV_Connector *make_connector (void); -}; - -class TAO_AV_UDP_QoS_Flow_Handler; - -class TAO_AV_UDP_QoS_Transport - :public TAO_AV_Transport -{ - // = TITLE - // A transport abstraction for udp sockets. - // - // = DESCRIPTION - // Uses the ACE_SOCK_Dgram to send the data. -public: - TAO_AV_UDP_QoS_Transport (void); - - TAO_AV_UDP_QoS_Transport (TAO_AV_UDP_QoS_Flow_Handler *handler); - - virtual ~TAO_AV_UDP_QoS_Transport (void); - - virtual int open (ACE_Addr *addr); - - virtual int close (void); - - virtual int mtu (void); - - virtual ACE_Addr *get_peer_addr (void); - - virtual int set_remote_address (const ACE_INET_Addr &address); - - virtual ssize_t send (const ACE_Message_Block *mblk, - ACE_Time_Value *s = 0); - // Write the complete Message_Block chain to the connection. - - virtual ssize_t send (const char *buf, - size_t len, - ACE_Time_Value *s = 0); - // Write the contents of the buffer of length len to the connection. - - virtual ssize_t send (const iovec *iov, - int iovcnt, - ACE_Time_Value *s = 0); - // Write the contents of iovcnt iovec's to the connection. - - virtual ssize_t recv (char *buf, - size_t len, - ACE_Time_Value *s = 0); - // Read len bytes from into buf. - - virtual ssize_t recv (char *buf, - size_t len, - int flags, - ACE_Time_Value *s = 0); - // Read len bytes from into buf using flags. - - virtual ssize_t recv (iovec *iov, - int iovcnt, - ACE_Time_Value *s = 0); - // Read received data into the iovec buffers. -protected: - TAO_AV_UDP_QoS_Flow_Handler *handler_; - ACE_Addr *addr_; - ACE_INET_Addr peer_addr_; -}; - -class TAO_AV_UDP_QoS_Flow_Handler - :public virtual TAO_AV_Flow_Handler, - public virtual ACE_Event_Handler -{ -public: - TAO_AV_UDP_QoS_Flow_Handler (void); - //Ctor - ~TAO_AV_UDP_QoS_Flow_Handler (void); - // Dtor - int open (ACE_Addr &address); - virtual TAO_AV_Transport *transport (void); - virtual int set_remote_address (ACE_Addr *address); - virtual ACE_HANDLE get_handle (void) const; - virtual int handle_input (ACE_HANDLE fd); - virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0); - virtual int handle_qos (ACE_HANDLE fd); - // Handles a QoS event. Right now, just - // prints a message. - ACE_SOCK_Dgram_Mcast_QoS *get_socket (void); - virtual ACE_Event_Handler* event_handler (void){ return this; } - virtual ACE_QoS_Session* qos_session (void); - virtual void qos_session (ACE_QoS_Session *qos_session); -protected: - TAO_AV_Core *av_core_; - ACE_INET_Addr peer_addr_; - ACE_SOCK_Dgram_Mcast_QoS qos_sock_dgram_; - ACE_QoS_Session *qos_session_; -}; - -class TAO_AV_UDP_QoS_Acceptor - :public TAO_AV_Acceptor -{ -public: - TAO_AV_UDP_QoS_Acceptor (void); - virtual ~TAO_AV_UDP_QoS_Acceptor (void); - virtual int open (TAO_Base_StreamEndPoint *endpoint, - TAO_AV_Core *av_core, - TAO_FlowSpec_Entry *entry, - TAO_AV_Flow_Protocol_Factory *factory); - - virtual int open_default (TAO_Base_StreamEndPoint *endpoint, - TAO_AV_Core *av_core, - TAO_FlowSpec_Entry *entry, - TAO_AV_Flow_Protocol_Factory *factory); - - virtual int open_i (ACE_INET_Addr *address); - - virtual int close (void); - // virtual int activate_svc_handler (TAO_AV_Flow_Handler *handler); - virtual int activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *handler); - - int translate (CosPropertyService::Properties &qos_params, - ACE_Flow_Spec *ace_flow_spec); - -protected: - TAO_Base_StreamEndPoint *endpoint_; - TAO_FlowSpec_Entry *entry_; - TAO_AV_Flow_Protocol_Factory *flow_protocol_factory_; - ACE_QoS_Session *qos_session_; - ACE_QoS_Manager qos_manager_; -}; - -class TAO_AV_UDP_QoS_Connector - :public TAO_AV_Connector -{ -public: - TAO_AV_UDP_QoS_Connector (void); - ~TAO_AV_UDP_QoS_Connector (void); - virtual int open (TAO_Base_StreamEndPoint *endpoint, - TAO_AV_Core *av_core, - TAO_AV_Flow_Protocol_Factory *factory); - - virtual int connect (TAO_FlowSpec_Entry *entry, - TAO_AV_Transport *&transport); - virtual int activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *handler); - virtual int close (void); - - int translate (CosPropertyService::Properties &qos_params, - ACE_Flow_Spec *ace_flow_spec); - -protected: - TAO_Base_StreamEndPoint *endpoint_; - TAO_AV_Core *av_core_; - TAO_FlowSpec_Entry *entry_; - TAO_AV_Flow_Protocol_Factory *flow_protocol_factory_; - ACE_QoS_Session *qos_session_; - ACE_QoS_Manager qos_manager_; -}; - -// class TAO_AV_Export TAO_AV_UDP_Object : public TAO_AV_Protocol_Object -// { -// public: -// TAO_AV_UDP_Object (TAO_AV_Callback *callback, -// TAO_AV_Transport *transport = 0); - -// virtual ~TAO_AV_UDP_Object (void); -// // Dtor - -// virtual int handle_input (void); - -// virtual int send_frame (ACE_Message_Block *frame, -// TAO_AV_frame_info *frame_info = 0); -// // send a data frame. - -// virtual int send_frame (const iovec *iov, -// int iovcnt, -// TAO_AV_frame_info *frame_info = 0); - -// virtual int destroy (void); -// // end the stream. - -// private: -// ACE_Message_Block frame_; -// // Pre-allocated memory to receive the data... -// }; - -class TAO_AV_UDP_QoS_Flow_Factory : public TAO_AV_Flow_Protocol_Factory -{ -public: - TAO_AV_UDP_QoS_Flow_Factory (void); - virtual ~TAO_AV_UDP_QoS_Flow_Factory (void); - virtual int init (int argc, char *argv[]); - // Initialization hook. - virtual int match_protocol (const char *flow_string); - TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, - TAO_Base_StreamEndPoint *endpoint, - TAO_AV_Flow_Handler *handler, - TAO_AV_Transport *transport); -}; - -ACE_STATIC_SVC_DECLARE (TAO_AV_UDP_QoS_Flow_Factory) -ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_QoS_Flow_Factory) - -ACE_STATIC_SVC_DECLARE (TAO_AV_UDP_QoS_Factory) -ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_QoS_Factory) - - -#if defined(__ACE_INLINE__) -#include "QoS_UDP.i" -#endif /* __ACE_INLINE__ */ - -#include "ace/post.h" -#endif /* TAO_AV_QOS_UDP_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i deleted file mode 100644 index b3e1a80b1ab..00000000000 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- C++ -*- */ - -// $Id$ - -//---------------------------------------------------------------------- -// TAO_AV_UDP_Flow_Handler -//---------------------------------------------------------------------- -ACE_INLINE -ACE_SOCK_Dgram_Mcast_QoS * -TAO_AV_UDP_QoS_Flow_Handler::get_socket (void) -{ - return &this->qos_sock_dgram_; -} - -ACE_INLINE -int -TAO_AV_UDP_QoS_Flow_Handler::open (ACE_Addr &address) -{ - // return this->qos_sock_dgram_.open (address); - return 0; -} - -ACE_INLINE ACE_QoS_Session* -TAO_AV_UDP_QoS_Flow_Handler::qos_session (void) -{ - return this->qos_session_; -} - -ACE_INLINE void -TAO_AV_UDP_QoS_Flow_Handler::qos_session (ACE_QoS_Session *qos_session) -{ - this->qos_session_ = qos_session; -} diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp index 283b12e1af6..85a09a59eb5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp @@ -11,10 +11,6 @@ #include "FlowSpec_Entry.h" #include "AV_Core.h" -#ifdef ACE_HAS_RAPI -#include "QoS_UDP.h" -#endif /*ACE_HAS_RAPI*/ - #include "tao/debug.h" #include "ace/Dynamic_Service.h" @@ -119,7 +115,6 @@ TAO_AV_Connector_Registry::open (TAO_Base_StreamEndPoint *endpoint, av_core, (*flow_factory)->factory ()) == -1) return -1; - TAO_AV_Transport *transport = 0; if (connector->connect (entry, transport) == -1) @@ -276,7 +271,7 @@ TAO_AV_Acceptor_Registry::open (TAO_Base_StreamEndPoint *endpoint, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_AV_Acceptor_Registry::open \n")); + "TAO_AV_Acceptor_Registry::open")); TAO_AV_FlowSpecSetItor last_flowspec = flow_spec_set.end (); @@ -294,15 +289,13 @@ TAO_AV_Acceptor_Registry::open (TAO_Base_StreamEndPoint *endpoint, flow_protocol = transport_protocol; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_AV_Acceptor_Registry::protocol for flow %s is %s\n", + "TAO_AV_Acceptor_Registry::protocol for flow %s is %d", entry->flowname (), transport_protocol)); if (address == 0) { - this->open_default (endpoint, - av_core, - entry); + this->open_default (endpoint,av_core, entry); continue; } else @@ -320,13 +313,11 @@ TAO_AV_Acceptor_Registry::open (TAO_Base_StreamEndPoint *endpoint, { TAO_AV_TransportFactorySetItor transport_factory_end = av_core->transport_factories ()->end (); - for (TAO_AV_TransportFactorySetItor transport_factory = av_core->transport_factories ()->begin (); transport_factory != transport_factory_end; ++transport_factory) { - if ((*transport_factory)->factory ()->match_protocol (transport_protocol)) { TAO_AV_Acceptor *acceptor = diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index 3d7008f00c0..9b5f7b403f2 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -609,7 +609,7 @@ TAO_AV_UDP_Factory::~TAO_AV_UDP_Factory (void) int TAO_AV_UDP_Factory::match_protocol (const char *protocol_string) { - if (ACE_OS::strcasecmp (protocol_string,"UDP") == 0) + if (ACE_OS::strstr (protocol_string,"UDP") != 0) return 1; return 0; } diff --git a/TAO/orbsvcs/orbsvcs/AVStreams_Full.idl b/TAO/orbsvcs/orbsvcs/AVStreams_Full.idl deleted file mode 100644 index 2f04c91261e..00000000000 --- a/TAO/orbsvcs/orbsvcs/AVStreams_Full.idl +++ /dev/null @@ -1,252 +0,0 @@ -// $Id$ - -// IDL for Control and Management of Audio/Video Streams -// Revised Submission - -// Additional IDL for full profile -#include "AVStreams.idl" - -#pragma prefix "omg.org" - -module AVStreams_Full -{ - exception protocolNotSupported{}; - exception formatNotSupported{}; - exception formatMismatch{}; - exception FEPMismatch{}; - exception alreadyConnected{}; - exception invalidSettings{string settings;}; - exception notConnected{}; - exception deviceQosMismatch{}; - exception failedToConnect{string reason;}; - exception failedToListen{string reason;}; - - - interface FlowProducer; - interface FlowConsumer; - interface FlowEndPoint; - interface FDev; - - interface FlowConnection : PropertyService::PropertySet - { - void stop(); - void start(); - void destroy(); - - boolean modify_QoS( - - inout AVStreams::QoS new_qos) - raises (AVStreams::QoSRequestFailed); - - boolean use_flow_protocol( - in string fp_name, - in any fp_settings) - raises (AVStreams::FPError, AVStreams::notSupported); - - oneway void push_event(in AVStreams::streamEvent the_event); - - boolean connect_devs(in FDev a_party, in FDev b_party, - inout AVStreams::QoS the_qos) - raises (AVStreams::streamOpFailed, - AVStreams::streamOpDenied, - AVStreams::QoSRequestFailed); - - boolean connect( - in FlowProducer flow_producer, - in FlowConsumer flow_consumer, - inout AVStreams::QoS the_qos) - raises (formatMismatch, FEPMismatch, alreadyConnected); - - boolean disconnect(); - - // The notSupported exception is raised where - // flow cannot have multiple producers - boolean add_producer(in FlowProducer flow_producer, - inout AVStreams::QoS the_qos) - raises (alreadyConnected, AVStreams::notSupported); - - boolean add_consumer(in FlowConsumer flow_consumer, - inout AVStreams::QoS the_qos) - raises (alreadyConnected); - - boolean drop(in FlowEndPoint target) - raises (notConnected); - }; - - interface FlowEndPoint : PropertyService::PropertySet - { - boolean lock(); - void unlock(); - - void stop(); - void start(); - void destroy(); - - // Default is a nil object reference - attribute AVStreams::StreamEndPoint related_sep; - attribute FlowConnection related_flow_connection; - - FlowEndPoint get_connected_fep() - raises (notConnected, - AVStreams::notSupported); - - // syntax of fp_name is <flowProtocol> - boolean use_flow_protocol(in string fp_name, - in any fp_settings) - raises (AVStreams::FPError, AVStreams::notSupported); - - // set_format() initializes 'format' - // as current media format e.g. MPEG. - void set_format(in string format) - raises (AVStreams::notSupported); - - void set_dev_params( - in PropertyService::Properties new_settings) - raises (PropertyService::PropertyException, - AVStreams::streamOpFailed); - - void set_protocol_restriction(in AVStreams::protocolSpec - the_spec) - raises (AVStreams::notSupported); - - boolean is_fep_compatible(in FlowEndPoint fep) - raises (formatMismatch, deviceQosMismatch); - - boolean set_peer( - in FlowConnection the_fc, - - in FlowEndPoint the_peer_fep, - inout AVStreams::QoS the_qos) - raises (AVStreams::QoSRequestFailed, - AVStreams::streamOpFailed); - - boolean set_Mcast_peer( - in FlowConnection the_fc, - in AVStreams::MCastConfigIf a_mcastconfigif, - inout AVStreams::QoS the_qos) - raises (AVStreams::QoSRequestFailed); - - }; - - interface FlowProducer : FlowEndPoint - { - boolean connect_to_peer(inout AVStreams::QoS the_qos, - in string address, - - in string use_flow_protocol) // syntax <flowProtocol> - raises(failedToConnect, - AVStreams::FPError, AVStreams::QoSRequestFailed); - - string connect_mcast(inout AVStreams::QoS the_qos, - out boolean is_met, - in string address, - in string use_flow_protocol) - raises (failedToConnect, - AVStreams::notSupported, - AVStreams::FPError, - AVStreams::QoSRequestFailed); - - string get_rev_channel(in string pcol_name); - - void set_key(in AVStreams::key the_key); - void set_source_id(in long source_id); - }; - - interface FlowConsumer : FlowEndPoint - { - - - // Needs to know its peer to choose its protocol correctly - // Also to ask for a reverse channel for credit-based flow - // control, if one is required - string go_to_listen( - inout AVStreams::QoS the_qos, - in boolean is_mcast, - in FlowProducer peer, - inout string flowProtocol)// syntax <flowProtocol> - raises(failedToListen, AVStreams::FPError, - AVStreams::QoSRequestFailed); - }; - - interface FDev : PropertyService::PropertySet { - FlowProducer create_producer( - in FlowConnection the_requester, - inout AVStreams::QoS the_qos, - out boolean met_qos, - inout string named_fdev) - raises(AVStreams::streamOpFailed, - AVStreams::streamOpDenied, - AVStreams::notSupported, - AVStreams::QoSRequestFailed); - - FlowConsumer create_consumer( - in FlowConnection the_requester, - inout AVStreams::QoS the_qos, - out boolean met_qos, - inout string named_fdev) - raises(AVStreams::streamOpFailed, - AVStreams::streamOpDenied, - AVStreams::notSupported, - AVStreams::QoSRequestFailed); - - FlowConnection bind(in FDev peer_device, - inout AVStreams::QoS the_qos, - out boolean is_met) - raises (AVStreams::streamOpFailed, - AVStreams::QoSRequestFailed); - - FlowConnection bind_mcast(in FDev first_peer, - inout AVStreams::QoS the_qos, - out boolean is_met) - raises (AVStreams::streamOpFailed, - AVStreams::QoSRequestFailed); - - void destroy(in FlowEndPoint the_ep, in string fdev_name) - // ie FDev not found - raises (AVStreams::notSupported); - }; - - enum PositionOrigin { - AbsolutePosition, RelativePosition, ModuloPosition - }; - - enum PositionKey { - ByteCount, SampleCount, MediaTime - }; - - struct Position { - PositionOrigin origin; - PositionKey key; - long value; - }; - - exception PostionKeyNotSupported { PositionKey key;}; - exception InvalidPosition { PositionKey key;}; - - // MediaControl interface is similar to - // ControlledStream interface in MSS. - // It can be inherited by flow endpoints or - // FlowConnection interfaces. - interface MediaControl{ - - exception PostionKeyNotSupported { PositionKey key;}; - - Position get_media_position( - in PositionOrigin an_origin, - in PositionKey a_key) - raises (PostionKeyNotSupported); - - void set_media_position(in Position a_position) - raises (PostionKeyNotSupported, InvalidPosition); - - void start(in Position a_position) - raises(InvalidPosition); - void pause(in Position a_position) - raises(InvalidPosition); - void resume(in Position a_position) - raises(InvalidPosition); - void stop(in Position a_position) - raises(InvalidPosition); - }; -}; - diff --git a/TAO/orbsvcs/orbsvcs/Makefile.av b/TAO/orbsvcs/orbsvcs/Makefile.av index 229924327d3..481dda3d9fb 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.av +++ b/TAO/orbsvcs/orbsvcs/Makefile.av @@ -60,11 +60,6 @@ CPP_SRCS = \ AV/RTP\ AV/sfp -ifeq ($(rapi),1) - CPP_SRCS += AV/Fill_ACE_QoS\ - AV/QoS_UDP -endif # rapi - IDL_SRC = \ $(addsuffix S.cpp, $(IDL_FILES)) \ $(addsuffix C.cpp, $(IDL_FILES)) diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index 82f8d825146..86c7d3a7248 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -473,10 +473,8 @@ TAO_PropertySet::define_property (const char *property_name, if (property_name == 0) ACE_THROW (CosPropertyService::InvalidPropertyName()); - CORBA::TypeCode_var arg_tc = property_value.type (); - // Is this type allowed? - if (is_type_allowed (arg_tc.in ()) != 1) + if (is_type_allowed (property_value.type ()) != 1) ACE_THROW (CosPropertyService::UnsupportedTypeCode()); // Is this property allowed? @@ -494,9 +492,6 @@ TAO_PropertySet::define_property (const char *property_name, int ret = this->hash_table_.bind (hash_key, hash_value, entry_ptr); - - CORBA::TypeCode_var mapped_tc; - switch (ret) { case 0: @@ -508,10 +503,8 @@ TAO_PropertySet::define_property (const char *property_name, if (entry_ptr == 0) ACE_THROW (CORBA::UNKNOWN ()); - mapped_tc = entry_ptr->int_id_.pvalue_.type (); - // If type is not the same, raise exception. - if (! mapped_tc.in ()->equal (arg_tc.in ())) + if (entry_ptr->int_id_.pvalue_.type () != property_value.type ()) ACE_THROW (CosPropertyService::ConflictingProperty()); // If mode is read only, raise exception. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp index 4f1a17f3cb8..d3077c23fae 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp @@ -19,10 +19,7 @@ # include "SSLIOP_Connection_Handler.i" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (TAO_SSLIOP, - SSLIOP_Connection_Handler, - "$Id$") - +ACE_RCSID (TAO_SSLIOP, SSLIOP_Connection_Handler, "$Id$") // **************************************************************** @@ -66,27 +63,10 @@ TAO_SSLIOP_Connection_Handler::TAO_SSLIOP_Connection_Handler ( } -TAO_SSLIOP_Connection_Handler:: -~TAO_SSLIOP_Connection_Handler (void) +TAO_SSLIOP_Connection_Handler::~TAO_SSLIOP_Connection_Handler (void) { - if (this->transport () != 0) - { - // If the socket has not already been closed. - if (this->get_handle () != ACE_INVALID_HANDLE) - { - // Cannot deal with errors, and therefore they are ignored. - this->transport ()->send_buffered_messages (); - } - else - { - // Dequeue messages and delete message blocks. - this->transport ()->dequeue_all (); - } - } } - - int TAO_SSLIOP_Connection_Handler::open (void *) { @@ -220,9 +200,6 @@ TAO_SSLIOP_Connection_Handler::handle_close (ACE_HANDLE handle, // Close the handle.. if (this->get_handle () != ACE_INVALID_HANDLE) { - // Send the buffered messages first - this->transport ()->send_buffered_messages (); - // Purge the entry too this->transport ()->mark_invalid (); @@ -230,11 +207,13 @@ TAO_SSLIOP_Connection_Handler::handle_close (ACE_HANDLE handle, // a reference to it. This will eventually call // TAO_Transport::release (). this->transport (0); + + this->peer ().close (); } // Follow usual Reactor-style lifecycle semantics and commit // suicide. - this->destroy (); + delete this; } return 0; @@ -252,23 +231,20 @@ int TAO_SSLIOP_Connection_Handler::handle_timeout (const ACE_Time_Value &, const void *) { - // This method is called when buffering timer expires. - // - ACE_Time_Value *max_wait_time = 0; - - TAO_Stub *stub = 0; - int has_timeout; - this->orb_core ()->call_timeout_hook (stub, - has_timeout, - *max_wait_time); - // Cannot deal with errors, and therefore they are ignored. - this->transport ()->send_buffered_messages (max_wait_time); + if (this->transport ()->handle_output () == -1) + return -1; return 0; } int +TAO_IIOP_Connection_Handler::handle_output (ACE_HANDLE) +{ + return this->transport ()->handle_output (); +} + +int TAO_SSLIOP_Connection_Handler::add_transport_to_cache (void) { ACE_INET_Addr addr; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h index 0f2c06c261c..aaeab6f4a24 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h @@ -101,6 +101,9 @@ public: virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0); + /// Documented in ACE_Event_Handler + virtual int handle_output (ACE_HANDLE); + /// Add ourselves to Cache. int add_transport_to_cache (void); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp index ec367a37450..d69fb1b06a1 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp @@ -3,12 +3,9 @@ // $Id$ #include "SSLIOP_Transport.h" - #include "tao/debug.h" -ACE_RCSID (TAO_SSLIOP, - SSLIOP_Transport, - "$Id$") +ACE_RCSID (TAO_SSLIOP, SSLIOP_Transport, "$Id$") #include "SSLIOP_Connection_Handler.h" #include "SSLIOP_Profile.h" @@ -72,74 +69,16 @@ TAO_SSLIOP_Transport::messaging_object (void) ssize_t -TAO_SSLIOP_Transport::send_i (const ACE_Message_Block *message_block, - const ACE_Time_Value *max_wait_time, - size_t *bt) +TAO_SSLIOP_Transport::send_i (iovec *iov, int iovcnt, + size_t &bytes_transferred, + const ACE_Time_Value *max_wait_time) { - // @@ This code should be refactored into ACE.cpp or something - // similar! - - // For the most part this was copied from GIOP::send_request and - // friends. - - size_t temp; - size_t &bytes_transferred = bt == 0 ? temp : *bt; - - iovec iov[IOV_MAX]; - int iovcnt = 0; - ssize_t n = 0; - - for (const ACE_Message_Block *i = message_block; - i != 0; - i = i->cont ()) - { - // Make sure there is something to send! - if (i->length () > 0) - { - iov[iovcnt].iov_base = i->rd_ptr (); - iov[iovcnt].iov_len = i->length (); - iovcnt++; - - // The buffer is full make a OS call. @@ TODO this should - // be optimized on a per-platform basis, for instance, some - // platforms do not implement writev() there we should copy - // the data into a buffer and call send_n(). In other cases - // there may be some limits on the size of the iovec, there - // we should set IOV_MAX to that limit. - if (iovcnt == IOV_MAX) - { - if (max_wait_time == 0) - n = this->connection_handler_->peer ().sendv_n (iov, - iovcnt); - else - // @@ No timeouts!!! - n = this->connection_handler_->peer ().sendv_n (iov, - iovcnt /*, - max_wait_time */); - - if (n == 0 || - n == -1) - return n; - - bytes_transferred += n; - iovcnt = 0; - } - } - } - - // Check for remaining buffers to be sent! - if (iovcnt != 0) - { - n = this->connection_handler_->peer ().sendv_n (iov, - iovcnt); - if (n == 0 || - n == -1) - return n; - - bytes_transferred += n; - } + ssize_t retval = this->connection_handler_->peer ().send (iov, iovcnt, + max_wait_time); + if (retval > 0) + bytes_transferred = retval; - return bytes_transferred; + return retval; } ssize_t @@ -191,6 +130,21 @@ TAO_SSLIOP_Transport::read_process_message (ACE_Time_Value *max_wait_time, int TAO_SSLIOP_Transport::register_handler_i (void) { + if (TAO_debug_level > 4) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - IIOP_Transport::register_handler %d\n", + this->id ())); + } + if (this->connection_handler_->is_registered ()) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - IIOP_Transport::register_handler %d" + ", already registered\n", + this->id ())); + return 0; + } + // @@ It seems like this method should go away, the right reactor is // picked at object creation time. ACE_Reactor *r = this->orb_core_->reactor (); @@ -244,7 +198,7 @@ TAO_SSLIOP_Transport::send_message (TAO_OutputCDR &stream, // versions seem to need it though. Leaving it costs little. // This guarantees to send all data (bytes) or return an error. - ssize_t n = this->send_or_buffer (stub, + ssize_t n = this->send_message_i (stub, twoway, stream.begin (), max_wait_time); @@ -260,17 +214,6 @@ TAO_SSLIOP_Transport::send_message (TAO_OutputCDR &stream, return -1; } - // EOF. - if (n == 0) - { - if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO: (%P|%t|%N|%l) send_message () \n") - ACE_TEXT ("EOF, closing transport %d\n"), - this->id ())); - return -1; - } - return 1; } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h index 8d82a45c26f..e3c631aa4b1 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h @@ -83,9 +83,9 @@ protected: virtual TAO_Pluggable_Messaging *messaging_object (void); /// Write the complete Message_Block chain to the connection. - virtual ssize_t send_i (const ACE_Message_Block *mblk, - const ACE_Time_Value *s = 0, - size_t *bytes_transferred = 0); + virtual ssize_t send_i (iovec *iov, int iovcnt, + size_t &bytes_transferred, + const ACE_Time_Value *timeout = 0); /// Read len bytes from into buf. virtual ssize_t recv_i (char *buf, diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile index 69a7c15276d..f1088e62b59 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile @@ -10,9 +10,6 @@ #---------------------------------------------------------------------------- LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO -ifeq ($(rapi),1) - LDLIBS += -lACE_QoS -endif # rapi SENDER_OBJS = Connection_Manager.o \ sender.o diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/input b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/input index 3a38e42d893..77483aa8712 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/input +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/input @@ -1,9047 +1,1376 @@ -Wed Apr 11 20:36:36 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * examples/Synch/proc_sema.cpp (main): Fixd an assigning string - literal to char* warning. - -Wed Apr 11 18:04:33 2001 Steve Huston <shuston@riverace.com> - - * include/makeinclude/rules.bin.GNU: Change the Visual Age C++ - incremental build command to use vacbld_r, the thread-enabled - variant of vacbld. - -Wed Apr 11 11:00:50 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ACE-INSTALL.html: Added a section illustrating how to build - ACE+TAO for RTEMS. Thanks to Joel Sherrill <joel@OARcorp.com> - for this build procedure. - -Wed Apr 11 11:38:37 2001 Steve Huston <shuston@riverace.com> - - * ace/IOStream.h: Reverted change from - Tue Apr 10 18:35:22 2001 Steve Huston <shuston@riverace.com> - and replaced it with a section that sets ACE_LACKS_ACE_IOSTREAM - if ACE_HAS_STANDARD_CPP_LIBRARY is set and ACE_USES_OLD_IOSTREAMS - is not. This restriction is noted and tracked in Bugzilla # 857. - - * ace/IOStream.cpp: - * tests/IOStream_Test.cpp: Reverted change from - Tue Apr 10 18:35:22 2001 Steve Huston <shuston@riverace.com> - -Wed Apr 11 09:44:32 2001 Chad Elliott <elliott_c@ociweb.com> - - * examples/Misc/test_trace.cpp: - - Fixed a strange compiler error with Tornado II. - My_Task::recursive was inline which caused an internal compiler - error. - -Wed Apr 11 08:04:21 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * include/makeinclude/platform_linux.GNU: By default, we build - ACE+TAO with exceptions enabled on Linux. Thanks to Craig - Rodrigues <crodrigu@bbn.com> for motivating this change. - - * ace/SString.i (operator+): Fixed an "inlined before use" warning. - Thanks to Bala for reporting this. - -Tue Apr 10 16:58:54 2001 Ossama Othman <ossama@uci.edu> - - * ace/OS.h (ACE_DEFAULT_FILE_PERMS, ACE_DEFAULT_DIR_PERMS): - - Changed the default values on UNIX from 0666 and 0777 to 0644 - and 0755, i.e. removed global write permissions. This addresses - some security issues. Now, only the owner has write permissions - by default. - -Tue Apr 10 18:35:22 2001 Steve Huston <shuston@riverace.com> - - * include/makeinclude/platform_sunos5_sunc++.GNU: Added a new - build option, stdcpplib, which defaults to 1. If set to 1, - Sun Workshop 5 and Forte 6 compilers will use the standard - C++ library, including standard iostreams. Set to 0 to - use the old, classic iostreams. - - * include/makeinclude/platform_hpux_aCC.GNU: Added support for - the stdcpplib build option. It defaults to 1 if using aC++ - x.27, or 0 if not. Thanks very much to Istvan Buki <ibuki@fedex.com> - for these changes. - - * ace/config-aix-4.x.h: For Visual Age C++ 5, turn on - ACE_HAS_STANDARD_CPP_LIBRARY and - ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB. - - * ace/config-sunos5.5.h: For Sun Workshop 5 and Forte 6 compilers, - take the ACE_USES_OLD_IOSTREAMS setting from the platform_macros.GNU - file; don't set it here. - - * ace/config-hpux-11.00.h: - * ace/config-hpux-10.x-hpc++.h: If the stdcpplib=1 option was used, - then turn on ACE_HAS_STANDARD_CPP_LIB and - ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB. Else turn on - ACE_USES_OLD_IOSTREAMS. - - * ace/IOStream.{h cpp}: Only try to build this stuff if - ACE_LACKS_ACE_IOSTREAM is not defined and ACE_USES_OLD_IOSTREAMS - _is_ defined. The check on ACE_USES_OLD_IOSTREAMS can be removed - when ACE_IOStream gets ported to standard iostreams. - - * tests/IOStream_Test.cpp: Only try this if ACE_USES_OLD_IOSTREAMS - is defined. Remove this if/when ACE_IOStream is ported to new - iostreams. - -Tue Apr 10 17:51:25 2001 Pradeep Gore <pradeep@cs.wustl.edu> - - * bin/auto_run_tests.lst: - Added TAO/tests/OctetSeq/run_test1{2}.pl to auto testing. - -Tue Apr 10 16:33:42 2001 Joe Hoffert <joeh@cs.wustl.edu> - - * ace/CDR_Stream.i: - * ace/CDR_Stream.cpp: - Added sanity checks for sizes of strings and arrays. - -Tue Apr 10 15:14:52 2001 Chad Elliott <elliott_c@ociweb.com> - - * include/makeinclude/platform_vxworks5.x_g++.GNU: - - Added missing else/endif from previous support addition. - -Tue Apr 10 11:48:51 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * include/makeinclude/platform_vxworks5.x_g++.GNU: Added support - for the M68k line of CPUs. Thanks to Albert Pariante - <albert@sw.bev.etn.com> for reporting this. - -Tue Apr 10 02:14:55 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * bin/PerlACE/Run_Test.pm (check_n_cleanup_files): Added a new - PerlACE function that checks for unwanted files and spits out a - warning before removing the file. It makes sure that we not - only clean up resource leaks but also notice their existence. - - * tests/run_test.pl (delete_temp_files): Used the new - <check_n_cleanup_files> to remove the temp files for - MEM_Stream_Test, if there are any. - -Tue Apr 10 1:44:02 2001 Yamuna Krishnamurthy <yamuna@ace.cs.wustl.edu> - - * examples/QOS/Change_Sender_TSpec/receiver.cpp: - * examples/QOS/Change_Sender_TSpec/receiver.dsp: - * examples/QOS/Change_Sender_TSpec/sender.cpp: - * examples/QOS/Change_Sender_TSpec/sender.dsp: - * examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h: - * examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp: - * examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h: - * examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp: - * examples/QOS/Change_Sender_TSpec/QoS_Util.h: - * examples/QOS/Change_Sender_TSpec/QoS_Util.cpp: - * examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.h: - * examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.cpp: - * examples/QOS/Change_Sender_TSpec/FlowSpec_Dbase.h: - * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h: - * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp: - * examples/QOS/Change_Sender_TSpec/README: - * examples/QOS/Change_Sender_TSpec/Makefile: - - Added a test to dynamically change the Sender flow spec in - order to continuously change the PATH messages. - - * examples/QOS/Change_Receiver_FlowSpec/receiver.cpp: - * examples/QOS/Change_Receiver_FlowSpec/receiver.dsp: - * examples/QOS/Change_Receiver_FlowSpec/sender.cpp: - * examples/QOS/Change_Receiver_FlowSpec/sender.dsp: - * examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h: - * examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp: - * examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h: - * examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp: - * examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h: - * examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp: - * examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.h: - * examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.cpp: - * examples/QOS/Change_Receiver_FlowSpec/FlowSpec_Dbase.h: - * examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h: - * examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp: - * examples/QOS/Change_Receiver_FlowSpec/README: - * examples/QOS/Change_Receiver_FlowSpec/Makefile: - - Added a test to dynamically change the Receiver flow spec in - order to continuously change the RESV messages. - - * examples/QOS/Simple/receiver.cpp: - * examples/QOS/Simple/receiver.dsp: - * examples/QOS/Simple/sender.cpp: - * examples/QOS/Simple/sender.dsp: - * examples/QOS/Simple/Sender_QoS_Event_Handler.h: - * examples/QOS/Simple/Sender_QoS_Event_Handler.cpp: - * examples/QOS/Simple/Receiver_QoS_Event_Handler.h: - * examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp: - * examples/QOS/Simple/QoS_Util.h: - * examples/QOS/Simple/QoS_Util.cpp: - * examples/QOS/Simple/QoS_Signal_Handler.h: - * examples/QOS/Simple/QoS_Signal_Handler.cpp: - * examples/QOS/Simple/FlowSpec_Dbase.h: - * examples/QOS/Simple/Fill_ACE_QoS.h: - * examples/QOS/Simple/Fill_ACE_QoS.cpp: - * examples/QOS/Simple/README: - * examples/QOS/Simple/Makefile: - - Moved the original QOS example to Simple. - - * examples/QOS/Makefile: - * examples/QOS/QOS.dsw: - - Updated the Makefile to compile the constituent tests. - -Mon Apr 9 18:48:02 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * include/makeinclude/Makefile.rtems: Zapped - - export RTEMS_MAKEFILE_PATH=/opt/rtems/sparc-rtems/erc32/ - - so that the environment variable is obtained from the users - environment. Thanks to Joel Sherrill <joel@OARcorp.com> for - this fix. - - * ace/Log_Msg.h: Only define the ACE_ASSERT macro if it's not - already defined. This make it easy for developers to override - this macro in their config.h file. Thanks to Nathalie D'Amours - <nathalie@stentor.com> for motivating this change. - -Mon Apr 9 15:36:04 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/High_Res_Timer.cpp: - Use the 'cpu MHz' line from /proc/cpuinfo in favor of the - 'bogomips' line, because the latter gives the wrong number on - multi-CPU boxes. - -Mon Apr 9 14:37:30 2001 Chad Elliott <elliott_c@ociweb.com> - - * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp: - - Removed extraneous template instantiations. - -Mon Apr 09 09:19:37 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/SString.cpp: - Fixed Fuzz error - -Mon Apr 9 08:28:47 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/SString.{h,i,cpp}: Added improved support for ACE_WString: - . The magic number 32 has been changed to ACE_DEFAULT_GROWSIZE. - . ACE_WString only allocates memory when it is needed. - . The grow strategy can be modified by setting the ACE_GROW_LINEAR define. - the string does not double the memory then, but increases the memory by - ACE_DEFAULT_GROWSIZE. - Thanks to Eric Zuur <Eric.Zuur@meco.nl> for contributing these - enhancements. - - * ace/High_Res_Timer.cpp (get_cpuinfo): Added support for the Pentium - III and IV. Thanks to Stephane Pion - <PION_Stephane@stna.dgac.fr> for contributing this fix. - -Mon Apr 9 07:50:08 2001 Chad Elliott <elliott_c@ociweb.com> - - * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp: - * examples/IPC_SAP/SOCK_SAP/Makefile: - Fixed a typo in the Makefile and added "CPP-inclient.h" include to - CPP-memclient.cpp. - -Mon Apr 9 07:42:29 2001 Chad Elliott <elliott_c@ociweb.com> - - * ace/Basic_Types.cpp: - Changed format flags from ios::fmtflags to unsigned long. - This typedef is not supported by all platforms. Thanks Carlos - <coryan@uci.edu> for suggesting this change. - -Mon Apr 09 08:08:11 2001 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Timer_Queue_T.h - Declared private copy constructor and assignment operator - for class ACE_Event_Handler_Handle_Timeout_Upcall - -Sun Apr 08 18:55:58 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/DLL_Test.cpp: - Use ACE::ldname() instead of keeping a local function to - decorate the name. - Use the "d" suffix only on MSVC debug builds. - - * tests/Makefile.bor: - * tests/DLL_Test.bor: - New Borland Makefile for the shared library in DLL_Test. Thanks - to Christopher Kohlhoff <chris@kohlhoff.com> for providing the - patches. - - * tests/run_test.pl: - Add ExeSubDir to the path, required in Borland builds to find - the shared libraries created locally. - -Sun Apr 8 13:12:54 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/SString.cpp: Reordered various constructor initializers so - G++ doesn't complain. Thanks to Bala for reporting this. - - * ace/SString.{h,i,cpp}: Added various optimizations to ACE_WString - so it will perform certain operations as efficiently as - ACE_CString. Thanks to Eric Zuur <Eric.Zuur@meco.nl> for - contributing these enhancements. - -Sun Apr 08 12:10:30 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp: - * examples/IPC_SAP/SOCK_SAP/Makefile: Updated obsolete - shared-memory transport functions. - -Sun Apr 8 09:49:26 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * bin: Added a new shell script called "make-components" that enables - each ACE component to be built in a simple manner using the - following change from Arturo. - - * ace/Makefile: Generalized the libACE.a and libACE.$(SOEXT) targets - to simplify subsettings. Thanks to Arturo Montes - <mitosys@colomsat.net.co> for reporting this. - -Sat Apr 7 16:00:48 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * tests: Added a new rtems_init.c file. Thanks to Joel Sherrill - <joel@OARcorp.com> for contributing this port. - - * include/makeinclude: Added the new platform_rtems.x_g++.GNU file. - * ace: Added the new config-rtems.h file. - - * ace/OS.cpp: Added support for RTEMS, which is an open-source - real-time operating system that can be downloaded from - ftp://ftp.oarcorp.com/pub/rtems. Thanks to Joel Sherrill - <joel@OARcorp.com> for contributing this port. - - * ace/OS.cpp: The return type for ACE_OS::readv_emulation() - should have been ssize_t, not int, to be consistent with its - definition in the header file. Thanks to Joel Sherrill - <joel@OARcorp.com> for reporting this. - -Sat Apr 7 21:16:49 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - Add the new Crash_On_Write and MT_Timeout tests to the nightly - builds. - -Fri Apr 6 21:02:05 2001 Carlos O'Ryan <coryan@uci.edu> - - * examples/Synch/proc_sema.cpp: - Add missing #include for "ace/Log_Msg.h", on platforms that - define ACE_TEMPLATES_REQUIRE_SOURCE this include is magically - obtained, but this is not the case for SunCC 4.2, and - True64/CXX. - -Fri Apr 06 16:22:24 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/SString.h (ACE_Tokenizer): Updated documentation and added - some examples. Thanks to Jody Hagins <jody@atdesk.com> for - providing the original example. - -Fri Apr 6 17:11:34 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * bin/auto_run_tests.lst: Added the Single_Read test to the - nightly build list. - -Fri Apr 6 14:45:52 2001 Chad Elliott <elliott_c@ociweb.com> - - * ace/Basic_Types.h: - * ace/Basic_Types.cpp: - Changed the as_string() method to avoid using floor() which - required math.h and ACE_CString which caused unnecessary coupling. - -Fri Apr 6 08:34:15 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/make_pretty.pl: - Do no give out warnings for the 'nocompatwarnings' option in - HP-UX. - -Fri Apr 6 08:23:02 2001 Chad Elliott <elliott_c@ociweb.com> - - * ace/Basic_Types.cpp: - * ace/Basic_Types.h: - * tests/Process_Strategy_Test.cpp: - * examples/Connection/misc/Connection_Handler.cpp: - Remove build warnings for platforms that don't support unsigned - long long types and have unsigned char's. - -Fri Apr 6 02:02:01 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/OS.h: - * ace/OS.i: The implementation for process semaphore on platforms - lacking named POSIX semaphores was broken. On these platforms, - semaphores are allocated in MMAP file so they should never be - deleted. Added a flag <new_sema_> to remember if a semaphore - can be deleted (USYNC_THREAD) or not (USYNC_PROCESS). - - * ace/config-sunos5.6.h: According to the man pages, SunOS started - supporting POSIX semaphores from 5.6. Defined ACE_HAS_POSIX_SEM - and ACE_LACKS_NAMED_POSIX_SEM. - -Thu Apr 5 11:23:05 2001 Carlos O'Ryan <coryan@uci.edu> - - * html/index.html: - Add link to the new QoS library documentation. - -Thu Apr 05 03:26:13 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * examples/Makefile: - * examples/Synch/Makefile: - * examples/Synch/README: - * examples/Synch/Synch.dsw: - * examples/Synch/proc_sema.cpp: - * examples/Synch/proc_sema.dsp: Added a new example to play with - process semaphores. - -Thu Apr 05 02:48:51 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/MEM_IO.cpp (write): My earlier change was causing the test - to crash. - - * ace/MEM_Stream.h: - * ace/MEM_Stream.i: - * ace/MEM_Stream.cpp: Added a new method to inform the stream to - clean up its resources when closing down. - - * tests/MEM_Stream_Test.cpp (handle_close): Handle_close should - only inform it's peer to destroy the mmap file instead of - removing the file itself. - -Wed Apr 4 16:21:13 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/auto_run_tests.lst: - - Added the ImplRepo tests. - -Wed Apr 4 12:13:52 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/MEM_IO.h: Declared ACE_INLINE_FOR_GNUC for - ACE_MT_MEM_IO::Simple_Queue's constructor to eliminate a bogus - warning reported by vxworks' gcc compiler. - -Wed Apr 04 07:47:48 2001 Craig Rodrigues <crodrigu@bbn.com> - - * etc/ace_qos.doxygen: - * bin/generate_doxygen.pl: - Generate doxygen documentation for ACE QoS API - -Tue Apr 03 19:55:26 2001 Steve Huston <shuston@riverace.com> - - * bin/auto_compile: Added a -make_type option - the argument to - the option is the suffix of Makefile to use. Example: - -make_type vac would use Makefile.vac instead of Makefile - when building. - - * bin/make_pretty.pl: Corrected tests for AIX errors/warnings. - - * ace/ace.icp: (new) Visual Age C++ 5 project file for libACE. - - * ace/ace.icc: (new) Visual Age C++ 5 configuration file for - libACE. Replaces ace-dll.icc. It will eventually have the - stuff added to make debug/optimize as well as subsets. - - * ace/ace_vacpp_options.icc: Visual Age C++ file for setting ACE - build options. - - * ace/Makefile.vac: Makefile to build libACE using the Visual - Age C++ 5 incremental compiler. It only has "all" and "realclean" - targets, and uses vacbld_r to do the build. - - * tests/tests.icp: Visual Age C++ 5 Project file for making all the - tests. - - * tests/Makefile.vac: Makefile to drive vacbld_r for Visual Age C++. - - * tests/Config_Test.icc: - * tests/Dirent_Test.icc: - * tests/Logging_Strategy_Test.icc: - * tests/MEM_Stream_Test.icc: - * tests/Message_Queue_Test_Ex.icc: - * tests/OS_Test.icc: - New files for building tests with Visual Age C++. - - * tests/libDLL_Test.icc: Changed to use up-to-date source file. - -Tue Apr 03 13:45:02 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/MEM_IO.cpp: Fixed mismatched ACE_TRACE messages. Thanks to - the all mighty fuzzmasterd for reporting this. - -Tue Apr 3 11:40:42 2001 Priyanka Gontla <pgontla@ece.uci.edu> - - * examples/IPC_SAP/SSL_SAP/dummy.pem: - * examples/IPC_SAP/SSL_SAP/key.pem: - The previous certificates expired. So, generated them - again. - -Tue Apr 03 09:30:10 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/MEM_IO.cpp (write): Fixed a compilation error for Borland - compiler. Thanks to Johnny Willensen for reporting this. - -Mon Apr 02 23:41:34 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/MEM_SAP.cpp: - * ace/MEM_SAP.h: - * ace/MEM_SAP.i: - Generalized the ACE_MEM_SAP class to allocate memory in the new - memory wrapper class ACE_MEM_SAP_Node. - - * ace/MEM_IO.cpp: - * ace/MEM_IO.h: - * ace/MEM_IO.i: - Separated the different signaling mechanisms into a different - class in ACE_MEM_IO so it can determine the "right" signaling - strategy allowed. Currently, we implement the Reactive strategy - (ACE_Reactive_MEM_IO) which uses sockets for signaling and - multithreaded strategy (ACE_MT_MEM_IO) which uses semaphores for - signaling. - - * ace/MEM_Stream.cpp: - Sending an empty buffer over to wake up the "other" end when we - are closing down. - - * ace/MEM_Acceptor.cpp: - * ace/MEM_Acceptor.h: - * ace/MEM_Acceptor.i: - * ace/MEM_Connector.cpp: - * ace/MEM_Connector.h: - * ace/MEM_Connector.i: Added facility to specify the "preferred" - signaling strategy so the acceptor and connector can negociate - and agree on the best signaling mechanism to use. - - * ace/MEM_Stream_Test.h: - * ace/MEM_Stream_Test.cpp: - Added the test for the new MT signaling MEM_Stream transfer. - This part of the test seems to be failing on system that depends - on SysV semaphores (because we need more semaphore than the - system can provide.) - -Mon Apr 2 15:17:13 2001 Chad Elliott <elliott_c@ociweb.com> - - * ace/config-chorus.h: - - Chorus 4.x supports unsigned long long's. - -Mon Apr 2 14:23:31 2001 Craig Rodrigues <crodrigu@bbn.com> - - * ace/Makefile: - only build QoS directory under UNIX if rapi is installed - * ace/QoS/README: - add installation instructions and GQOS/RAPI information - -Mon Apr 2 09:57:31 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/PerlACE/MSProject.pm: - - Made a change to the tao_idl depencency checking. - It was only checking for tao_idl and $(InputName) where - some places we use $(InputPath) instead. - - * ace/config-win32-msvc-5.h: - * ace/config-win32-msvc-6.h: - - Disabled the Inheritance by Dominance informational - warning that MSVC gives. We have cases of this all over - the place, and normally we just disable the warning on - a file by file basis, but now we just do a blanket disable. - -Mon Apr 2 08:45:24 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/nightlybuilds/builds.lst: - Renamed the Debian_Full_WU build, its most important feature is - not that it is at WashU nor that it enables most components. It - is the fact that interceptors are disabled on its configuration. - -Sun Apr 1 17:20:22 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/INET_Addr.h: - - Added /**/ around for the inclusion of inetLib.h, since some - MS compilers pick this up in dependency generation. - - * bin/PerlACE/MSProject.pm: - - Used \Q\E around the library names when matching, otherwise - the backslashes were interpreted as escaping, and weird - unicode errors popped up. - - * bin/pippen.pl: - - Pippen was being case sensitive, so tao.lib was different - than TAO.lib. Changes to store only lowercase. - -Sat Mar 31 10:16:01 2001 Carlos O'Ryan <coryan@uci.edu> - - * ACE-INSTALL.html: - Removed broken link, the web page does not exist anymore. Thanks - to John R. Ashmun <john.ashmun@esca.com> for pointing this out. - This fixes [BUGID:833] - -Fri Mar 30 14:08:18 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * performance-tests/TTCP/C/new-ttcp.cpp: - * performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp: - Zapped the gettimeofday() method since it didn't seem to be - used. Also, #include "ace/Log_Msg.h". Thanks to Thomas Groth - <groth.th@nord-com.net> for reporting this. - - * ace/OS.h: Changed all the ACE_DEFAULT_* default ports of the - various services to start with 200xx rather than 100xx to avoid - conflicts on AIX, which apparently hijacks port 10002 for - various things. Thanks to David Sperry - <sperryd@res.raytheon.com> for reporting this. - -Sat Mar 31 02:06:09 2001 Christopher Kohlhoff <chris@kohlhoff.com> - - * ace/config-win32-borland.h: - * include/makeinclude/ace_flags.bor: - Fixed up use of inline functions in DEBUG build. - - * include/makeinclude/ace_flags.bor: - Added macros for the TAO_BiDirGIOP and TAO_TypeCodeFactory - libraries. - -Fri Mar 30 11:17:39 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/fuzz.pl: - Add a couple of TODO entries - - * html/index.html: - Add the Audio/Video Streaming service to the index file. - -Fri Mar 30 11:12:53 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/*/Makefile: - * apps/*/Makefile: - * docs/*/Makefile: - * examples/*/Makefile: - * netsvcs/*/Makefile: - * performance-tests/*/Makefile: - * tests/*/Makefile: - * websvcs/*/Makefile: - * ASNMP/*/Makefile: - Regenerate dependencies. - -Fri Mar 30 08:15:26 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/QoS/QoS_Session.h: - Add #include for ACE_QoS_Export - -Fri Mar 30 07:31:54 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/QoS/QoS_Session.h: - Fixed export macro - -Thu Mar 29 20:14:00 2001 Craig Rodrigues <crodrigu@bbn.com> - - * ace/SOCK.h: - Remove include of QoS_Session.h, since it is not used here. - -Thu Mar 29 19:48:00 2001 Craig Rodrigues <crodrigu@bbn.com> - - * ace/QoS_Session.h: - * ace/QoS/QoS_Manager.h: - * ace/QoS/QoS_Session_Impl.h: - * ace/QoS/QoS_Session_Factory.h: - * examples/QOS/QoS_Signal_Handler.h: - * examples/QOS/Receiver_QoS_Event_Handler.h: - * examples/QOS/client.cpp: - * examples/QOS/QoS_Util.h: - * examples/QOS/Sender_QoS_Event_Handler.h: - * examples/QOS/server.cpp: - * examples/QOS/Makefile: - - Move QoS_Session.h to the ace/QoS directory. - -Thu Mar 29 19:12:38 2001 Steve Huston <shuston@riverace.com> - - * include/makeinclude/rules.lib.GNU: AIX-specific changes to - build shared libraries by making a shared shr.o file and putting - that into an archive. Seems weird, but that's the way AIX does - things. This makes ACE consistent with other AIX software. - - * include/makeinclude/platform_aix4_cset++.GNU: Made some changes - to attempt to work with the new scheme for shared lib creation on - AIX. Did not test it, and don't plan to. The CSet++ compiler is not - supported by IBM any longer, and Riverace is not supporting ACE - with it. If someone out there sends patches for this, I'll put - them in, but this file is going away after ACE 5.2 is released. - All uses of IBM-supported compilers (IBM C/C++ and Visual Age C++ - in batch mode) should be with the platform_aix_ibm.GNU file. - -Thu Mar 29 16:16:07 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/Token.cpp (renew): A conditional expression used an && rather - and ||, which was causing problems with ACE_Token. Thanks to - Carsten Madsen <com@navicon.dk> for reporting this. - - * ace/Message_Queue_T.cpp: If any of the various ACE_Message_Queue_Ex - enqueue*() methods fail then make sure to release the message - blocks! Thanks to Boris Kolpackov <bosk@ipmce.ru> for reporting - this. - -Wed Mar 28 21:39:26 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/NT_Service.h: - - Changed the ACE_NT_SERVICE macros to use ACE_TEXT_* API - calls for those that can take in unicode strings. - - * examples/NT_Service/main.cpp: - - Fixed use of ACE_NT_SERVICE to work with ACE_USES_WCHAR. - - * examples/OS/Process/process.cpp: - * examples/Reactor/WFMO_Reactor/test_directory_changes.cpp: - - Changed some Win32 API calls to use ACE_TEXT_* equivalents. - - * ace/ace_wchar.h: - - Added all the ACE_TEXT_* API macros needed above. - - Thanks to Nick Pratt <npratt@microstrategy.com> for - reporting the first of these errors. - -Wed Mar 28 22:07:03 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * tests/tests.dsw: Fixed project dependencies between DLL_Test and - DLL_Test_Impl. Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> - for reporting this. - -Wed Mar 28 20:33:28 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/ACE.cpp: Further improved the implementation of - handle_ready() by simply calling poll() with the timeout - pointer. Thanks to Przemyslaw Marciniak <pmarciniak@lucent.com> - for reporting this. - -Wed Mar 28 17:45:22 2001 Steve Huston <shuston@riverace.com> - - * bin/make_pretty.pl: Adjust the error detector for IBM C/C++ 3.6.6. - - * ace/Containers_T.cpp: Add #include "ace/Log_Msg.h" so IBM C/C++ - can see ACE_DEBUG when compiling template instantiations. - -Wed Mar 28 16:40:24 2001 Luther Baker <luther@cs.wustl.edu> - - * ace/config-all.h - - Removed ACE_WIN32 support for ACE_HAS_POSIX_SEM just because - ACE_HAS_PACE. This can be defined for ACE_WIN32 after we - write more WIN32 emulation. - - * ace/OS.h - * ace/OS.i - * ace/OS.cpp - - PACE updates. - -Wed Mar 28 11:37:09 2001 Fuzz Master D <brunsch@uci.edu> - - * bin/fuzz.pl: - - There are several instances where fuzz gives false - positives, and the code is impossible to fix without - creating compiler warnings. Example: - - void function (CORBA::Environment &ACE_TRY_ENV) - { - #if FOO - some_other_function (ACE_TRY_ENV); - ACE_CHECK; - #else - ACE_UNUSED_ARG (ACE_TRY_ENV); - #endif - } - - So normally ACE_UNUSED_ARG errors can be fixed by keeping - the CORBA::ENvironment unnamed and removing the ACE_UNUSED_ARG, - but in this case it isn't possible. So fuzz now accepts - an ignore command for single line use. The above can be fixed - by changing to: - - void function (CORBA::Environment &ACE_TRY_ENV) - { - #if FOO - some_other_function (ACE_TRY_ENV); - ACE_CHECK; - #else - ACE_UNUSED_ARG (ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check - #endif - } - -Tue Mar 28 13:03:07 2001 Chad Elliott <elliott_c@ociweb.com> - - * bin/make_pretty.pl: - Modification to recognize HP's future errors as warnings. - -Wed Mar 28 11:34:54 2001 Frank Hunleth <fhunleth@cs.wustl.edu> - - * ace/CDR_Base.inl: - Removed memset in ACE_CDR::mb_align when ACE_HAS_PURIFY == - 1, since it was causing some TAO unit tests to break (in - particular, the Portable_Interceptors/Service_Context_Manipulation - test). After running Cubit and a few other tests, Purify didn't - notice any more uninitialized memory accesses. Fixes bug #828. - -Wed Mar 28 11:55:39 2001 Steve Huston <shuston@riverace.com> - - * include/makeinclude/platform_aix_ibm.GNU: New file, replaces - platform_aix_vacpp.GNU for Visual Age C++ 5. Also replaces - use of platform_aix4_cset++.GNU for IBM C/C++ Compilers 3.6.6. - So, for the supported, IBM-supplied compilers (IBM C/C++ 3.6.6 - and Visual Age C++ 5) use this file. If you want to try to keep - using CSet++ 3.4 or earlier, you can keep using - platform_aix4_cset++.GNU, but it's not tested any longer and - will disappear at the next ACE version. If you want to use - Visual Age C++ 4, you should reconsider, and upgrade to version 5. - - * include/makeinclude/platform_aix_vacpp.GNU: Deleted. - - * netsvcs/lib/TS_Clerk_Handler.h: Moved #include "ace/Connector.h" - to be after #include "ace/SOCK_Connector.h" to fix compile error - on AIX, Visual Age C++ 5. - - * ace/config-aix-4.x.h: Clarified comments that this file is for - Visual Age C++ also. Added ACE_DLL_SUFFIX ".a" to match what - is now generated from platform_aix_ibm.GNU. - - * bin/auto_compile: - * bin/make_pretty.pl: Add detection of compile/link warnings and - errors for AIX using the IBM compilers' code. Ignores the multiply - defined symbol warnings from ld if it's an ACE symbol. - - * docs/ACE-development-process.html: Changed to link to Bugzilla so - it works from anywhere. - -Wed Mar 28 10:13:16 2001 Steve Huston <shuston@riverace.com> - - * ace/Makefile.bor: Don't try to build the SSL directory if - SSL_ROOT is not set. - -Wed Mar 28 08:39:26 2001 Carlos O'Ryan <coryan@uci.edu> - - * etc/tao_av.doxygen: - New configuration file for the AV streaming service. Many - thanks to Craig Rodrigues <crodrigu@bbn.com> for converting that - directory. - - * bin/generate_doxygen.pl: - Add the new configuration file. - -Tue Mar 27 19:54:11 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - Disable POA/On_Demand_Loading and POA/Loader for Linux/KCC - builds, because that compiler has problems with destructors - after dynamic loading. - Also add the new Hello test to the nightly regression tests. - -Tue Mar 27 19:43:39 2001 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/platform_linux.GNU: - Add support for Insure++ - - * include/makeinclude/rules.local.GNU: - Add new macro to let developers change the default destination - for the dependencies. - - * include/makeinclude/wrapper_macros.GNU: - Let the user override the default VDIR directory, and define the - default values for the IDL generated code extensions. - - Thanks to Jody Hagins <jody@atdesk.com> for all these - improvements. - -Tue Mar 27 19:15:36 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Unbounded_Queue.h: - Add required #include for Chorus builds. - -Tue Mar 27 15:28:56 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/ACE.cpp (handle_ready): Don't try to dereference through - a NULL timeout pointer! Thanks to Przemyslaw Marciniak - <pmarciniak@lucent.com> for reporting this. - -Tue Mar 27 10:08:44 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Select_Reactor_Base.h: - Add missing #include for builds that define - ACE_HAS_REACTOR_NOTIFICATION_QUEUE. - -Tue Mar 27 05:35:38 2001 Christopher Kohlhoff <chris@kohlhoff.com> - - * include/makeinclude/make_flags.bor: - Prevent PASCAL build by default with BCB5 since it is not required. - Since both VCL and non-VCL applications share a common run-time - library you can simply link your VCL code with a non-PASCAL build - of the ACE+TAO libraries. This behaviour can be overridden by - defining the FORCE_PASCAL flag. - - * include/makeinclude/build_core_exe.bor: - * include/makeinclude/build_core_library.bor: - * include/makeinclude/build_dll.bor: - * include/makeinclude/build_exe.bor: - * include/makeinclude/build_lib.bor: - * include/makeinclude/clean.bor: - Build all executables into a directory below the source directory. - Core executables are then copied to the common bin directory. This - is to allow the test scripts to assume all executables can be - found relative to the source directory. - - * include/makeinclude/recurse.bor: - Removed definition of OBJFILES since Borland make doesn't seem to - support recursive macro expansion. - - * ace/config-win32-borland.h: - * include/makeinclude/ace_flags.bor: - Always explicitly define __ACE_INLINE__, with it defaulting to 1. - This change will allow the same compiler flags to be used in user - applications regardless of whether a debug or non-debug build of - ACE is being used. - -Tue Mar 27 09:48:33 2001 Johnny Willemsen <jwillemsen@remedy.nl> - - * include/makeinclude/ace_flags.bor - Corrected the smartproxies_cflags - - * examples/IPC_SAP - Added new BCB makefiles for these examples - - * ace/Timer_Hash_T.cpp - * ace/Timer_Hash_T.h - * ace/Timer_Heap_T.cpp - * ace/Timer_Heap_T.h - * ace/Timer_List_T.cpp - * ace/Timer_List_T.h - * ace/Timer_Wheel_T.cpp - * ace/Timer_Wheel_T.h - Made the isdone method on the iterator classes constant - - * ace/Timer_Queue_T.h - * ace/Timer_Queue_T.i - Several get methods are now const - Argument of set_timer_value and set_interval is now passed by const reference - - * ace/Unbounded_Set.h - * ace/Unbounded_Set.cpp - * tests/Collection_Test.cpp - Added the ACE_Unbounded_Set_Const_Iterator which can be used - to iterate over an const set - -Mon Mar 26 21:02:24 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/Log_Msg_NT_Event_Log.cpp: - - Fixed a compilation problem with RegSetValueEx when - ACE_USES_WCHAR and UNICODE were defined. Thanks to Nick - Pratt <npratt@microstrategy.com> for reporting this. - - * ace/ace_dll.dsp: - - Unchecked the "separate types" option for debug linking. - Thanks to Nick Pratt for this suggestion also. - -Mon Mar 26 13:00:37 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Node.h: - * ace/Node.cpp: - * ace/Array_Base.h: - * ace/Array_Base.inl: - * ace/Array_Base.cpp: - * ace/Unbounded_Queue.h: - * ace/Unbounded_Queue.inl: - * ace/Unbounded_Queue.cpp: - * ace/Unbounded_Set.h: - * ace/Unbounded_Set.inl: - * ace/Unbounded_Set.cpp: - * ace/Containers_T.h: - * ace/Containers_T.i: - * ace/Containers_T.cpp: - Move several containers to their own file. This reduces the - amount of code that needs to be parsed, improving compilation - time (not to mention the fact that the code becomes more - readable.) - For backwards compatibility the Containers file still includes - the new smaller files. - - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - Add new files to the install rules. - Since they are templates they do not need to be compiled on MSVC - so no changes to the project files are required. - - * ace/ARGV.h: - * ace/ARGV.cpp: - * ace/Future.h: - * ace/Handle_Gobbler.h: - * ace/Local_Name_Space.h: - * ace/Malloc_Base.h: - * ace/Memory_Pool.h: - * ace/Name_Space.h: - * ace/Priority_Reactor.h: - * ace/Remote_Name_Space.h: - * ace/Service_Config.h: - * ace/Signal.cpp: - * ace/Signal.h: - * ace/Stats.h: - * ace/Thread_Manager.h: - * ace/Timeprobe_T.h: - * ace/Timer_Heap_T.h: - * ace/Timer_Queue_Adapters.h: - * ace/TkReactor.cpp: - To reduce compilation and recompilation times we only include - the header file that includes the container used in each case, - instead of the full containers class. - -Fri Mar 23 12:40:34 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp: Make sure - to delete the Consumer_Dispatch_Set * that we get back from - unbind(). Thanks to the ever vigilant Mike Winter - <mwinter@sonic.net> for reporting this. - -Thu Mar 22 10:18:24 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/SString.h: Make the various data members protected - rather than private so subclasses can access them. Thanks to - Martin Krumpolec <krumpo@pobox.sk> for this suggestion. - - * tests/README: Clarified some things about the tests. - Thanks to Eric Desamore <Eric.Desamore@idtv.bull.net> for - motivating this. - -Mon Mar 26 11:03:22 2001 Balachandran <bala@cs.wustl.edu> - - * ACE version 5.1.14 released. - -Sat Mar 24 07:02:35 2001 Chris Cleeland <cleeland_c@ociweb.com> - - * ace/INET_Addr.i (get_host_addr): Added a const_cast to the - VxWorks-only arm that casts away const on the this ptr so that - inet_ntoa_b can access and fill in the buffer data member that's - used to hold the result from inet_ntoa_b. Thanks to Erik Johannes - <ejohannes@oresis.com> for point this out. - -Fri Mar 23 18:01:05 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * bin/auto_run_tests.lst: Some of the tests cannot be run in - Single threaded configurations. Prevented such tests from - running in the nightly builds. - -Fri Mar 23 16:25:18 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/New_Fail_Test.cpp: Reverted the change from "Fri Mar 23 - 06:34:33 2001 Balachandran Natarajan <bala@cs.wustl.edu>". The - change fails to comipile when exceptions are on. - -Fri Mar 23 08:47:29 2001 Carlos O'Ryan <coryan@uci.edu> - - * apps/Gateway/Gateway/Options.cpp: - Explicitly #include Log_Msg.h, on platforms that do not define - ACE_TEMPLATES_REQUIRE_SOURCE the header file is not implicitly - included. This should fix compilation problems on Tru64/CXX and - SunCC/4.2 - -Fri Mar 23 06:34:33 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/New_Fail_Test.cpp: Fixed a stupid warning in g++, - No_AMI_Messaging builds. Surprising that it showed up only in - this build. - -Thu Mar 22 21:33:37 2001 Chris Cleeland <cleeland_c@ociweb.com> - - * ace/INET_Addr.h: VxWorks' inet_ntoa doesn't behave like most - others, and our use was causing memory leaks. VxWorks prefers - that you use its own inet_ntoa_b, which takes the buffer to fill - as an argument. Thus, for VxWorks, added a data member char buf - of the appropriate length so that get_host_addr can use - inet_ntoa_b to fill that in. - - * ace/INET_Addr.i (get_host_addr): For VxWorks only, changed this - to use the preferred inet_ntoa_b. This eliminate memory leaks - under VxWorks. Thanks to Erik Johannes <ejohannes@oresis.com> for - the suggested fix. - -Wed Mar 21 19:20:02 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * apps/Gateway/Peer/Peer.cpp (nonblk_put): Fixed a compile error - in g++. - -Wed Mar 21 17:28:26 2001 Steve Huston <shuston@riverace.com> - - * ace/Message_Queue.h: - * ace/Message_Queue_T.h: Moved definition of typedef for - ACE_DEFAULT_MESSAGE_QUEUE_TYPE from Message_Queue.h to - Message_Queue_T.h, just after defining ACE_Message_Queue<>. - Fixes the case where Message_Queue_T.h is included first, - it includes Message_Queue.h before ACE_Message_Queue<> is - defined, and that breaks the compile. IBM C/C++ hit this. - -Wed Mar 21 16:42:19 2001 Steve Huston <shuston@riverace.com> - - * bin/auto_compile: Added an option: -notao to ignore the TAO aspects - of the non-configurable things, like looking at the TAO/ChangeLog. - Also, now looks for auto_run_tests.lst in the $BUILD/bin directory, - not the $MODULE/bin directory - this allows some builds to specify - their own lists. - -Wed Mar 21 16:00:56 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - The followings are contributions from Scott Snyder - <snyder@fnal.gov> to make ACE happy on Digital UNIX with KCC - 3.4d. - - * include/makeinclude/platform_tru64_kcc.GNU: - * include/makeinclude/platform_osf1_4.0_kcc.GNU: Added KCCOPTS and - support for tru64 unix. - - * ace/OS.h: On this platform, we ran into problems with sigwait - being a macro. The fix that had been added for this was keyed - on __DECCXX_VER, so it isn't picked up on this platform. - - * ace/Sock_Connect.cpp: Enum_Interface_Test failed on this - platform. The code in Socket_Connect.cpp that implements this - is conditional on `__unix' being defined. However, with this - compiler, we get `unix' and `__unix__' defined, but not - `__unix'. Fixed by testing for `__unix__' too. - - * ace/ACE.cpp: Cache_Conn_Test was failing. It looks like the - code in ACE::out_of_handles doesn't have a case to handle osf1. - -Wed Mar 21 12:08:35 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - The followings are contributions from Scott Snyder - <snyder@fnal.gov> to make ACE happy on IRIX 6.x with KCC 3.4d. - - * include/makeinclude/platform_irix6.x_kcc.GNU: - Disable the following warings and separate common options into - $(KCCOPTS). - - 280: declaration of a member with the same name as its class Get - this from <netinet/in.h>. - - 608: this pragma must immediately precede a declaration or - statement Get this from <ucontext.h>. - - * ace/OS.h: Changed to only request RTLD_GROUP and RTLD_NODELETE - if they are actually available. - - * ace/config-irix6.x-kcc.h: Undefined - ACE_LACKS_PLACEMENT_OPERATOR_DELETE since KCC actually supports it. - - Config_Test was failing because with the default setup, ace - tries to locate the shared memory pool at 0x04000000. But it - turns out that this is the same address at which irix likes to - load the KCC shared library, libKCC.so. So the memory pool ends - up blowing away all the library code. Fixed by shifting the - default base address to 0x05000000 for this configuration. - - OS_Test was failing because on irix, kcc 4.0d miscompiles - memchr_emulation if +K3 optimization is used. I worked around - this by just using the library version of memchr instead: - - * ace/ACE.cpp: Cached_Conn_Test was failing because the code in - ACE::out_of_handles doesn't have a case to handle irix. - - * tests/DLL_Test.cpp: It died trying to run object dtors. Fixed by - turning off the close-on-destruction flag for this test. - -Wed Mar 21 13:33:58 2001 Ossama Othman <ossama@uci.edu> - - * examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp: - - Patched this file so that the example actually works. It now - correctly interacts with the SSL client in this example. Thanks - to Defang Zhou <dzhou@inktomi.com> for contributing the - patch/changes necessary to make it work. - -Wed Mar 21 07:23:15 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * tests/SOCK_Connector_Test.cpp (find_another_host): Make the - test a bit more resilent against errors with gethostbyname(). - Thanks to Lu Yunhai <luyunhai@huawei.com> for this fix. - -Tue Mar 20 17:31:21 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/run_test.lst: - The Logging_Strategy_Test dynamically loads the Logger service - (from netsvcs), therefore it does not work on static builds. - -Tue Mar 20 18:17:24 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/OS.i: Fixed the USYNC_PROCESS arm of CreateMutex() in - ACE_OS::mutex_init() so that it calls - ACE_OS::set_errno_to_last_error(). Thanks to Ram Ben-Yakir - <Ram@bandwiz.com> for reporting this. - -Tue Mar 20 01:33:24 2001 Ossama Othman <ossama@uci.edu> - - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - * ace/SSL/SSL_SOCK_Connector.cpp (ssl_connect): - * ace/SSL/SSL_SOCK_Stream.i (send, close): - - Wrap the underlying OpenSSL calls in a do-while(SSL_pending()) - loop. I decided to wrap the SSL_write() calls just in case. - This should fix the last of the non-blocking IO issues in ACE's - SSL wrappers. [Bug 393] - -Tue Mar 20 00:40:43 2001 Ossama Othman <ossama@uci.edu> - - * ace/SSL/SSL_SOCK_Stream.i (recv): - - Fixed non-blocking IO support for this method. It was necessary - to ensure that a full SSL record was read before returning - control to the caller. Note that the send() method doesn't need - modification since OpenSSL always writes a full record before - returning. [Bug 393] - -Mon Mar 19 19:53:34 2001 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/ace_flags.bor: - Define macros for the RT Event Service test library - -Mon Mar 19 16:57:43 2001 Irfan Pyarali <irfan@cs.wustl.edu> - - * ace/TP_Reactor.cpp (handle_events): Return value from - handle_events() after the Reactor has been deactivated should be - -1. We just need to remember that as illustrated in - ACE_Reactor::run_reactor_event_loop(), this is not an error: - - if (result == -1 && this->implementation_->deactivated ()) - return 0; - - * tests/Thread_Pool_Reactor_Test.cpp (svr_worker): Changed this - function to call ACE_Reactor::run_reactor_event_loop() instead - of ACE_Reactor::handle_events(). In the previous revision, we - were not handling return values from - ACE_Reactor::handle_events() correctly when - ACE_Reactor::deactivated() had been called. - -Mon Mar 19 09:14:12 2001 Chad Elliott <elliott_c@ociweb.com> - - * include/makeinclude/platform_chorus4.x_g++.GNU: - - Added an output option to the link command. Linking would fail - in cases where the output was specified in another directory. - -Sun Mar 18 22:12:16 2001 Ossama Othman <ossama@uci.edu> - - * ace/SSL/SSL_SOCK_Stream.i (close): - - Commented out debugging output that was inadvertently committed - to the repository. - - Don't bother invalidating the handle. Doing so can potentially - cause some side-effects in the underlying OpenSSL - implementation since setting the handle in the SSL_SOCK_Stream - also causes the OpenSSL SSL_set_fd() function to be called. - - Fixed a socket leak caused by the fact that the handle was - invalidated before the underlying ACE_SOCK_Stream was closed. - -Sun Mar 18 09:46:47 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/New_Fail_Test.cpp: Fixed warnings in g++. - -Sun Mar 18 08:31:34 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * apps/Gateway/Gateway, - * apps/Gateway/Peer: Added a number of fixes to the Gateway and Peer - applications. Thanks to Lu Yunhai <luyunhai@huawei.com> for - contributing these. - -Sun Mar 18 08:31:34 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * examples/IPC_SAP/FILE_SAP/client.cpp (main): Added a couple of - casts so that the arguments passed to printf() will match the - format specifier types. - -Sat Mar 17 18:02:28 2001 Steve Huston <shuston@riverace.com> - - * ace/config-aix-4.x.h: Fixed settings for exceptions and - placement delete to be ok for Visual Age C++ 5. - - * include/makeinclude/platform_aix_vacpp.GNU: Basically new, - works with the Visual Age C++ 5 batch mode build on AIX. - - * include/makeinclude/rules.lib.GNU: Added aix_build piece to - the section for linking a shared library. It uses the linker - to generate a shr.o (shared) file, then inserts that into - the library that's being built. This new section is only - used with platform_aix_vacpp.GNU at this point. - -Fri Mar 16 15:07:23 2001 Ossama Othman <ossama@uci.edu> - - * ace/SSL/SSL_Context.h (set_mode): - - Changed the default mode from SSLv3 to SSLv23, i.e. support - SSLv2 and SSLv3 by default. This fixes interoperability - with applications that use Sun's JSSE, which only supports - SSLv2. Thanks to Max Khon <fjoe@newst.net> for providing the - patch. - -Thu Mar 15 17:47:28 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/Log_Msg_Test.cpp: Changed a ERROR message as a DEBUG - message. If it is an error message the scripts that run the - build gets confused. - -Thu Mar 15 17:42:54 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/Logging_Strategy_Test.cpp: Changed the "-s" option in the - test to write the output in to the output generated in the "log" - directory. This is just a hack to make the scoreboard clean. - -Thu Mar 15 15:55:37 2001 Steve Huston <shuston@riverace.com> - - * ace/Message_Queue_T.h: Add #include "ace/Message_Queue.h" so - IBM Visual Age C++ sees ACE_Message_Queue_Base when instantiating - templates. - - * ace/ace-dll.icc: Fixed after being munged in a previous commit. - Also, corrected libACE.a generation and cleanup, and incorporated - fixes from Steve Ige <steve.ige@reuters.com> and Jerry - Odenwelder <jerryo@atl.fundtech.com>. - - * THANKS: Added Steve Ige to the Hall of Fame. - -Thu Mar 15 11:26:35 2001 Ossama Othman <ossama@uci.edu> - - * ace/SSL/SSL_SOCK_Acceptor.i (ACE_SSL_SOCK_Acceptor): - - Make sure the handle is set for the ACE_SSL_SOCK_Acceptor, after - initializing the underlying ACE_SOCK_Acceptor. This ensures - that OpenSSL has the proper handle. Thanks to Greg McCain - <greg.mccain@veritas.com> for suggesting this fix. - - * THANKS: - Added Greg to the hall of the fame. - -Thu Mar 15 05:46:59 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/FILE_Addr.cpp (ACE_FILE_Addr): Make sure to divide the size of - the filename_ by the sizeof (ACE_TCHAR) to handle unicode - correctly. Thanks to the ever vigilant Ivan Murphy for catching - this! - -Wed Mar 14 01:47:10 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * apps/Gateway/Gateway/Makefile: - * apps/Gateway/Peer/Makefile: - * apps/JAWS/server/Makefile: - * apps/gperf/tests/Makefile: - * examples/ASX/CCM_App/Makefile: - * examples/Service_Configurator/IPC-tests/server/Makefile: - * examples/Service_Configurator/Misc/Makefile: - * examples/Timer_Queue/Makefile: - * netsvcs/clients/Naming/Client/Makefile: - * netsvcs/clients/Naming/Dump_Restore/Makefile: Removed - unnecessary 'LIBS += $(ACELIB)'. They were causing link problem - for the latest KCC. compiner. - -Tue Mar 13 20:56:10 2001 Irfan Pyarali <irfan@cs.wustl.edu> - - * ace/WFMO_Reactor.cpp (remove_to_be_added_handler_i): - * ace/WFMO_Reactor.cpp (remove_suspended_handler_i): - * ace/WFMO_Reactor.cpp (remove_handler_i): - - If a user tried to (a) remove a "to be suspended handle" from - either the current info set or the to be added set, the handle - was correctly removed but the "to be suspended handle" count was - not reduced; (b) remove a "to be resumed handle" from the - suspended set, the handle was correctly removed but the "to be - resumed handle" count was not reduced. Since the "to be resumed - handle" and the "to be suspended handle" were not adjusted - properly, the reactor kept waking up thinking that changes were - required. Thanks to Lu Yunhai <luyunhai@huawei.com> for - reporting this problem. - - * examples/Reactor/WFMO_Reactor/test_suspended_removals.cpp: Added - an extensive example for regression testing the above use cases. - -Tue Mar 13 15:23:04 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/Service_Manager.cpp (list_services): Fixed Unicode bugs. - -Tue Mar 13 15:13:48 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * tests/Logging_Strategy_Test.cpp: Fixed Unicode related bugs. - -Tue Mar 13 10:04:06 2001 Carlos O'Ryan <coryan@uci.edu> - - * performance-tests/TCP/run_test.pl: - Fixed the path to the $ACE_ROOT/bin directory, now the script - runs again. - -Tue Mar 13 06:04:03 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Service_Manager.cpp (list_services): Add an indication of whether - a service is active or paused. Thanks to Mike Curtis for this - improvement. - - * ace/Reactor.h: Clarified that the remove_handler (handle, mask) - method also removes the event handle. Thanks to Pierre Fayolle - <fayolle@enseirb.fr> for reporting this. - - * tests/Logging_Strategy_Test.cpp (get_statistic): Replace struct stat - with ACE_stat. Thanks to Johnny Willemsen for reporting this. - -Tue Mar 13 00:35:35 2001 Irfan Pyarali <irfan@cs.wustl.edu> - - * ace/Select_Reactor_T.i (deactivated): Reverted this change - regarding Select_Reactor_T::deactivated(): - - Thu Feb 22 12:28:15 2001 Irfan Pyarali <irfan@cs.wustl.edu> - - Though my change improved correctness of access and change to - the <deactivated_> variable, it had a negative consequence: the - event loop calls Select_Reactor_T::deactivated() before calling - Select_Reactor_T::handle_events() to make sure that the reactor - is not closed yet. Unfortunately, if - Select_Reactor_T::deactivated() has a guard, it will send a null - event waking up the current leader and thus lead to unnecessary - thrashing. For now, I have removed the guard from the - Select_Reactor_T::deactivated() methods. We should revisit this - issue some time again. This fixes bug 816. - -Mon Mar 12 16:30:32 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/Logging_Strategy_Test.cpp (main): Fixed the rest of the - warnings in VxWorks builds. - -Mon Mar 12 16:21:42 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/Logging_Strategy_Test.cpp (main): Fixed a couple of - warnings in VxWorks build. Couple of more warnings are left. - -Mon Mar 12 14:16:03 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/Local_Name_Space_T.cpp (create_manager_i): Fixed a compile - error on Win32 Unicode platforms. - -Mon Mar 12 12:12:36 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ACE-INSTALL.html: Also mentioned Windows 2000 explicitly in the - document. Thanks to Rahul Shukla <rshukla@ggn.aithent.com> for - raising the question. - -Mon Mar 12 00:49:24 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * tests/tests.dsw: - * tests/Logging_Strategy_Test.dsp: Added a new dsp file. - -Sun Mar 11 21:00:16 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_compile: - Print out the config.h and platform_macros.GNU files, this is - useful when debugging builds. - -Sun Mar 11 18:41:08 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * ace/CDR_Stream.h: Updated a comment to clarify that the buffer() - method just returns a pointer to the first block in the chain. - Thanks to Johnny Willemsen for pointing this out. - -Sun Mar 11 17:46:45 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/Local_Name_Space_T.cpp: Fixed a compiler error on Win32 - Unicode platforms. - -Sun Mar 11 17:28:40 2001 Irfan Pyarali <irfan@cs.wustl.edu> - - * ace/QoS/QoS_Session_Impl.cpp (rsvp_callback): <errflags> was unused. - -Sun Mar 11 08:31:05 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * tests/Makefile.bor (NAMES): Added Logging_Strategy_Test. - -Sun Mar 11 07:32:18 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/Logging_Strategy_Test.cpp (order): Fixed a warning in g++ - builds. - -Sat Mar 10 23:15:10 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - Fixed name of Crashed_Callback test - -Sat Mar 10 19:28:30 PST 2001 Mayur Deshpande <mayur@ics.uci.edu> - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - Fixes to enable debugging on QNX without ACE crashing. - Thanks to Andy Olson for the suggestions. - -Sat Mar 10 19:05:38 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/config-win32.h: - - Include config-win32-common.h even on Windows CE. - - * ace/config-win32-msvc-6.h: - - If ACE_ENDTHREADEX is already defined, don't define it. - - * ace/OS_Dirent.h: - - Changed the use of ACE_WINCE to ACE_HAS_WINCE. - - * ace/Service_Manager.cpp: - - Fixed a couple of ACE_TCHAR/ACE_LIB_TEXT problems. - - * ace/ace_wchar.h: - - On Windows CE, #include wtypes.h. - - * ace/ace_dll.vcp: - * ace/ace_os_dll.vcp: - - Redid the output files and directories. Now intermediate - files go into Release/PLATFORM and Debug/PLATFORM (where - PLATFORM = MIPS/ARM/X86EM/SH3/SH4). The *.lib files go - into ../Lib/PLATFORM and the *.dll into ../bin/PLATFORM. - Also, the DLL's were renamed from ace_dll.dll and - ace_os_dll.dll to ace[d].dll and ace_os[d].dll. - - * bin/pippen.pl: - - Changed the environment variables from DEFAULT_COMPILER and - DEFAULT_CONFIGS to PIPPEN_COMPILER and PIPPEN_CONFIGS. Also - used \Q\E for the configs because some of the Windows CE - configs confused the script because they use parentheses. - -Sat Mar 10 16:59:51 2001 Carlos O'Ryan <coryan@uci.edu> - - * ACE-INSTALL.html: - Remove references to the now obsolete config-linux-lxpthreads.h - and platform_linux_lxpthread.GNU - -Sat Mar 10 16:38:22 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/run_test.lst: - Running the Recursive_Mutex_Test on single-threaded builds makes - very little sense. - -Sat Mar 10 16:35:19 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - Add new tests: Muxing, Crashed_Callback, Client_Leaks and - Server_Leaks to the nightly runs. - -Sat Mar 10 17:55:53 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * include/makeinclude: Zapped the platform_linux_pthread.GNU, - platform_linux_lxpthread.GNU, and platform_linux_lxpthreads.GNU - files since they are confusing and shouldn't not be used in - favor of platform_linux.GNU. - - * ace: Zapped the config-linux.pthread.h and config-linux-lxpthreads.h - file since they are confusing and shouldn't not be used in favor - of config-linux.h. Thanks to Craig Rodrigues for this - suggestion. - -Sat Mar 10 12:39:16 2001 Craig Rodrigues <crodrigu@bbn.com> - - * ace/Reactor.h: - * ace/WFMO_Reactor.h: - * ace/Select_Reactor_T.h: - * ace/Reactor_Impl.h: - Cleaned up comment for schedule_timer() - -Sat Mar 10 07:05:16 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * tests: Added Logging_Strategy_Test.cpp. Thanks to Orlando - Ribeiro <oribeiro@inescporto.pt> for contributing this. - - * tests/Makefile (BIN): Added Logging_Strategy_Test. - - * tests/run_test.lst: Added Log_Msg_Test and - the new Logging_Strategy_Test. - - * tests/Log_Msg_Test.cpp: Added ACE_TEXT macros to all the ACE_DEBUG and - ACE_ERROR calls. - - * ace/Service_Manager.{h,cpp}: Refactored the request processing - code so that it's in a single place. Also, added support to - enable remote reconfiguration. Thanks to Mike Curtis - <mccurry@my-deja.com> for contributing this. - - * ace/Logging_Strategy.cpp (parse_args): Fixed a mistaken - re-initialization of the thread_priority_mask_ and the - process_priority_mask_. Thanks to Martin Krumpolec - <krumpo@pobox.sk> for reporting this. - - * ace/Local_Name_Space_T.cpp (create_manager_i): Fixed this code so that - it doesn't fail if run on a directory that doesn't support locks - (like some NFS mounts). Thanks to scott snyder - <snyder@fnal.gov> for reporting this. - - * tests/SOCK_Connector_Test.cpp: Split up a loop so that the test - doesn't hang on RedHat Linux 7.0. Thanks to Michael Searles - <msearles@base16.com> for this fix. - -Fri Mar 9 22:39:28 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Svc_Conf.h: - * ace/Service_Config.h: - * ace/Service_Config.cpp: - Add new method to the Service Configurator to add static - services into the repository, this factors out common code used - in the ORB and ACE. In general it fixes the hacks done this - past Feb 20th - -Fri Mar 9 16:47:15 2001 Priyanka Gontla <pgontla@ece.uci.edu> - - * bin/nightlybuilds/builds.lst (LIST): - Added HPUX to the scoreboard. - -Fri Mar 9 14:34:34 2001 Chad Elliott <elliott_c@ociweb.com> - - * PACE/Makefile: - * apps/drwho/Makefile: - * bin/PerlACE/Process_Unix.pm: - * include/makeinclude/platform_chorus4.x_g++.GNU: - - Modifications to make things build and run correctly with - Chorus 4.0.1. - -Thu Mar 8 08:38:01 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - The Single_Threaded_POA test cannot run with minimum CORBA or - (isn't this ironic) on single threaded configurations. - -Wed Mar 07 20:25:51 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/nightlybuilds/builds.lst: - Add QNX to the configurations in the scoreboard. - -Wed Mar 7 12:41:05 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * ace/Select_Reactor_T.h, - * ace/Reactor_Impl.h, - * ace/WFMO_Reactor.h, - * ace/Reactor.h: Updated the comments to be more accurate. Thanks - to Craig Rodrigues for reporting this. - -Wed Mar 7 08:57:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/Asynch_IO.h: - Changed use of ACE_UNIMPLEMENTED_FUNC to just defining the - assignment operators outright. The point here is to just - provide any implementation, since the default one is flagged as - causing infinite recursion. - - Thanks to David Levine for pointing out this incorrect usage of - the macro. - - * ace/config-win32-msvc-5.h: - * ace/config-win32-msvc-6.h: - - @file comments were mismatched. - - * ace/config-win32.h: - - Changed config-win32-wince.h to config-WinCE.h. - - * ace/ace_wchar.h: - * ace/Log_Msg_NT_Event_Log.cpp: - - Changed several system calls to ACE_TEXT_* (and needed to - add some to ace_wchar.h) since they need the ACE_TEXT - treatment. - -Wed Mar 7 08:20:01 2001 Chad Elliott <elliott_c@ociweb.com> - - * ace/ARGV.cpp: - - Removed a warning about possible use of uninitialized variable. - - * bin/ace_ld: - - Added new functionality to filter out the harmless symbol size - change warnings for VxWorks 5.4. - - * examples/Shared_Malloc/test_multiple_mallocs.cpp: - * examples/Shared_Malloc/test_persistence.cpp: - * examples/Shared_Malloc/test_position_independent_malloc.cpp: - - Renamed the typedef MALLOC to TEST_MALLOC. A MALLOC macro is - defined by a VxWorks system header. - -Wed Mar 7 06:11:52 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * ace/Asynch_IO.h: Removed the unnecessary/improper ';' at the - end of the line. Thanks to Johnny Willemsen and Chris Kohlhoff - for reporting/fixing this. - - * ace/*_Connector.h: Clarified in the comments that the - ACE_Time_Value *timeout represents the *maximum* amount of time - to wait. If the server is not running, however, connect() can - return much sooner. Thanks to Dipti Jain <dijain@hss.hns.com> - for motivating this. - -Tue Mar 6 14:14:06 2001 Darrell Brunsch <brunsch@uci.edu> - - Here are some fixes for MSVC 7 beta. Note that no project files - are checked in. Right now they will have to be generated from - the MSVC 5/6 files (The devenv.exe will do this automatically). - When MSVC 7 becomes released, we'll probably have to deal with - including their files (even if only for nightly builds). - - * ace/OS.h: - * ace/config-win32-msvc.h: - - Moved the inclusion of the crtdbg.h file to where it is being - used. This is mainly to alleviate some excessive inclusions. - - * ace/config-WinCE.h: - * ace/config-win32.h: - * ace/config-win32-msvc-5.h: (added) - * ace/config-win32-msvc-6.h: (added) - * ace/config-win32-msvc-7.h: (added) - * ace/config-win32-borland.h: - * ace/config-win32-common.h: - * ace/config-win32-ghs.h: - * ace/config-win32-msvc.h: - * ace/config-win32-visualage.h: - - Added a new config-win32-msvc-7.h with some new settings. While - doing this I also rearranged the files a bit. Everything now - goes through config-win32.h (and an error will occur if you - include the others directly). - - * ace/config-hpux-10.x-hpc++.h: - * ace/config-hpux-11.00.h: - * ace/config-win32-msvc-5.h: - * ace/config-win32-msvc-6.h: - * ace/README: - - Removed ACE_HAS_ONE_DEFINITION_RULE. Could not find this - actually used anywhere so I'm assuming it can be safely - removed. - - * ace/Asynch_IO.h: - - Added some dummy assignment operators. It seems that the default - ones produce infinite recursion (at least with MSVC 6 SP5 and - MSVC 7 beta) - - * ace/Future.h: - - Future_Holder needs to be ACE_Export-ed. - -Tue Mar 6 16:58:17 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/ACE.cpp (format_hexdump): The format_hexdump () was missing - a space if the remaining message that needs dumping was less - than 16 bytes. Thansk to Johnny Willemsen" - <johnny.willemsen@meco.nl> for giving this fix. - -Tue Mar 6 11:25:53 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/PerlACE/Process_Unix.pm: - Ignore SIGABRT too, because it is used by abort() and we call - that function to test the ORB under fault conditions. - -Tue Mar 6 12:25:34 2001 Chad Elliott <elliott_c@ociweb.com> - - * configure.in: - - The configure script was broken on major releases (i.e. those with - no beta numbers). A test for an empty string should have double - quotes around the variable. - -Tue Mar 6 10:16:31 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/config-win32-common.h: - Removed old comment about ACE_HAS_WINSOCK2 being related to - ACE_HAS_WINNT4. Thanks to Johnny Willemsen - <jwillemsen@remedy.nl> for pointing this out. - -Tue Mar 6 10:13:03 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/RMCast/RMCast_Fragment_Test.cpp: - * tests/RMCast/RMCast_Membership_Test.cpp: - * tests/RMCast/RMCast_Reassembly_Test.cpp: - * tests/RMCast/RMCast_Reordering_Test.cpp: - * tests/RMCast/RMCast_Retransmission_Test.cpp: - Use ACE_OS::time(0) to initialize the pseudo-random numbers - seed. It is good enough for our purposes, and it works on - platforms without 64-bit integer support. - -Mon Mar 5 13:56:33 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * ace/Synch_T.{h,i}: Further simplified the new ACE_Guard constructor. - Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing - this. - -Mon Mar 5 19:20:45 2001 Fuzz Master D <brunsch@uci.edu> - - * bin/fuzz.pl: - As Ossama pointed out, the ACE_CHECK test was seeing - problems in the tao_idl files since it has uses of ACE_TRY_ENV - inside quotes. Made sure not to detect problems in this case. - -Mon Mar 5 18:58:32 2001 Fuzz Master D <brunsch@uci.edu> - - * bin/fuzz.pl: - Fixed some false positives in the resolve_initial_reference - test and also added an ACE_CHECK test by Carlos's request. - -Mon Mar 5 18:54:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/PerlACE/Process_Unix.pm: - Updated the signal detection to not pay attention to TERM and - KILL. Will print out better output when signals cause a process - to exit during most calls like Kill () or TerminateWaitKill (). - -Mon Mar 5 13:56:33 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * ace/Synch_T.{h,i}: Added a new ACE_Guard constructor that - allows the caller to select whether the guard owns/acquires the - lock or not. Thanks to Chris Kohlhoff <chris@kohlhoff.com> for - contributing this. - - * ace/Synch_T.{h,i}: Added a disown() method that relinquishes - ownership of the lock so that it is not released implicitly in - the destructor. Thanks to Chris Kohlhoff <chris@kohlhoff.com> - for contributing this. - - * ace/Event_Handler.h: Updated the comment on handle_close() so that - it more accurately reflects what is going on. Thanks to Defang - Zhou <dzhou@inktomi.com> for suggesting this. - - * apps/Gateway/Gateway/Concrete_Connection_Handlers.{h,cpp}: Added - handle_close() operations to solve problems with certain - concurrency models. Thanks to Defang Zhou <dzhou@inktomi.com> - for reporting this. - -Mon Mar 5 11:29:36 2001 Carlos O'Ryan <coryan@uci.edu> - - * docs/ACE-categories.html: - Fixed links to the doxygen files. - - * ace/Pipe.cpp: - Fixed what looks like a typo, we want to *disable* the stream - pipes under QNX, not to enable them just on that platform. - -Mon Mar 5 08:20:21 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/RMCast/RMCast_Fragment_Test.cpp: - * tests/RMCast/RMCast_Reassembly_Test.cpp: - Undo Doug's changes. They broke the test. - -Mon Mar 5 07:52:52 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * ace/Log_Record.cpp (priority): Clarified the behavior of the - priority() set/get methods. Thanks to Christian Schuhegger - <Christian.Schuhegger@cern.ch> for reporting this. - - * tests/RMCast/RMCast_Fragment_Test.cpp, - * tests/RMCast/RMCast_Reassembly_Test.cpp, - * tests/Dynamic_Priority_Test.cpp, - * tests/Thread_Pool_Test.cpp: Make sure to write into the - wr_ptr() rather than the rd_ptr(). Thanks to Gonzalo Diethelm - <Gonzalo.Diethelm@sonda.com> for reporting this. - -Mon Mar 5 08:00:23 2001 Chad Elliott <elliott_c@ociweb.com> - - * bin/nightlybuilds/builds.lst: - - Added new VxWorks 5.4 and Chorus 4.0.1 nightly builds. - -Mon Mar 05 00:10:15 2001 Ossama Othman <ossama@uci.edu> - - * bin/fuzz.pl: - - Updated to detect missing ACE_TRY_ENV parameters in - ORB::resolve_initial_references() calls when emulated exceptions - are used. Thanks to Darrell for providing this update. - -Mon Mar 5 07:57:07 2001 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Makefile.bor: - - Added missing Refcounted_Auto_Ptr_Test to the build - -Sun Mar 4 19:31:16 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/auto_run_tests.lst: - - Added the run_test_mt.pl for Leader_Follers. - - * bin/PerlACE/Process_Unix.pm: - * bin/PerlACE/Process_Win32.pm: - - Added a destructor to detect if a process wasn't explicitly - killed before the object went out of scope. Will print out - an error and kill it. - - * bin/PerlACE/Run_Test.pm: - - Turned on autoflush for all scripts. - - * docs/run_test.txt: - - Updated run_test.pl instructions to fit all the changes I - just made. - - * examples/Export/run_test.pl: - * performance-tests/RPC/run_test.pl: - * performance-tests/TCP/run_test.pl: - * performance-tests/UDP/run_test.pl: - - Updated to use PerlACE::Run_Test; - - * tests/Atomic_Op_Test.dsp: - * tests/Auto_IncDec_Test.dsp: - * tests/Barrier_Test.dsp: - * tests/Basic_Types_Test.dsp: - * tests/Buffer_Stream_Test.dsp: - * tests/CDR_Array_Test.dsp: - * tests/CDR_File_Test.dsp: - * tests/CDR_Test.dsp: - * tests/Cache_Map_Manager_Test.dsp: - * tests/Cached_Accept_Conn_Test.dsp: - * tests/Cached_Conn_Test.dsp: - * tests/Capabilities_Test.dsp: - * tests/Collection_Test.dsp: - * tests/Config_Test.dsp: - * tests/Conn_Test.dsp: - * tests/DLL_Test.dsp: - * tests/DLList_Test.dsp: - * tests/Dirent_Test.dsp: - * tests/Dynamic_Priority_Test.dsp: - * tests/Enum_Interfaces_Test.dsp: - * tests/Env_Value_Test.dsp: - * tests/Future_Set_Test.dsp: - * tests/Future_Test.dsp: - * tests/Handle_Set_Test.dsp: - * tests/Hash_Map_Bucket_Iterator_Test.dsp: - * tests/Hash_Map_Manager_Test.dsp: - * tests/High_Res_Timer_Test.dsp: - * tests/IOStream_Test.dsp: - * tests/Lazy_Map_Manager_Test.dsp: - * tests/Log_Msg_Test.dsp: - * tests/MEM_Stream_Test.dsp: - * tests/MM_Shared_Memory_Test.dsp: - * tests/MT_Reactor_Timer_Test.dsp: - * tests/MT_SOCK_Test.dsp: - * tests/Malloc_Test.dsp: - * tests/Map_Manager_Test.dsp: - * tests/Map_Test.dsp: - * tests/Mem_Map_Test.dsp: - * tests/Message_Block_Test.dsp: - * tests/Message_Queue_Notifications_Test.dsp: - * tests/Message_Queue_Test.dsp: - * tests/Message_Queue_Test_Ex.dsp: - * tests/Naming_Test.dsp: - * tests/New_Fail_Test.dsp: - * tests/Notify_Performance_Test.dsp: - * tests/OS_Test.dsp: - * tests/Object_Manager_Test.dsp: - * tests/OrdMultiSet_Test.dsp: - * tests/Pipe_Test.dsp: - * tests/Priority_Buffer_Test.dsp: - * tests/Priority_Reactor_Test.dsp: - * tests/Priority_Task_Test.dsp: - * tests/Process_Manager_Test.dsp: - * tests/Process_Mutex_Test.dsp: - * tests/Process_Strategy_Test.dsp: - * tests/RB_Tree_Test.dsp: - * tests/Reactor_Exceptions_Test.dsp: - * tests/Reactor_Notify_Test.dsp: - * tests/Reactor_Performance_Test.dsp: - * tests/Reactor_Timer_Test.dsp: - * tests/Reactors_Test.dsp: - * tests/Reader_Writer_Test.dsp: - * tests/Recursive_Mutex_Test.dsp: - * tests/Refcounted_Auto_Ptr_Test.dsp: - * tests/Reverse_Lock_Test.dsp: - * tests/SOCK_Connector_Test.dsp: - * tests/SOCK_Send_Recv_Test.dsp: - * tests/SOCK_Test.dsp: - * tests/SPIPE_Test.dsp: - * tests/SString_Test.dsp: - * tests/SV_Shared_Memory_Test.dsp: - * tests/Semaphore_Test.dsp: - * tests/Service_Config_Test.dsp: - * tests/Sigset_Ops_Test.dsp: - * tests/Simple_Message_Block_Test.dsp: - * tests/Svc_Handler_Test.dsp: - * tests/TSS_Test.dsp: - * tests/Task_Test.dsp: - * tests/Thread_Manager_Test.dsp: - * tests/Thread_Mutex_Test.dsp: - * tests/Thread_Pool_Reactor_Test.dsp: - * tests/Thread_Pool_Test.dsp: - * tests/Time_Service_Test.dsp: - * tests/Time_Value_Test.dsp: - * tests/Timeprobe_Test.dsp: - * tests/Timer_Queue_Test.dsp: - * tests/Tokens_Test.dsp: - * tests/UPIPE_SAP_Test.dsp: - * tests/Upgradable_RW_Test.dsp: - * tests/version_tests/Atomic_Op_Test.dsp: (removed) - * tests/version_tests/Auto_IncDec_Test.dsp: (removed) - * tests/version_tests/Barrier_Test.dsp: (removed) - * tests/version_tests/Basic_Types_Test.dsp: (removed) - * tests/version_tests/Buffer_Stream_Test.dsp: (removed) - * tests/version_tests/CDR_Array_Test.dsp: (removed) - * tests/version_tests/CDR_File_Test.dsp: (removed) - * tests/version_tests/CDR_Test.dsp: (removed) - * tests/version_tests/Cache_Map_Manager_Test.dsp: (removed) - * tests/version_tests/Cached_Accept_Conn_Test.dsp: (removed) - * tests/version_tests/Cached_Conn_Test.dsp: (removed) - * tests/version_tests/Capabilities_Test.dsp: (removed) - * tests/version_tests/Collection_Test.dsp: (removed) - * tests/version_tests/Config_Test.dsp: (removed) - * tests/version_tests/Conn_Test.dsp: (removed) - * tests/version_tests/DLL_Test.dsp: (removed) - * tests/version_tests/DLList_Test.dsp: (removed) - * tests/version_tests/Dirent_Test.dsp: (removed) - * tests/version_tests/Dynamic_Priority_Test.dsp: (removed) - * tests/version_tests/Enum_Interfaces_Test.dsp: (removed) - * tests/version_tests/Env_Value_Test.dsp: (removed) - * tests/version_tests/Future_Set_Test.dsp: (removed) - * tests/version_tests/Future_Test.dsp: (removed) - * tests/version_tests/Handle_Set_Test.dsp: (removed) - * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp: (removed) - * tests/version_tests/Hash_Map_Manager_Test.dsp: (removed) - * tests/version_tests/High_Res_Timer_Test.dsp: (removed) - * tests/version_tests/IOStream_Test.dsp: (removed) - * tests/version_tests/Lazy_Map_Manager_Test.dsp: (removed) - * tests/version_tests/Log_Msg_Test.dsp: (removed) - * tests/version_tests/MEM_Stream_Test.dsp: (removed) - * tests/version_tests/MM_Shared_Memory_Test.dsp: (removed) - * tests/version_tests/MT_Reactor_Timer_Test.dsp: (removed) - * tests/version_tests/MT_SOCK_Test.dsp: (removed) - * tests/version_tests/Malloc_Test.dsp: (removed) - * tests/version_tests/Map_Manager_Test.dsp: (removed) - * tests/version_tests/Map_Test.dsp: (removed) - * tests/version_tests/Mem_Map_Test.dsp: (removed) - * tests/version_tests/Message_Block_Test.dsp: (removed) - * tests/version_tests/Message_Queue_Notifications_Test.dsp: (removed) - * tests/version_tests/Message_Queue_Test.dsp: (removed) - * tests/version_tests/Message_Queue_Test_Ex.dsp: (removed) - * tests/version_tests/Naming_Test.dsp: (removed) - * tests/version_tests/New_Fail_Test.dsp: (removed) - * tests/version_tests/Notify_Performance_Test.dsp: (removed) - * tests/version_tests/OS_Test.dsp: (removed) - * tests/version_tests/Object_Manager_Test.dsp: (removed) - * tests/version_tests/OrdMultiSet_Test.dsp: (removed) - * tests/version_tests/Pipe_Test.dsp: (removed) - * tests/version_tests/Priority_Buffer_Test.dsp: (removed) - * tests/version_tests/Priority_Reactor_Test.dsp: (removed) - * tests/version_tests/Priority_Task_Test.dsp: (removed) - * tests/version_tests/Process_Manager_Test.dsp: (removed) - * tests/version_tests/Process_Mutex_Test.dsp: (removed) - * tests/version_tests/Process_Strategy_Test.dsp: (removed) - * tests/version_tests/RB_Tree_Test.dsp: (removed) - * tests/version_tests/Reactor_Exceptions_Test.dsp: (removed) - * tests/version_tests/Reactor_Notify_Test.dsp: (removed) - * tests/version_tests/Reactor_Performance_Test.dsp: (removed) - * tests/version_tests/Reactor_Timer_Test.dsp: (removed) - * tests/version_tests/Reactors_Test.dsp: (removed) - * tests/version_tests/Reader_Writer_Test.dsp: (removed) - * tests/version_tests/Recursive_Mutex_Test.dsp: (removed) - * tests/version_tests/Refcounted_Auto_Ptr_Test.dsp: (removed) - * tests/version_tests/Reverse_Lock_Test.dsp: (removed) - * tests/version_tests/SOCK_Connector_Test.dsp: (removed) - * tests/version_tests/SOCK_Send_Recv_Test.dsp: (removed) - * tests/version_tests/SOCK_Test.dsp: (removed) - * tests/version_tests/SPIPE_Test.dsp: (removed) - * tests/version_tests/SString_Test.dsp: (removed) - * tests/version_tests/SV_Shared_Memory_Test.dsp: (removed) - * tests/version_tests/Semaphore_Test.dsp: (removed) - * tests/version_tests/Service_Config_Test.dsp: (removed) - * tests/version_tests/Sigset_Ops_Test.dsp: (removed) - * tests/version_tests/Simple_Message_Block_Test.dsp: (removed) - * tests/version_tests/Svc_Handler_Test.dsp: (removed) - * tests/version_tests/TSS_Test.dsp: (removed) - * tests/version_tests/Task_Test.dsp: (removed) - * tests/version_tests/Thread_Manager_Test.dsp: (removed) - * tests/version_tests/Thread_Mutex_Test.dsp: (removed) - * tests/version_tests/Thread_Pool_Reactor_Test.dsp: (removed) - * tests/version_tests/Thread_Pool_Test.dsp: (removed) - * tests/version_tests/Time_Service_Test.dsp: (removed) - * tests/version_tests/Time_Value_Test.dsp: (removed) - * tests/version_tests/Timeprobe_Test.dsp: (removed) - * tests/version_tests/Timer_Queue_Test.dsp: (removed) - * tests/version_tests/Tokens_Test.dsp: (removed) - * tests/version_tests/UPIPE_SAP_Test.dsp: (removed) - * tests/version_tests/Upgradable_RW_Test.dsp: (removed) - * tests/version_tests/run_all_tests.bat: (removed) - * tests/version_tests/version_tests.dsw: (removed) - - Moved the version_tests back into the tests/*.dsp files. The - reason they were originally moved is because it was easier to - select all the debug versions during a batch build. But now we - have pippen.pl and msvc_auto_compile.pl, so this is no longer an - issue, while this strange setup would compilicate the nightly - builds. Thus, it was standardized back. - - * bin/create_vt_dsps.pl: (removed) - - No need for this anymore. - -Sun Mar 4 19:27:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/Log_Msg.cpp: - * ace/Log_Msg_NT_Event_Log.h: - * ace/OS.cpp: - - Disabled Log_Msg_NT_Event_Log on Windows CE. - -Sun Mar 04 13:19:35 2001 Carlos O'Ryan <coryan@uci.edu> - - * etc/tao.doxygen: - Add .txt files, so we can add web pages to the basic TAO - documentation. - -Sun Mar 04 10:58:08 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Added Log_Msg_NT_Event_Log.{h,cpp} to NT - project files. - -Sun Mar 4 10:41:57 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * ace/Log_Msg.cpp, - ace/Log_Msg.h, - ace/Logging_Strategy.cpp, - ace/Makefile.bor, - ace/OS.cpp, - ace/OS.h, - ace/OS.i, - ace/ace.rc: Added support for the new NT event logging capability. - Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing this. - - * ace/Log_Msg_NT_Event_Log.cpp - ace/Log_Msg_NT_Event_Log.h - ace/ace_message_table.bin: Added these files to support the new - NT event logging capability. - Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing - this. - -Sun Mar 4 04:46:44 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/nightlybuilds/builds.lst: - - Added new Windows CE nightly build. - -Sun Mar 04 03:12:17 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * bin/generate_export_file.pl: ACE_AS_STATIC_LIBS was incorrectly - typed in as ACE_STATIC_LIBS. - - * ace/svc_export.h: - * ace/RMCast/RMCast_Export.h: - * ace/SSL/SSL_Export.h: - * websvcs/lib/websvcs_export.h: These files didn't check for - ACE_AS_STATIC_LIBS to determine if they should define their - export macros for static build. Thanks to Chris Kohlhoff - <chris@kohlhoff.com> for reporting this. [Bug 813] - -Sat Mar 3 19:07:31 2001 Pradeep Gore <pradeep@cs.wustl.edu> - - * ace/QoS/QoS_Session_Impl.cpp: - * ace/QoS/QoS_Session_Impl.i: - * examples/QOS/Fill_ACE_QoS.cpp: - * examples/QOS/Fill_ACE_QoS.h: - * examples/QOS/Makefile: - * examples/QOS/QoS_Util.cpp: - * examples/QOS/Receiver_QoS_Event_Handler.cpp: - * examples/QOS/Sender_QoS_Event_Handler.cpp: - Fixed various compile warnings when compiling with rapi=1 on - Redhat Linux 6.2 - -Sat Mar 3 16:47:53 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/fuzz.pl: - - Changed the detection pattern a bit to pick up - stuff like: - - void - operator < (...) - - better. - - * ace/Auto_Ptr.i: - * ace/Base_Thread_Adapter.cpp: - * ace/Based_Pointer_T.i: - * ace/Connector.cpp: - * ace/Containers_T.cpp: - * ace/DEV_Addr.i: - * ace/Dynamic.i: - * ace/FILE.cpp: - * ace/Flag_Manip.i: - * ace/Handle_Set.i: - * ace/Hash_Map_Manager_T.cpp: - * ace/Lib_Find.cpp: - * ace/Local_Name_Space_T.cpp: - * ace/Local_Tokens.cpp: - * ace/MEM_Addr.i: - * ace/Malloc.cpp: - * ace/Malloc_Allocator.cpp: - * ace/Malloc_T.cpp: - * ace/Memory_Pool.cpp: - * ace/Message_Block.cpp: - * ace/Message_Block.i: - * ace/Message_Block_T.cpp: - * ace/Message_Queue.i: - * ace/Message_Queue_T.cpp: - * ace/Message_Queue_T.i: - * ace/Naming_Context.cpp: - * ace/OS.cpp: - * ace/OS.i: - * ace/PI_Malloc.cpp: - * ace/POSIX_Asynch_IO.cpp: - * ace/Process_Manager.cpp: - * ace/QtReactor.cpp: - * ace/RB_Tree.i: - * ace/RW_Process_Mutex.cpp: - * ace/Reactor.cpp: - * ace/Remote_Name_Space.cpp: - * ace/Remote_Tokens.cpp: - * ace/SOCK_Dgram.i: - * ace/SString.cpp: - * ace/SUN_Proactor.cpp: - * ace/Select_Reactor_Base.cpp: - * ace/Select_Reactor_T.cpp: - * ace/Service_Object.i: - * ace/Service_Repository.cpp: - * ace/Signal.cpp: - * ace/Signal.i: - * ace/Svc_Handler.cpp: - * ace/Synch.cpp: - * ace/Synch_T.cpp: - * ace/Thread_Adapter.cpp: - * ace/Thread_Manager.cpp: - * ace/Timer_Heap_T.cpp: - * ace/TkReactor.cpp: - * ace/Token.cpp: - * ace/Token_Manager.cpp: - * ace/CLASSIX/CLASSIX_CO_Acceptor.i: - * ace/CLASSIX/CLASSIX_Select_Reactor.cpp: - * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp: - * netsvcs/ACE-netsvcs.html: - * netsvcs/lib/Server_Logging_Handler_T.cpp: - * netsvcs/lib/Token_Handler.cpp: - - Fixed bad ACE_TRACE and ACE_OS_TRACE's. (fuzz errors) - - * docs/ACE-categories.html: - * docs/ACE-porting.html: - * docs/ACE-subsets.html: - * docs/tutorials/new-tutorials.html: - - Changed references to - http://www.cs.wustl.edu/~schmidt/ACE_wrappers/* to - relative paths instead (Fixes the last of the fuzz errors). - -Fri Mar 2 20:08 Angelo Corsaro <corsaro@cs.wustl.edu> - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - Added macros tha expand to multiple libraries - on QNX RTP to fix most of the link problems. - -Fri Mar 2 16:35:58 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/config-win32-borland.h: - - Added /**/ to #include <vcl.h> so it isn't picked up by - MSVC-based dependency generators. - -Fri Mar 02 19:36:22 2001 Steve Huston <shuston@riverace.com> - - * ace/OS.i (ACE_OS::send): (only non-Win32), if call fails and - errno is EAGAIN, change it to EWOULDBLOCK. Improve portability - for platforms where EAGAIN and EWOULDBLOCK are different values - and both used, like HP-UX. Thanks to Michael Grove - <snowymike@aol.com> for reporting this problem. - - * ace/ACE.i (send_i): Call ACE_OS::send, not ACE_OS::write, on HP-UX. - This makes it pick up the EAGAIN->EWOULDBLOCK change. - - * tests/TSS_Test.cpp: Avoid doing ACE_Thread::keyfree on where - ACE_HAS_PTHREADS_DRAFT4 or ACE_HAS_PTHREADS_DRAFT6 (unless - ACE_HAS_TSS_EMULATION is also defined) since ACE_Thread::keyfree - will get ENOTSUP anyway. - -Fri Mar 02 17:50:40 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> - - * ace/QtReactor.cpp: - Thanks to Stefan Scherer <stefan_scherer@sepp.de> for reporting - and fixing the problem - crashing of TAO/tests/QtTests/ client - example after moving the slider. - -Fri Mar 02 15:35:40 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/MEM_Acceptor.cpp: - * ace/MEM_Acceptor.h: - * ace/MEM_Addr.cpp: - * ace/MEM_Addr.h: - * ace/MEM_Connector.cpp: - * ace/MEM_Connector.h: - * ace/MEM_IO.cpp: - * ace/MEM_IO.h: - * ace/MEM_SAP.cpp: - * ace/MEM_SAP.h: - * ace/MEM_Stream.cpp: - * ace/MEM_Stream.h: Disabled MEM_Stream support if one chooses - not to support position independent pointers. - -Fri Mar 02 13:17:36 2001 Steve Huston <shuston@riverace.com> - - * examples/IOStream/server/iostream_server.cpp (main): Removed the - call to register peer_acceptor with the reactor. The - acceptor::open call already registers for ACCEPT_MASK. Prevents - leaving a hanging READ_MASK registered after the acceptor is - destroyed when main() returns. This fixes Bugzilla # 801. Thanks - to Pim Philipse <pph@rogan-medical.com> for reporting this. - - * THANKS: Added Pim Philipse to the Hall of Fame. - -Fri Mar 02 12:24:27 2001 Steve Huston <shuston@riverace.com> - - * ace/config-hpux-10.x-hpc++.h: If compiling without exceptions - (+noeh) then don't set ACE_HAS_EXCEPTIONS (don't set - ACE_NEW_THROWS_EXCEPTIONS either). - - * ace/Thread_Manager.cpp (join_thr): Moved the code for - ACE_HAS_PTHREADS_DRAFT4 that does a pthread_detach from here to - ACE_OS::thr_join (which this function calls) so that - ACE_Thread::join also causes a pthread_detach. This is needed on - Pthreads Draft 4 (HP-UX 10.x) to properly clean up the thread - storage and avoid leaking memory. Thanks to Vladimir Kondratiev - <vladimir.kondratiev@intel.com> for reporting this and providing - excellent test cases to help resolve it quickly. - - * ace/OS.i (ACE_OS::thr_join): Added the code that was removed from - ACE_Thread_Manager::join_thr, above. - - * ace/Event_Handler.cpp (~ACE_Event_Handler): Add an ACE_Errno_Guard - around purge_pending_notifications to prevent against an ENOTSUP - from purge_pending_notifications. - -Thu Mar 1 17:02:10 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/PerlACE/Process_Unix.pm: - * bin/PerlACE/Process_Win32.pm: - - Fixed up the Spawn code to use the Executable () instead of - {EXECUTABLE}, since that's how we get the adjusted name (with - .exe and stuff). And also skipped the file existance with - IgnoreExeSubDir, since IgnoreExeSubDir is often used when you - need to find the program in the path. - -Thu Mar 1 15:48:10 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/fuzz.pl: - - Fuzz was being a bit to eager with the class matching in the - TRACE test. It was having problems with something like: - - char *foo::bar () - - since it thought the class was "char *foo" instead of just - "foo". - - But it is feeling muuuuuuch better now. - -Thu Mar 1 13:18:07 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/fuzz.pl: - - Added two new tests: - - - absolute ACE_wrappers test: - - Check for ~schmidt/ACE_wrappers in html files. These should - be relative links since these html files already exist in - their own ACE_wrappers tree. - - - TRACE test: - - Does a check on whether the ACE_TRACE or ACE_OS_TRACE actually - refers to the function/method it is in. - - And expanded the checks in the bad run_test test (level 6) - - * bin/PerlACE/Process_Unix.pm: - * bin/PerlACE/Process_Win32.pm: - - - Added checks for file existence before running. - - Added IgnoreExeSubDir option. - - Added TerminateWaitKill method. - - * bin/pippen.pl: (added) - * bin/PerlACE/MSProject.pm: (added) - * bin/PerlACE/MSProject/DSP.pm: (added) - * bin/PerlACE/MSProject/VCP.pm: (added) - - There is nothing to see here...please be on your way. - - It isn't like this is a super top secret project to - replace msvc_auto_compile.pl with something that works - better and also has a cool code-name that is shorter - than "msvc_auto_compile.pl". - - But remember, you didn't hear that from me. - -Thu Mar 1 10:54:23 2001 Ossama Othman <ossama@uci.edu> - - * bin/auto_run_tests.lst: - - Added the TAO Codec to the list of tests to run. - - * include/makeinclude/wrapper_macros.GNU: - - Fixed all incorrect uses of CFLAGS and CCFLAGS where - preprocessor macros were defined. Preprocessor macros should be - defined in the CPPFLAGS variable. - - Define ACE_USE_RCSID in non-debug builds (i.e. debug=0). - -Thu Mar 01 07:29:58 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - Fixed typos in the Service_Context_Manipulation test. It was - running in platforms where it shouldn't. - -Thu Mar 01 07:07:03 2001 Christopher Kohlhoff <chris@kohlhoff.com> - - * include/makeinclude/recurse.bor: - Added support for makefiles which contain multiple targets. - - * examples/IPC_SAP/SOCK_SAP/Makefile.bor: - * examples/Log_Msg/Makefile.bor: - * examples/Map_Manager/Makefile.bor: - * examples/Mem_Map/file-reverse/Makefile.bor: - * examples/RMCast/Send_File/Makefile.bor: - * examples/Service_Configurator/IPC-tests/client/Makefile.bor: - * examples/Threads/Makefile.bor: - * netsvcs/clients/Logger/Makefile.bor: - * tests/Makefile.bor: - * tests/RMCast/Makefile.bor: - Updated to work with new multi-target makefile support. - -Wed Feb 28 22:58:50 2001 Carlos O'Ryan <coryan@uci.edu> - - * html/index.html: - Reference */index.html directly, instead of assuming that the - web browser will use index.html as the default file, this also - works better when browsing locally. Thanks to Alain Decamps - <Alain.Decamps@pidpa.be> for pointing this out. - -Wed Feb 28 16:41:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * docs/bugzilla-build-setup.html: - - Updated the section about the scoreboard and added a - placeholder for Win32 nightly build information. - -Wed Feb 28 16:04:14 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * bin/nightlybuilds/builds.lst (TYPE): Added a build with AMI and - Messaging support disabled for the nightly builds. - -Wed Feb 28 15:35:59 2001 Joe Hoffert <joeh@cs.wustl.edu> - - * docs/bugzilla-build-setup.html: - Added html file outlining steps for adding a bugzilla nightly - build. - -Wed Feb 28 00:25:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/auto_run_tests.lst: - - The examples/POA/Adapter_Activator/run_test.pl test was being - run twice. In fairness to all the other tests that only get to - run once, I removed the second instance. - -Tue Feb 27 17:31:48 2001 Steve Huston <shuston@riverace.com> - - * include/makeinclude/platform_hpux_aCC.GNU: Turn on -D_REENTRANT for - the threads=0 build - this enables the reentrant functions which - are present, threads or not. It does not turn on threads, which - are instead enabled by -D_POSIX_C_SOURCE=199506L. - - * ace/config-hpux-11.00.h: Added ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - - * ace/OS.i (rand_r): Added 'defined (HPUX_11)' to the ways to get to - the POSIX.1c-conformant version of rand_r. Allows clean compile - on HP-UX 11 without thread support. Also lined up some - misaligned #if/else/endif lines to make it easier to find one's - way through. - - * ace/OS_Dirent.inl (readdir_r): Added 'defined (HPUX_11)' to the - ways to get the POSIX.1c-conformant version of readdir_r. Allows - clean compile on HP-UX 11 without thread support. - -Tue Feb 27 11:38:38 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * performance-tests/TCP/tcp_test.cpp (main): Zapped the - non-existent '-f' option. Thanks to Mike Curtis for reporting - this. - - * performance-tests/TCP/tcp_test.cpp (main): Check for improper - bufsz. Thanks to Mike Curtis for reporting this. - - * performance-tests/TCP/tcp_test.cpp (main): Documented the '-t' - option, which specifies the number of threads. - - * performance-tests/TCP/README: Fixed a typo. Thanks to - Mike Curtis for reporting this. - -Tue Feb 27 10:51:18 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * bin/auto_run_tests.lst: Added the AMI tests to the daily - builds. - -Tue Feb 27 10:23:20 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * Makefile: Changed the ChangeLog listing in the CONTROLLED_FILES - to ChangeLog*. This should help us to avoid missing ChangeLog - entries in the beta distribution, just about every time we split - and add a ChangeLog. - -Mon Feb 27 07:39:16 2001 Chad Elliott <elliott_c@ociweb.com> - - * include/makeinclude/platform_hpux_aCC.GNU: - - Removed suppression of Future Error 129. - Removed the use of CFLAGS. - - * ace/OS.h: - * ace/config-hpux-11.00.h: - Modification to remove system header macro definition conflicts. - This change does not suppress the conflicts, but does an undef - of the two conflicting macros before includeing tcp.h. Thanks - to Sam Chong <sam@i2i-inc.com> for reporting this problem. - -Mon Feb 26 19:01:16 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * ace/Logging_Strategy.{h,cpp}: Added a new -k option to - set the logging key via the ACE_Logging_Strategy. Thanks to - Chris Kohlhoff <chris@kohlhoff.com> for contributing this. - -Mon Feb 26 18:18:38 2001 Steve Huston <shuston@riverace.com> - - * ace/SString.i - (ACE_CString::find (const char *s, int pos) const): - (ACE_CString::find (char c, int pos) const): - (ACE_SString::find (const char *s, int pos) const): - (ACE_SString::find (char c, int pos) const): - (ACE_WString::find (const ACE_WSTRING_TYPE *s, int pos) const): - If match is found, return index from start of string, not from - 'pos'. Matches the C++ string standard, which was the model for - these classes. Thanks to Glen Osterhout <gosterho@elronsw.com> - for this fix. - - * ace/SString.h: Clarified comments on return value for above - functions. - - * tests/SString_Test.cpp: Changed to look for the correct return - from the npos tests of the functions above. - - * THANKS: Added Glen Osterhout to the Hall of Fame. - -Mon Feb 26 15:01:55 2001 Darrell Brunsch <brunsch@uci.edu> - - * tests/DLL_Test_Impl.dsp: - * tests/version_tests/DLL_Test_Impl.dsp: (removed) - Me thinks that the Release and Static configurations should - also compile, and me thinks that it is now fixed. - -Mon Feb 26 12:29:45 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/ARGV.h: Clarify that the int add (const ACE_TCHAR *next_arg) - method assumes ownership of <next_arg>, rather than copying it. - Thanks to Steve Hespelt <shespelt@bear.com> for reporting this. - Fixes [Bug 807]. - - The generated version_tests dsp didn't work (since DLL_Test_Impl - creates a library). Manually created the configurations in the - tests/DLL_Test_Impl.dsp version instead. - -Mon Feb 26 15:54:33 2001 Phil Mesnier <mesnier_p@ociweb.com> - - Port to Unixware 7 (7.1.1) Using UDK CC (7.1.1.b) - - * docs/tutorials/013/message_queue.cpp: - * tests/Malloc_Test.cpp: - - Fixed errors in #pragma instiate lines including removal of ';', - mispellings - - * ace/config-all.h: - - Added definition of Unixware UDK for definition of ACE_NOTREACHED() - - * ace/config-unixware-7.1.0.udk.h: - * include/makeinclude/platform_unixware_udk.GNU: - - New configuration files for building on Unixware 7 with UDK CC. - -Mon Feb 26 12:29:45 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/ARGV.h: Clarify that the int add (const ACE_TCHAR *next_arg) - method assumes ownership of <next_arg>, rather than copying it. - Thanks to Steve Hespelt <shespelt@bear.com> for reporting this. - Fixes [Bug 807]. - -Mon Feb 26 12:27:46 2001 Jeff Parsons <parsons@cs.wustl.edu> - - * ace/CDR_Stream.h: - * ace/CDR_Stream.i: - Added method to reset the byte order in class OuputCDR. This - will be used by a gateway to set the byte order of a reply to a - reqest it has handled to one different than the gateway's own - byte order, if necessary. It should be called while the stream - is still empty, that is, before any part of the reply, including - the header, has been marshaled. - -Mon Feb 26 12:07:00 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/Memory_Pool.cpp: Moved the copying of MMAP flags up before - setting the MAP_FIXED flag. Thanks to <rhuber@amadeus.net> for - reporting this. [Bug 752] - -Mon Feb 26 09:29:36 2001 Carlos O'Ryan <coryan@cs.wustl.edu> - - * ace/RB_Tree.h: - Fully qualified enum name. This fixes problems on gcc-272 builds. - -Mon Feb 26 00:19:28 2001 Darrell Brunsch <brunsch@uci.edu> - - Time to do some spring cleaning... - - * tests/version_tests/Config_Test.dsp: (added) - * tests/version_tests/DLL_Test_Impl.dsp: (added) - * tests/version_tests/Log_Msg_Test.dsp: (added) - * tests/version_tests/Message_Queue_Test_Ex.dsp: (added) - * tests/version_tests/version_tests.dsw: - - Updated the version_tests dir with create_vt_dsps.pl. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - * netsvcs/lib/netsvcs.dsp: - * netsvcs/servers/servers.dsp: - * tests/ACE_Init_Test.dsp: - * tests/Atomic_Op_Test.dsp: - * tests/Auto_IncDec_Test.dsp: - * tests/Barrier_Test.dsp: - * tests/Basic_Types_Test.dsp: - * tests/Buffer_Stream_Test.dsp: - * tests/CDR_Array_Test.dsp: - * tests/CDR_File_Test.dsp: - * tests/CDR_Test.dsp: - * tests/Cache_Map_Manager_Test.dsp: - * tests/Cached_Accept_Conn_Test.dsp: - * tests/Cached_Conn_Test.dsp: - * tests/Capabilities_Test.dsp: - * tests/Collection_Test.dsp: - * tests/Config_Test.dsp: - * tests/Conn_Test.dsp: - * tests/DLL_Test.dsp: - * tests/DLList_Test.dsp: - * tests/Dirent_Test.dsp: - * tests/Dynamic_Priority_Test.dsp: - * tests/Enum_Interfaces_Test.dsp: - * tests/Env_Value_Test.dsp: - * tests/Future_Set_Test.dsp: - * tests/Future_Test.dsp: - * tests/Handle_Set_Test.dsp: - * tests/Hash_Map_Bucket_Iterator_Test.dsp: - * tests/Hash_Map_Manager_Test.dsp: - * tests/High_Res_Timer_Test.dsp: - * tests/IOStream_Test.dsp: - * tests/Lazy_Map_Manager_Test.dsp: - * tests/Log_Msg_Test.dsp: - * tests/MEM_Stream_Test.dsp: - * tests/MM_Shared_Memory_Test.dsp: - * tests/MT_Reactor_Timer_Test.dsp: - * tests/MT_SOCK_Test.dsp: - * tests/Malloc_Test.dsp: - * tests/Map_Manager_Test.dsp: - * tests/Map_Test.dsp: - * tests/Mem_Map_Test.dsp: - * tests/Message_Block_Test.dsp: - * tests/Message_Queue_Notifications_Test.dsp: - * tests/Message_Queue_Test.dsp: - * tests/Message_Queue_Test_Ex.dsp: - * tests/Naming_Test.dsp: - * tests/New_Fail_Test.dsp: - * tests/Notify_Performance_Test.dsp: - * tests/OS_Test.dsp: - * tests/Object_Manager_Test.dsp: - * tests/OrdMultiSet_Test.dsp: - * tests/Pipe_Test.dsp: - * tests/Priority_Buffer_Test.dsp: - * tests/Priority_Reactor_Test.dsp: - * tests/Priority_Task_Test.dsp: - * tests/Process_Manager_Test.dsp: - * tests/Process_Mutex_Test.dsp: - * tests/Process_Strategy_Test.dsp: - * tests/RB_Tree_Test.dsp: - * tests/Reactor_Exceptions_Test.dsp: - * tests/Reactor_Notify_Test.dsp: - * tests/Reactor_Performance_Test.dsp: - * tests/Reactor_Timer_Test.dsp: - * tests/Reactors_Test.dsp: - * tests/Reader_Writer_Test.dsp: - * tests/Recursive_Mutex_Test.dsp: - * tests/Refcounted_Auto_Ptr_Test.dsp: - * tests/Reverse_Lock_Test.dsp: - * tests/SOCK_Connector_Test.dsp: - * tests/SOCK_Send_Recv_Test.dsp: - * tests/SOCK_Test.dsp: - * tests/SPIPE_Test.dsp: - * tests/SString_Test.dsp: - * tests/SV_Shared_Memory_Test.dsp: - * tests/Semaphore_Test.dsp: - * tests/Service_Config_Test.dsp: - * tests/Sigset_Ops_Test.dsp: - * tests/Simple_Message_Block_Test.dsp: - * tests/Svc_Handler_Test.dsp: - * tests/TSS_Test.dsp: - * tests/Task_Test.dsp: - * tests/Thread_Manager_Test.dsp: - * tests/Thread_Mutex_Test.dsp: - * tests/Thread_Pool_Reactor_Test.dsp: - * tests/Thread_Pool_Test.dsp: - * tests/Time_Service_Test.dsp: - * tests/Time_Value_Test.dsp: - * tests/Timeprobe_Test.dsp: - * tests/Timer_Queue_Test.dsp: - * tests/Tokens_Test.dsp: - * tests/UPIPE_SAP_Test.dsp: - * tests/Upgradable_RW_Test.dsp: - - Removed the Alpha configurations. I don't think we've actually - looked at these for over a year, and they are missing from a lot - of projects. Thankfully, they are easy to recreate if they are - needed. - - * ACE-INSTALL.html: - - Changed the Windows NT Alpha section to mention that we no - longer have configurations out of the box for Win32/Alpha, they - must be recreated if needed. - - * WindozeCE/ACEApp.cpp: (removed) - * WindozeCE/ACEApp.h: (removed) - * WindozeCE/README: (removed) - * WindozeCE/StdAfx.cpp: (removed) - * WindozeCE/StdAfx.h: (removed) - * WindozeCE/WindozeCE.aps: (removed) - * WindozeCE/WindozeCE.clw: (removed) - * WindozeCE/WindozeCE.cpp: (removed) - * WindozeCE/WindozeCE.dsp: (removed) - * WindozeCE/WindozeCE.h: (removed) - * WindozeCE/WindozeCE.rc: (removed) - * WindozeCE/WindozeCEDlg.cpp: (removed) - * WindozeCE/WindozeCEDlg.h: (removed) - * WindozeCE/resource.h: (removed) - * WindozeCE/res/WindozeCE.ico: (removed) - * WindozeCE/res/WindozeCE.rc2: (removed) - - No longer used. - - * Makefile: - - Removed WindozeCE from CONTROLLED_FILES. - - * tests/WinCE/Atomic_Op_Test.dsp: (removed) - * tests/WinCE/Barrier_Test.dsp: (removed) - * tests/WinCE/Basic_Types_Test.dsp: (removed) - * tests/WinCE/Buffer_Stream_Test.dsp: (removed) - * tests/WinCE/Conn_Test.dsp: (removed) - * tests/WinCE/DLL_Test.dsp: (removed) - * tests/WinCE/Enum_Interfaces_Test.dsp: (removed) - * tests/WinCE/Future_Test.dsp: (removed) - * tests/WinCE/Handle_Set_Test.dsp: (removed) - * tests/WinCE/Hash_Map_Manager_Test.dsp: (removed) - * tests/WinCE/MT_Reactor_Timer_Test.dsp: (removed) - * tests/WinCE/MT_SOCK_Test.dsp: (removed) - * tests/WinCE/Map_Manager_Test.dsp: (removed) - * tests/WinCE/Mem_Map_Test.dsp: (removed) - * tests/WinCE/Message_Block_Test.dsp: (removed) - * tests/WinCE/Message_Queue_Notifications_Test.dsp: (removed) - * tests/WinCE/Message_Queue_Test.dsp: (removed) - * tests/WinCE/Notify_Performance_Test.dsp: (removed) - * tests/WinCE/OrdMultiSet_Test.dsp: (removed) - * tests/WinCE/Priority_Buffer_Test.dsp: (removed) - * tests/WinCE/Priority_Task_Test.dsp: (removed) - * tests/WinCE/Reactor_Exceptions_Test.dsp: (removed) - * tests/WinCE/Reactor_Notify_Test.dsp: (removed) - * tests/WinCE/Reactor_Performance_Test.dsp: (removed) - * tests/WinCE/Reactor_Timer_Test.dsp: (removed) - * tests/WinCE/Reactors_Test.dsp: (removed) - * tests/WinCE/Reader_Writer_Test.dsp: (removed) - * tests/WinCE/Recursive_Mutex_Test.dsp: (removed) - * tests/WinCE/SOCK_Connector_Test.dsp: (removed) - * tests/WinCE/SOCK_Test.dsp: (removed) - * tests/WinCE/SString_Test.dsp: (removed) - * tests/WinCE/Semaphore_Test.dsp: (removed) - * tests/WinCE/Sigset_Ops_Test.dsp: (removed) - * tests/WinCE/Simple_Message_Block_Test.dsp: (removed) - * tests/WinCE/TSS_Test.dsp: (removed) - * tests/WinCE/Task_Test.dsp: (removed) - * tests/WinCE/Thread_Manager_Test.dsp: (removed) - * tests/WinCE/Thread_Mutex_Test.dsp: (removed) - * tests/WinCE/Thread_Pool_Test.dsp: (removed) - * tests/WinCE/Time_Value_Test.dsp: (removed) - * tests/WinCE/Timer_Queue_Test.dsp: (removed) - * tests/WinCE/ce_tests.dsw: (removed) - - Removed these Windows CE Toolkit for Visual C++ files. - -Mon Feb 26 00:15:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * tests/DLL_Test_Impl.dsp: - - Made sure the Code Generation settings were correct. - -Sun Feb 25 19:40:11 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/ACEutils.pm (CheckForConfig): - This routine was not removing all the -Config options from the - command-line, causing problems in some of the tests. - -Sun Feb 25 16:33:26 2001 Darrell Brunsch <brunsch@uci.edu> - - * tests/DLL_Test.cpp: - - Left the DLL end with a d in debug mode, but changed - the test to add the d when _DEBUG and ACE_WIN32 is - defined. Test should now work again on Win2000_Debug. - -Sun Feb 25 11:28:06 2001 Darrell Brunsch <brunsch@uci.edu> - - * tests/run_test.pl: - - When there are errors in the log, print out the entire - log. This should make it much easier to understand - problems in the nightly build logs. - -Sun Feb 25 09:04:43 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/DLL_Test.cpp: - Accidentally left the 'd' suffix in the name of the DLL. - -Sat Feb 24 22:58:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/msvc_auto_compile.pl: - * TAO/TAOACE.dsw: - * TAO/TAOACE_Static.dsw: - * Static_Performance.dsw: - - Removed references to gperf_lib.dsp - - * TAO/version_tests.dsw: (removed) - - This was still referring to orbsvcs.dsp, which shows that - it is way out of date (and not used). Zapped. - -Sat Feb 24 20:59:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * apps/gperf/src/gperf.dsp: - * apps/gperf/src/gperf.dsw: - * apps/gperf/src/gperf_lib.dsp: (removed) - - Merged gperf into one project. This will bring the - structure in line with the Makefiles. - -Sat Feb 24 19:28:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS.i: - - Fixed my recent changes to ACE_OS::dlsym () to work on - Windows CE. - -Sat Feb 24 17:50:38 2001 Darrell Brunsch <brunsch@uci.edu> - - * tests/DLL_Test.cpp: - - OBJ_PREFIX was being created by attaching a char string to - a ACE_TCHAR string. Needed to add ACE_TEXT to the first - string for compilation on ACE_USES_WCHAR. - - * tests/DLL_Test_Impl.dsp: - - Changed the internal name to "DLL_Test DLL" to make sure - this gets compiled in the first pass by msvc_auto_compile.pl. - - * tests/run_test.pl: - - Added a check for LM_WARNINGs in log files. Let's see if - there have been any hidden (DLL_Test actually was producing - a warning on Windows, but Carlos's fix already got rid of it, - Yay!). - -Sat Feb 24 15:44:58 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/tests.dsw: - * tests/DLL_Test_Impl.dsp: - Add new project file for the shared library used in the test. - - * tests/DLL_Test.cpp: - * tests/DLL_Test_Impl.cpp: - Change the Win32 version to load a shared library instead of the - exe. - -Sat Feb 24 14:07:11 2001 Darrell Brunsch <brunsch@uci.edu> - - * tests/Thread_Pool_Reactor_Test.cpp: - - Did a careful study of what this test was doing in regards to - sending wide-character strings, and made it consistent. The - most troublesome aspect was the fact that the length is encoded - in the shutdown string ("\011shutdown") which meant that I had - to send the length in characters, not in bytes. This should - really fix [Bug 537]. - -Sat Feb 24 14:37:00 2001 Craig Rodrigues <crodrigu@bbn.com> - - * ace/config-g++-common.h - gcc 2.97 and higher require the use of the std namespace for - iostrams - -Sat Feb 24 10:27:04 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - Disable the interceptor tests when the ORB is compiled without - interceptor support. - - * tests/run_test.lst: - Disable the Reactor_Notify_Test on single threaded builds, it - uses threads. - - * bin/nightlybuilds/scoreboard_update.pl: - Fixed usage message. - -Sat Feb 24 09:45:18 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/run_test.lst: - Disable the DLL_Test on KCC/Linux builds. The test runs - normally, but crashes on shutdown(), it appears as if the - run-time system is invoking the destructors after the library is - unloaded. - - * tests/Makefile: - * tests/Makefile.DLL_Test: - * tests/DLL_Test.h: - * tests/DLL_Test.cpp: - * tests/DLL_Test_Impl.h: - * tests/DLL_Test_Impl.cpp: - Cleanup code, and truly separate the shared library code to a - completely new separate file. - -Sat Feb 24 09:51:45 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_compile: - Pass the -Config options to each script, this helps the - $ACE_ROOT/bin/run_test.pl script that needs to disable some - tests in certain configurations. - -Sat Feb 24 08:21:48 2001 David L. Levine <levine@cs.wustl.edu> - - * include/makeinclude/platform_vxworks5.x_g++.GNU: - added -fno-implicit-templates on Tornado II for Intel 386 - family targets. Thanks to Albert Wijnja <Albert.Wijnja@meco.nl> - for reporting that static template data members weren't really on - VxWorks/386, and to Greg Holtmeyer <greg.holtmeyer@windriver.com> - for confirming that -fno-implicit-templates should work with - the Tornado II g++. [Bug 658] - -Thu Feb 22 15:59:04 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * ace/OS.i: The ACE_TRACE call for ACE_OS::gmtime identified the - function as "localtime". This is now fixed. Thanks to Mason - Deaver <mason.deaver@tripointglobal.com> for reporting this. - -Fri Feb 23 19:44:36 2001 Krishnakumar B <kitty@cs.wustl.edu> - - * ACE version 5.1.13 released. - -Thu Feb 22 12:28:15 2001 Irfan Pyarali <irfan@cs.wustl.edu> - - * ace/TP_Reactor.cpp (handle_events): Here is the description of - how things were working and where the problem was: In the - TP_Reactor there is one leader thread waiting in select() and - the others waiting on the token. During deactivation(), the - <deactivation_> flag is set on the reactor, signal_all_threads() - is called on the token, and an empty notification is send to the - current leader thread. signal_all_threads() sets the - <signal_all_threads_> flag on the Token when there are waiters - on the Token (does nothing if there are no waiters). This - scheme worked fine when there were leader and follower threads - waiting. When a new leader is chosen, it returns the magic - number 2 from token.acquire_read() and hence exits gracefully - from the handle_events(). However, the problem was that when - some (or all) of the TP threads are busy running upcalls, - signal_all_threads() was a no-op and the magic number 2 was not - returned from token.acquire_read() and hence the exit from - handle_events() was flagged as an error. - - The fix is as described below: - - (1) ACE_Token::signal_all_threads() does not make sense. The - token is a mutex, not a condition variable. Therefore, it does - not make sense to have a signal_all_threads() methods. Plus I - believe that the method does not do as advertised. Therefore, I - removed this method from the token class. - - (2) There is no need to signal all the threads in the - TP_Reactor. Marking the Reactor as closed and signaling the - leader thread is enough. The leader thread will wake up to - handle the empty event, the next leader will see that the - Reactor is closed and exit gracefully. This will continue until - all the waiters are drained. - - (3) With the above change, there is no need to check for an - magic returns from token.acquire_read(). When a thread gets the - token, it checks the deactivation flag before proceeding. If - the Reactor is closed, it gracefully exits. Otherwise, it - continues as leader. - - (4) Since there is no need to call token.signal_all_threads(), - ACE_TP_Reactor::wakeup_all_threads() can be removed since it is - now the same as ACE_Select_Reactor_T::wakeup_all_threads(). - - Note that this change should help with making - Thread_Pool_Reactor_Test run without shutdown errors. - - * ace/Select_Reactor_T.i (deactivate): The setting of the - <deactivated_> flag and waking up of all the threads should be - atomic. I am being picky about this one but I think am I right. - Also added the guard to the accessor. - -Thu Feb 22 08:51:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS.i: - - Bleh. Changed an && to || to make sure we get a symbolname - variable for non-Unicode Win32. - - "He who lives without committing any folly is not so - wise as he thinks" - La Rochefoucauld - -Thu Feb 22 08:43:30 2001 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/rules.local.GNU: - Add SunWS_cache and ir.out to the list of files removed by - the realclean pseudo-target. This directory is used by Sun/CC - 5.0 (and Forte), if not removed the information there can become - stale, and break the builds. - This should fix the Sun/CC 5.0 nightly builds. - -Thu Feb 22 07:51:36 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/OS.i: Reverted the change "Thu Feb 22 03:31:06 2001 - Krishnakumar B <kitty@ace.cs.wustl.edu> ". - -Thu Feb 22 03:31:06 2001 Krishnakumar B <kitty@ace.cs.wustl.edu> - - * ace/OS.i (dlsym): - Hopefully fixed the Win32 builds. Removed a extra ! in the - #ifdef. - -Thu Feb 22 02:58:36 2001 Krishnakumar B <kitty@ace.cs.wustl.edu> - - * VERSION: - * PROBLEM-REPORT-FORM: - * ace/Version.h: - Reverted the changes and restored the old versions of - these files as the beta build script was killed. Pain :-( - -Wed Feb 21 20:10:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS.i: - * tests/DLL_Test.cpp: - * tests/Thread_Pool_Reactor_Test.cpp: - - Fixed the remaining problems with the Win2000_Unicode tests. - [Bug 537] - -Tue Feb 20 21:19:39 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Svc_Conf.h: - Add ACE_Export macro for ace_create_service_type() it is used - outside the library now. - -Tue Feb 20 06:34:26 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * include/makeinclude/platform_sunos5_g++.GNU: Make sure to explicitly - set ACE_HAS_GNUG_PRE_2_8. Thanks to Christian von Mueffling - <cvm@aiss.de> for reporting this. - - * ace/Thread_Manager.cpp (cancel_grp): Fixed a typo in - the ACE_TRACE macro. Thanks to Mike Curtis for reporting this. - -Mon Feb 19 16:38:08 2001 Krishnakumar B <kitty@cs.wustl.edu> - - * ace/Asynch_Acceptor.{h,cpp}: - Added method void handle (ACE_HANDLE) and made it call the base - class's handle(ACE_HANDLE) method to remove warning about - partial overloading. Fix suggested by Irfan. - -Sun Feb 18 21:55:16 2001 Krishnakumar B <kitty@cs.wustl.edu> - - * ace/OS.h: - Added an extern "C" void ace_mutex_lock_cleanup_adapter before - the definition of ACE_PTHREAD_CLEANUP_PUSH to avoid warnings on - SunCC 5.x. - -Sun Feb 18 17:16:41 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * netsvcs/clients/Tokens/manual/manual.cpp (main), - * tests/Tokens_Test.cpp (main): Reordered the #ifdefs for the - ACE_HAS_TOKENS_LIBRARY stuff. Thanks to Kitty for reporting - this. - -Sun Feb 18 16:28:45 2001 Chris Gill <cdgill@cs.wustl.edu> - - * ace/RB_Tree.h: Changed order of method declarations to (hopefully) - dodge an internal compiler error on VxWorks. - -Sun Feb 18 09:59:18 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * netsvcs/clients/Tokens: - * netsvcs/servers/main.cpp (main): - * netsvcs/servers/svc.conf: - * netsvcs/lib/Token_Handler: Only compile this stuff if the - ACE_HAS_TOKENS_LIBRARY macro is enabled. Thanks to Carlos - for reporting this. - - * ace/Object_Manager.cpp: Added a check for ACE_HAS_TOKENS_LIBRARY - so we can skip initializing certain things if that macro is - undefined. - - * ace/Token_Collection.*: - * ace/Token_Invariants.*: - * ace/Token_Manager.*: - * ace/Local_Tokens.*: - * ace/Remote_Tokens.*: - * ace/Token_Request_Reply.*: - Only compile these files if ACE_HAS_TOKENS_LIBRARY is enabled - since this functionality does not appear to be widely used and - yet it takes up space. - - * tests/Tokens_Test.cpp (main): Only run this test if - ACE_HAS_TOKENS_LIBRARY is defined. - -Sat Feb 17 17:23:46 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/SOCK_Dgram_Mcast.cpp: - - Integrated a fix from Keith Nicewarner <knicewar@erg.sri.com> - In effect, this reverts the multicast code changed on - Fri Jan 26 11:18:15 2001 Douglas C. Schmidt ... - for all platforms except linux. - -Sat Feb 17 15:52:09 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/run_all_list.pm: - * tests/run_tests.pl: - Remove obsolete scripts. - -Sat Feb 17 13:26:17 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/POSIX_Asynch_IO.cpp (thread_function): Make sure to cast - -1 to void * since that's the signature of the method. Thanks - to Bala for reporting this. - - * ace/POSIX_Asynch_IO.cpp (thread_function): Zapped the unused - result local variable and also changed the logic to bailout if - handle_events() returns -1. This fixes a warning reported by - KCC. - -Fri Feb 16 17:39:16 2001 Mayur Deshpande <mayur@ics.uci.edu> - - * ace/config-qnx-rtp.h: Commented out ACE_HAS_NONSTATIC_OBJECT_MANAGER. - Thanks to Andrew Olson <andrew.olson@lmco.com> for the suggestion. - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: Added -fexceptions to - CCFLAGS and 'exceptions=1' at end of file. - Thanks to Andrew Olson <andrew.olson@lmco.com> for the suggestion. - -Fri Feb 16 05:37:47 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Logging_Strategy.h: Updated the documentation to explain what - the various options mean. - - * tests/Log_Msg_Test.cpp (test_log_msg_features): Added - ACE_Log_Msg::PROCESS to a couple of priority_mask() calls to - make the test work correctly. Thanks to Kitty for reporting - this. - -Thu Feb 15 17:53:31 2001 Frank Hunleth <fhunleth@cs.wustl.edu> - - * ace/Thread_Manager.i: Simplified casting in - ACE_Thread_Descriptor::get_next per suggestion from Carlos. - -Thu Feb 15 14:57:59 2001 Frank Hunleth <fhunleth@cs.wustl.edu> - - * ace/Thread_Manager.i: Fixed typo in ACE_Thread_Descriptor::get_next. - -Thu Feb 15 11:33:55 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * tests/Refcounted_Auto_Ptr_Test.cpp (main): Always call ACE_OS::exit(0) - to make sure that this test terminates... - - * ace/Thread_Manager.i (get_next): Added an ACE_const_cast() to - make certain compilers happy. - - * ace/Logging_Strategy.cpp: Fixed some Unicode problems on Win32. - -Thu Feb 15 08:49:44 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/nightlybuilds/builds.lst: - Rename WashU builds so all the Debian builds appear together. - -Thu Feb 15 07:15:39 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Logging_Strategy.{h,cpp}: Added support to generate multiple - log files, rather than just two. Thanks to Orlando Ribeiro - <oribeiro@inescporto.pt> for this fix. - -Thu Feb 15 03:36:46 2001 Krishnakumar B <kitty@cs.wustl.edu> - - * bin/nightlybuilds/builds.lst (WEB): - Added a new build with TAO_MINIMUM linked statically. - -Wed Feb 14 05:28:59 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Thread_Manager.{h,i}: Added const to state(), grp_id(), - task(), get_next(), and self(). Thanks to Johnny Willemsen - <jwillemsen@remedy.nl> for reporting this. - -Tue Feb 13 17:51:47 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * tests/Makefile.bor (TESTS): Added Dirent_Test to list of TESTS. - Thanks to Mike Curtis for reporting this. - - * tests/run_tests.bat: Fixed a typo so that Dirent_Test will run. - Thanks to Mike Curtis for reporting this. - -Wed Feb 14 12:08:10 2001 Frank Hunleth <fhunleth@cs.wustl.edu> - - * ace/Read_Buffer.cpp: Fixed boundary condition in rec_read. - If record was a multiple of BUFSIZ and the record was - terminated with an EOF instead of a "term" character, - rec_read would return 0 instead of the actual data read in. - The problem was that the partial buffer fill size was being - checked instead of the total number of bytes read in. This - issue was noticed when trying to read in an IOR file in TAO - that was exactly 512 bytes (BUFSIZ * 2 on Win2k) long. - -Tue Feb 13 14:44:28 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/ace_wchar.inl: Changed several variable from type <size_t> - to type <int> as on 64-bit whistler, size_t and int are not the - same size which confuses 64-bit compiler. (Per Kitty's - request.) - -Tue Feb 13 10:23:31 2001 Steve Huston <shuston@riverace.com> - - * apps/JAWS/server/IO.{h cpp}: (Side-affect necessitated by addition of - handle () method and handle_ member to ACE_Handler). Moved the - handle_ member to the JAWS_Synch_IO class - it needs it, and - JAWS_Asynch_IO class has it by inheritance from ACE_Handler. Left - the handle () methods in JAWS_IO, but made them pure virtual, - implemented in JAWS_Synch_IO (implementation moved from JAWS_IO) - and in JAWS_Asynch_IO, where they forward up to ACE_Handler's - handle () methods. - -Mon Feb 12 18:18:05 2001 Frank Hunleth <fhunleth@cs.wustl.edu> - - * tests/Thread_Mutex_Test.cpp: - Modified test to use process mutexes for Win32 platforms - so that timed mutexes could be tested. - -Sun Feb 11 15:33:39 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/QoS/ACE_QoS_Export.h: - - Added ACE_AS_STATIC_LIBS support. - - * ace/QoS/ACE_QoS.dsp: - * ace/QoS/ACE_QoS_Lib.dsp: - - Fixed to comply with ACE standards. - -Sun Feb 11 10:50:10 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * include/makeinclude/platform_sunos5_g++.GNU (exceptions): - Only set the -fno-exceptions option if we're *not* using GCC - 2.7.2! Thanks to Pradeep for explaining how to do this. - -Sun Feb 11 10:15:08 2001 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Makefile.bor: - * ace/QoS/Makefile.bor: - * include/makeinclude/ace_flags.bor: - Added build support for QoS library with Borland compiler. - -Sat Feb 10 15:29:08 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Message_Block.h: - Improved documentation for the lenth(), size() and space() - methods. - -Sat Feb 10 07:19:37 2001 Christopher Kohlhoff <chris@kohlhoff.com> - - * include/makeinclude/outputdir.bor: - Removed the now out-of-date comment about pascal/non-pascal - build directories. - - * ace/config-win32-borland.h: - Added support for new ACE_HAS_VCL define to enable inclusion - of VCL header files. - -Fri Feb 9 16:47:44 2001 Pradeep Gore <pradeep@cs.wustl.edu> - - * ace/Makefile.am: - Removed references to the AQoSA files. - -Fri Feb 9 16:42:10 2001 Pradeep Gore <pradeep@cs.wustl.edu> - - * examples/QOS/client.dsp: - * examples/QOS/server.dsp: - Updated the corrected project files. - Thanks to Darrell for pointing this out. - -Thu Feb 8 19:25:03 2001 Carlos O'Ryan <coryan@uci.edu> - - * performance-tests/RPC/run_test.pl: - * performance-tests/TCP/run_test.pl: - * performance-tests/UDP/run_test.pl: - Add driver strings - -Thu Feb 08 19:18:36 2001 Angelo Corsaro <corsaro@cs.wustl.edu> - - * bin/auto_run_tests.lst: - - Removed comment from Exposed Policies test. The test has been fixed. - -Thu Feb 8 14:11:36 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/ws2tcpip.h: [Removed] - - I don't see any reason to have this file in ace; it is a system - header file. And from [Bug 722], our version is out of date anyway. - - * ace/OS.h: - - Changed to include system version of ws2tcpip.h - - * ace/Makefile.am: - * ace/ace-dll.icc: - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - - Removed references to ws2tcpip.h. - - * ace/SOCK_Connect.cpp: - - Changed get_ip_interfaces to remove a memory error. Thanks to - Viatcheslav Batenine <slavikb@infra2000.com> for helping out with - this. - - * ace/SOCK_Dgram_Mcast.cpp: - - It looks like the change made on: - - Fri Jan 26 11:18:15 2001 Douglas C. Schmidt ... - - doesn't work on Win32. Reverted back to the old scheme for Win32 - only. - -Thu Feb 8 00:34:57 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * include/makeinclude/platform_sunos5_g++.GNU: Added support for - -fno-exception when exceptions=0 is given to the Makefile. - Thanks to Christian v. Mueffling <cvm@aiss.de> for reporting - this. - -Wed Feb 7 23:02:46 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/SUN_Proactor.cpp: Fixed the cancel_aiocb() method and added a - new overridden cancel_aio() method. Thanks to Alexander Libman - <Alibman@baltimore.com> for contributing this. - -Thu Feb 8 02:09:05 2001 Pradeep Gore <pradeep@cs.wustl.edu> - - * examples/QOS/Makefile: - * examples/QOS/client.dsp: - * examples/QOS/server.dsp: - Modified to use the ACE_QoS lib. - * Receiver_QoS_Event_Handler.cpp: - * Sender_QoS_Event_Handler.cpp: - Added missing Log_Msg.h for ACE_DEBUG. - Other files were modified to reflect changed directory location - of AQosA imclude files. - -Thu Feb 8 00:17:43 2001 Pradeep Gore <pradeep@cs.wustl.edu> - - * ace/QoS_Decorator.cpp: - * ace/QoS_Session_Factory.cpp: - * ace/SOCK_Dgram_Mcast_QoS.cpp: - * ace/QoS_Decorator.h: - * ace/QoS_Session_Factory.h: - * ace/SOCK_Dgram_Mcast_QoS.h: - * ace/QoS_Manager.cpp: - * ace/QoS_Session_Impl.cpp: - * ace/SOCK_Dgram_Mcast_QoS.i: - * ace/QoS_Manager.h: - * ace/QoS_Session_Impl.h: - * ace/QoS_Session_Impl.i: - Moved the AQoSA classes to ace/QoS directory. - - * ace/Makefile: - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Removed the QoS related files, added QoS directory to build. - - * ace/Qos/Makefile - * ace/QoS/ACE_QoS.dsw: - * ace/QoS/ACE_QoS.dsp: - * ace/QoS/ACE_QoS_Lib.dsp: - * ace/QoS/ACE_QoS_Export.h: - Added Makefile and MSVC project files. - Thanks to Craig Rodrigues <crodrigu@bbn.com> for suggesting this - change and providing the patch. - -Wed Feb 7 11:34:56 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/Message_Queue_Test_Ex.cpp: - Fix build problems for single threaded environments. - -Wed Feb 7 09:03:22 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * apps/Gateway/Gateway/Event_Channel.cpp (initiate_acceptors): Fixed - incorrect if/else branching. Thanks to Lu Yunhai - <luyunhai@huawei.com> for reporting this. - -Tue Feb 6 23:43:49 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * apps/Gateway/Peer/Peer.cpp (await_events): Fixed the use of - %s to be %*s since the string may not be nul terminated! Thanks - to Lu Yunhai <luyunhai@huawei.com> for reporting this. - -Tue Feb 6 20:11:28 2001 Krishnakumar B <kitty@cs.wustl.edu> - - * include/makeinclude/platform_sunos5_sunc++.GNU: - - Remove double inclusion of $(CFLAGS) for Sun CC 5.0. - -Tue Feb 6 19:30:26 2001 Krishnakumar B <kitty@cs.wustl.edu> - - * ace/Malloc_T.cpp (shared_malloc): - Added a #ifdef to remove the warnings from Digital Tru64 cxx. This - is a temporary workaround. TODO: Change ACE_SEH_* macros so that such - hacks are unnecessary. - -Tue Feb 6 19:23:16 2001 Krishnakumar B <kitty@cs.wustl.edu> - - * include/makeinclude/platform_sunos5_sunc++.GNU: - Complete reverting the changes made by Irfan on Sat Jan 27 - 01:06:09 2001. This file was missed in the last revert done by me. - -Tue Feb 06 19:03:35 2001 Steve Huston <shuston@riverace.com> - - * include/makeinclude/platform_sunos5_sunc++.GNU: For C++ 5, make sure - to add CFLAGS into CCFLAGS, even if no other options are added. Else - things get built without -mt. - -Tue Feb 06 18:37:41 2001 Steve Huston <shuston@riverace.com> - - * tests/Thread_Mutex_Test.cpp: Changed wording of the message for - "timed acquire" not supported so as not to trip the error catcher - in run_tests.pl. - -Tue Feb 06 17:55:28 2001 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/post_completions.cpp: Allow this to - run with AIOCB_Proactor. - - * ace/Asynch_IO.{h cpp}: Added ACE_Handler::handle (ACE_HANDLE) - function to set the handle; changed ACE_HANDLE ACE_Handler::handle - to return the actual value. - - * ace/Asynch_Acceptor.cpp (handle_accept): Call ACE_Handler::handle - to set the handle value for the new handler before calling its - open() method. - -Tue Feb 06 17:16:43 2001 Steve Huston <shuston@riverace.com> - - * tests/MEM_Stream_Test.cpp: - * tests/MEM_Stream_Test.h: New file; moved definition of Echo_Handler - from MEM_Stream_Test.cpp to this file to make it visible to AIX - C++ 3.6.6 at template instantiation time. - -Mon Feb 5 16:19:20 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/ACE.cpp: ACE_TRACE ("ACE::basename") should be ACE_TRACE ("ACE::diname"). - Thanks to Lu Yunhai <luyunhai@huawei.com> for reporting this. - - * ace/Basic_Types.h: Changed the ACE_BIG_ENDIAN and ACE_LITTLE_ENDIAN - macros to use the form 0x0123 rather than 0123X. Thanks to - Craig Rodrigues <crodrigu@bbn.com> for helping find this - problem. - -Mon Feb 5 18:20:11 2001 Krishnakumar B <kitty@cs.wustl.edu> - - * ace/config-sunos5.5.h (ACE_USES_OLD_IOSTREAMS): - - Reverted the change to config-sunos5.5.h and turned on - ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION, - ACE_TEMPLLATES_REQUIRE_SOURCE and ACE_USES_OLD_IOSTREAMS for the - SunCC 5.0 compiler. - -Mon Feb 5 16:19:20 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * examples/RMCast/Send_File/Receiver.cpp (init): Replaced - a hard-coded file permission of 0644 with - ACE_DEFAULT_FILE_PERMS. Thanks to Chris Kohlhoff - <chris@kohlhoff.com> for reporting this. - -Mon Feb 5 13:00:17 2001 Krishnakumar B <kitty@cs.wustl.edu> - - * tests/Thread_Mutex_Test.cpp: (reported_notsup) - Removed a warning about defined but not used. - -Sat Feb 3 14:41:17 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS.h: - * ace/config-win32-msvc.h: - - Fixed problems with LLSEEK and ACE_stat on Windows CE. - -Sat Feb 3 14:12:36 2001 Darrell Brunsch <brunsch@uci.edu> - - * tests/Config_Test.cpp: - * tests/Config_Test.h: - * tests/Log_Msg_Test.cpp: - - Fixed ACE_USES_WCHAR problems. - -Fri Feb 02 18:36:42 2001 Steve Huston <shuston@riverace.com> - - * ace/config-linux-common.h: Added #define ACE_POSIX_AIOCB_PROACTOR - unless the user #defines ACE_POSIX_SIG_PROACTOR before including - config-linux.h. (At least prior to 2.4 kernels) queueing signals - across threads does not work - it fails silently, which breaks - basic functionality of the async model - like asynchronously - accepting TCP connections - and pretty much prevents multi-threaded - work with timers and probably other async operations. - - * examples/Reactor/Proactor/test_proactor.cpp: Disabled the ACE_DEBUG - calls that display message buffers - they're often too large and - overrun the ACE_Log_Msg buffers and crash the program. - -Fri Feb 2 08:38:37 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/WFMO_Reactor.cpp (handler): Set the existing_masks variable to 0 - to avoid warnings from static analysis tools. Thanks to Ivan - Murphy for reporting this. - -Thu Feb 01 22:00:17 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> - - * tests/Message_Queue_Test_Ex.cpp - - Fixed the bugs which were giving runtime error on - Win32 - removed "queue_type" from single_thread_performance_test - and performance_test functions. Now these funtions dont - have args. - - * tests/tests.dsw - - Just an update of the workspace. - -Thu Feb 1 21:00:57 2001 Frank Hunleth <fhunleth@cs.wustl.edu> - - * bin/auto_compile_win32.pl: - * bin/run_all_list.pm: - - Added TAO RT Mutex unit tests to auto build and test - lists. - -Thu Feb 01 18:52:27 2001 Angelo Corsaro <corsaro@cs.wustl.edu> - - * RTJava: - Added Directory for RTJava related research. Check the - ChangeLog included in the newly directory for more info. - -Thu Feb 01 18:23:17 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> - - * tests/Log_Msg_Test.dsp: - * tests/Config_Test.dsp: - - Added these files. - * tests/tests.dsw: - - Added the above two projects to the workspace. - -Thu Feb 1 18:01:26 2001 Luther J Baker <luther@cs.wustl.edu> - - * ace/OS.i (mutex_init): - - Removed call into PACE. - -Thu Feb 01 18:21:15 2001 Steve Huston <shuston@riverace.com> - - * tests/Thread_Mutex_Test.cpp: Only report "operation not supported" - once for a failed ACE_Thread_Mutex::acquire (ACE_Time_Value &). - Also, if it reports ENOTSUP while ACE_HAS_MUTEX_TIMEOUT is - defined, warns the user that it's probably the wrong setting. - -Thu Feb 01 17:36:28 2001 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/test_proactor3.cpp: Fixed a non-constant - array dimension and some output formatting. - -Thu Feb 01 17:07:35 2001 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/post_completions.cpp: Removed extraneous - 'd' from the 'count' display. - -Thu Feb 01 15:33:26 2001 Steve Huston <shuston@riverace.com> - - * ace/Reactor.h (purge_pending_notifications): - * ace/WFMO_Reactor.h (purge_pending_notifications): - * ace/Select_Reactor_Base.h (purge_pending_notifications): - Removed the default argument value - callers must now explicitly - specify a 0 ACE_Event_Handler* to remove all handler notifications. - Thanks to Edan Ayal <edana@bandwiz.com> for arguing this point. - -Thu Feb 1 09:57:41 2001 Jeff Parsons <parsons@cs.wustl.edu> - - * ace/SString.i: - - Changed behavior of ACE_WString::rep to be the same - as ACE_CString::rep, that is, to return an empty - (w)string rather than a null (w)string when the length - is 0. Thanks to Johnny Willemsen <johnny.willemsen@meco.nl> - for pointing out this discrepancy. - -Thu Feb 1 09:42:41 2001 Chad Elliott <elliott_c@ociweb.com> - - * include/makeinclude/platform_chorus4.x_g++.GNU: - - Modification to allow building for Chorus 4.x on x86. CPU will be - set to x86, but CLX_TYPE will be set to i486-elf-sysv4. - -Thu Feb 01 10:29:31 2001 Steve Huston <shuston@riverace.com> - - * ace/Synch.i (ACE_Null_Mutex::acquire (ACE_Time_Value&)): Removed - the arg name to fix "unused argument" warning from g++. - -Wed Jan 31 22:01:00 2001 Rick Stille <stille_r@ociweb.com> - * ace/OS.cpp(operator FILETIME): Corrected an error in the Jan 26 GHS - revision. The term "ACE_Time_Value::FILETIME_to_timval_skew" had been - omitted from the calculation. - -Wed Jan 31 18:43:26 2001 Krishnakumar B <kitty@cs.wustl.edu> - - * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test): - Removed the warning about queue_type using ACE_UNUSED_ARG. - -Wed Jan 31 17:27:35 2001 Steve Huston <shuston@riverace.com> - - * ace/Acceptor.cpp (ACE_Oneshot_Acceptor::handle_input): Unregister - the acceptor from the reactor before doing the shared_accept call - to guard against the use-case where the acceptor is destroyed during - the service handler activation sequence. - -Wed Jan 31 15:55:23 2001 Frank Hunleth <fhunleth@cs.wustl.edu> - - * ace/Synch.i: - Added ACE_Null_Mutex::acquire (ACE_Time_Value &tv) - to fix link error. - -Wed Jan 31 15:12:00 2001 Jeff Parsons <parsons@cs.wustl.edu> - - * ace/CDR_Stream.h: - - Made method do_byte_swap() public. If ACE_ENABLE_SWAP_ON_WRITE - is defined, TAO_GIOP_Message_Base::format_message() and - TAO_GIOP_Message_Lite::format_message() both call this method. - Thanks to Paul Rubel <prubel@bbn.com> for reporting this bug. - -Wed Jan 31 12:19:51 2001 Steve Huston <shuston@riverace.com> - - * docs/tutorials/Chap_2/ex03.html, ex04.html: Fixed these example - programs to 1) send the Nul terminators with the strings, - 2) allow enough space on the recv to get it all, 3) return a - value from main. - - * docs/tutorials/Chap_2/Chap_2.zip: Updated the above examples. - -Wed Jan 31 06:43:27 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Message_Queue_T.cpp: Make sure that dequeue_head() returns - the number of items still on the queue. Thanks to Johnny - Willemsen for reporting this. - -Tue Jan 30 21:39:15 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> - - * tests/Log_Msg_Test.cpp: In funtion test_ostream(), removed the - if condition to check if ACE_OS::unlink() succeeds. Also set - the ostream to NULL before calling ACE_ERROR_RETURN(). Thanks - to Mike Curtis <mccurry@my-deja.com> for pointing out problem - caused when ACE_OS::unlink() fails. Thanks to Doug in helping - fix the problem. - -Tue Jan 30 18:04:08 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test): - Zap the Win32 and VxWorks-specific code from this function. - Thanks to Sharath for reporting this. - -Tue Jan 30 11:34:26 2001 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/test_aiosig_ace.cpp: Fixed a bunch - of mis-coded ACE_ERROR_RETURNs; added a explicit queued completion, - and disabled the display of buffers that may overrun ACE_Log_Msg's - internal buffers to prevent spurious crashes. - -Tue Jan 30 11:26:42 2001 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/post_completions.cpp: Added a count - to be sure that all expected completions are delivered, and - print error message if not. - -Tue Jan 30 10:47:52 2001 Steve Huston <shuston@riverace.com> - - * ace/Select_Reactor_Base.cpp - (ACE_Select_Reactor_Notify::purge_pending_notifications): - * ace/WFMO_Reactor.cpp - (ACE_WFMO_Reactor_Notify::purge_pending_notifications): Changed - to not purge notifications destined for the reactor only - (notification buffer with 0 handler value). Thanks to Edan - Ayal <edana@bandwiz.com> for this fix. - -Tue Jan 30 01:05:51 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test): - Add cases for VxWorks and NT. Thanks to Sharath for reporting - this. - - * ace/OS.h: #define _SC_AIO_MAX to 1 if it's not set by default. - Thanks to Jean-Francois Daune <Daune@IBA.be> for reporting this - fix for VxWorks. - -Mon Jan 20 18:36:41 2001 Steve Huston <shuston@riverace.com> - - * ace/Message_Queue_T.h (ACE_Message_Queue_Ex): Use _USE - rather than _DECL to define the ACE_Message_Queue - fixes - compile error. - -Mon Jan 29 17:29:31 2001 Steve Huston <shuston@riverace.com> - - * ace/Message_Queue_T.{h i cpp}: Corrected a bunch of references - to Message_Queue_Ex's queue_ member to use . rather than -> - and removed the ACE_NEW to allocate it (follow-ups from Doug's - Sun Jan 28 08:32:07 2001 change). Fixed other compile - errors to allow tests/Message_Queue_Test_Ex.cpp to build. - FYI... whomever added this, it probably should have been named - Message_Queue_Ex_Test to conform. - -Mon Jan 29 15:30:27 2001 Steve Huston <shuston@riverace.com> - - * ace/POSIX_Proactor.{h cpp} (ACE_POSIX_SIG_Proactor): Don't - mask/block all signals, just the one(s) being used for this - sig proactor instance. Blocking everything can break other - things, such as debuggers and the ability to kill a program. - Also, don't setup a handler for the signals being blocked/waited - as this is a combination whose behavior is undefined. - -Sun Jan 28 08:39:17 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/Thread_Mutex_Test.cpp: - Fixed use of ACE_TEXT and string concatenation. - -Sun Jan 28 08:03:08 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/tests.dsw: - * tests/Message_Queue_Test_Ex.dsp: - Add NT project files for the new test - -Sun Jan 28 08:32:07 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * netsvcs/lib/Client_Logging_Handler.cpp: Fixed the order in which - the iostream messages are logged so that we don't bomb out when - the VERBOSE option is enabled. Thanks to Craig Rodrigues - <crodrigu@bbn.com> for helping find this problem. - - * ace/Message_Queue_T.h: Make sure the lock() forwarding method - forwards to queue_.lock(). - - * ace/Message_Queue_T.{h,i,cpp}: There's no reason to dynamically - allocate the implementation of ACE_Message_Queue_Ex -- instead - it can be simply an instance of ACE_Message_Queue. - - * ace/Message_Queue_T.h: Make sure that the methods on - ACE_Message_Queue_Ex are properly virtual. Thanks to Kitty for - pointing this out. - -Sat Jan 27 19:40:36 2001 Ossama Othman <ossama@uci.edu> - - * bin/auto_run_tests.lst: - - Added TAO's Portable Interceptor "Service_Context_Manipulation" - test to the list of tests to run. - -Sat Jan 27 19:34:20 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * tests/Config_Test.{h,cpp}: Fixed the use of "bool," which is - not supported on older compilers. Thanks to Kitty for reporting - this. - -Sat Jan 27 15:22:03 2001 Ossama Othman <ossama@uci.edu> - - * tests/Thread_Mutex_Test.cpp (test): - - Added code that tests mutex timeout functionality. - -Sat Jan 27 15:16:33 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/POSIX_Proactor.h: Replace ACE_Thread_Mutex with ACE_SYNCH_MUTEX - to avoid the need for conditional compilation. - - * ace/SUN_Proactor.h: Don't use ACE_Condition<ACE_Thread_Mutex> - but instead use the ACE_SYNCH_CONDITION, which also avoids the - need to conditionally compile for threaded platforms. - -Sat Jan 27 13:29:51 2001 Ossama Othman <ossama@uci.edu> - - * ace/config-linux.h: - - Declare the pthread_mutex_timedlock() prototype as an - 'extern "C"' function. This fixes an "unresolved symbol" link - error. - -Sat Jan 27 10:39:28 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/nightlybuilds/builds.lst: - Apparently the blank in 'RedHat 7.0' breaks the scoreboard. - -Sat Jan 27 01:06:09 2001 Irfan Pyarali <irfan@cs.wustl.edu> - - * include/makeinclude/platform_sunos5_sunc++.GNU: SPRO 5.0 - compiler should be able to support automatic template - instantiation. Also, standard C++ library should be ok. -g was - added to DCCFLAGS. - - * ace/config-sunos5.5.h: Turned off - ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION, - ACE_TEMPLATES_REQUIRE_SOURCE and ACE_USES_OLD_IOSTREAMS for the - SPRO 5.0 compiler. - - Thanks to J. Russell Noseworthy <rnosewor@objectsciences.com> - for contributing the above patches. - -Sat Jan 27 00:37:26 2001 Irfan Pyarali <irfan@cs.wustl.edu> - - * ace/OS.i: - - - (mutex_lock): Windows code must use relative time since that - is what WaitForSingleObject() expects. Also, fixed extra - "return" before ACE_NOTSUP_RETURN. - - - (thread_mutex_lock): Made thread_mutex_lock() with timeout - close to the thread_mutex_lock() without timeouts. - -Fri Jan 26 21:53:45 2001 Ossama Othman <ossama@uci.edu> - - * ace/OS.h: - * ace/OS.i (thread_mutex_lock): - - Added an overloaded version of this method that accepts a - timeout argument. It delegates to the standard - ACE_OS::mutex_lock() method on non-Windows platforms. - Otherwise, it returns with an ENOTSUP. - - The addition of this method was necessary to fix a compile - problem related to the ACE_Thread_Mutex class. - - * ace/Synch.i (acquire): - - In ACE_Thread_Mutex::acquire() that accepts a timeout argument, - call the corresponding ACE_OS::thread_mutex_lock() method. This - fixes compile-time error on MS Windows builds due to the fact - that ACE_mutex_t and ACE_thread_mutex_t are different types on - that platform. - -Fri Jan 26 17:31:26 2001 Ossama Othman <ossama@uci.edu> - - * ace/OS.i (mutex_lock): - - Fixed unused argument warnings that occured when compiling for - the single threaded case. - -Fri Jan 26 16:58:03 2001 Ossama Othman <ossama@uci.edu> - - * ace/config-linux.h: - - glibc 2.1.x doesn't have the (very useful) __GLIBC_PREREQ - macro. Use a preprocessor test that doesn't rely on it. - -Fri Jan 26 16:48:06 2001 Ossama Othman <ossama@uci.edu> - - * ace/config-qnx-neutrino.h (ACE_HAS_MUTEX_TIMEOUTS): - * ace/config-qnx-rtp.h (ACE_HAS_MUTEX_TIMEOUTS): - - QNX supports pthread_mutex_timedlock(). Yes! - -Fri Jan 26 17:50:38 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/config-win32-common.h: - ace/config-vxworks-5.x.h: Added ACE_HAS_MUTEX_TIMEOUTS macro. - - * ace/OS.i: Added timed mutex operations for Win32, VxWorks, and - pSoS. - -Fri Jan 26 16:31:15 2001 Ossama Othman <ossama@uci.edu> - - * ace/OS.h (mutex_lock): - - Updated documentation for the version of this method that - accepts a timeout value. - - * ace/OS.i (mutex_lock): - - If the platform does not support timed mutexes, then return with - an ENOTSUP. - - * ace/Process_Mutex.h: - * ace/Process_Mutex.inl (acquire): - - Added version of this method that accepts a timeout value. - -Fri Jan 26 17:50:38 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp (report_stats): - Fixed some unintentional tabs. Thanks to Mike Curtis for - reporting this! - -Fri Jan 26 15:34:01 2001 Ossama Othman <ossama@uci.edu> - - * ace/OS.h: - * ace/OS.i (mutex_timedlock, mutex_lock): - * ace/Synch.i (acquire): - - Renamed the ACE_OS::mutex_timedlock() to the overloaded - ACE_OS::mutex_lock(). - -Fri Jan 26 14:13:32 2001 Ossama Othman <ossama@uci.edu> - - * ace/OS.h: - * ace/OS.i (mutex_timedlock): - - Wrapped the pthread_mutex_timedlock() function. It times out if - a lock hasn't been acquired by the given absolute time. - - * ace/Synch.h: - * ace/Synch.i (acquire): - - Added versions of this method that accept an ACE_Time_Value. - They are used to prevent blocking definitely while waiting for a - given mutex to become available. - - * ace/config-linux.h (ACE_HAS_MUTEX_TIMEOUTS): - - glibc 2.2.x supports the pthread_mutex_timedlock() function. - - * ace/config-linux-common.h: - - Undefine ACE_LACKS_{LLSEEK,LSEEK64}_PROTOTYPE prior to include - the KCC configuration file. Thanks to Jeff Greif - <jgreif@befree.com> for reporting this. - - * ace/README: - - Added ACE_HAS_MUTEX_TIMEOUTS to the list of ACE macros. - -Fri Jan 26 11:18:15 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Log_Msg.cpp (dump): Fixed some unintentional tabs. Thanks - to Mike Curtis for reporting this! - - * ace/SOCK_Dgram_Mcast.cpp (open): Modified the call to - ACE_SOCK_Dgram::shared_open() to just pass in this->mcast_ - rather than making a local copy that just contained the port - number. Thanks to Keith Nicewarner <knicewar@erg.sri.com> for - reporting this. - - * tests/Makefile.bor (TESTS): Added Message_Queue_Test_Ex.cpp. - -Fri Jan 26 13:37:30 2001 Luther J Baker <luther@cs.wustl.edu> - - * ace/OS.h: - - If using PACE, ACE_stat typedefs to pace_stat_s. - -Fri Jan 26 11:18:15 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * tests/Message_Queue_Test_Ex.cpp: Fixed some ASYS_* macros with - ACE_* stuff. Thanks to Darrell for reporting this. - - * ace/Message_Queue_T.h, - * ace/Message_Queue_T.i, - * ace/Message_Queue_T.cpp: - Added the ACE_Message_Queue_Ex, which provides a message queue - abstraction whose type is templatized. Thanks to Michael Vitalo - <mvitalo@sprynet.com> for contributing this. - - * tests/run_tests.lst: - * tests/run_test.lst: - * tests: Added support for the new Message_Queue_Test_Ex.cpp file. - Thanks to Michael Vitalo <mvitalo@sprynet.com> for contributing - this. - -Fri Jan 26 09:33:20 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - Add TAO/tests/Object_Loader to the list - - * include/makeinclude/rules.lib.GNU: - Allow both .cpp and .c files in the LSRC macro. This should - let the PACE guys use the real name for their files, and - generate proper dependencies. - -Fri Jan 26 02:16:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * tests/OS_Test.cpp: - - Changed a use of struct stat to ACE_stat. - -Thu Jan 25 19:16:48 2001 Ossama Othman <ossama@uci.edu> - - * ace/config-linux.h: - - Only define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS and - ACE_LACKS_THREAD_STACK_SIZE for glibc < 2.1. glibc 2.1+ has the - netdb reentrant functions (albeit with funky signatures), and it - has pthread_attr_setstacksize(). - - * ace/OS.h: - - Removed trailing whitespace. - - * ace/OS.i (getprotobyname_r, getprotobynumber_r, gethostbyaddr_r, - gethostbyname_r, getservbyname_r): - - Added glibc-specific calls to these functions. This allows us - to avoid grabbing a lock! Thanks to Ben Strong - <bstrong@bluelark.com> for providing the patch. - - * THANKS: - - Added Ben Strong to list of contributors. - -Thu Jan 25 20:10:24 2001 Irfan Pyarali <irfan@cs.wustl.edu> - - * include/makeinclude/platform_irix6.x_sgic++.GNU: - * include/makeinclude/platform_irix5.3_sgic++.GNU: - - Removed -rpath "$(ACE_ROOT)/ace" from LDFLAGS. - - * ace/Message_Queue_T.{h,i}: Moved code from .i to .h to work - around a compiler bug. The Sun Forte 6 (CC 5.1) compiler is - only happy if this is in the header file. - - * ace/Message_Block_T.cpp: Fixed template parameter name mismatch - between declaration and definition. - - Thanks to J. Russell Noseworthy <rnosewor@objectsciences.com> - for contributing the above patches. - -Thu Jan 25 10:50:35 2001 Steve Huston <shuston@riverace.com> - - * ace/Reactor.h: Add comments to schedule_wakeup/cancel_wakeup that - they don't cause an immediate re-examination of the masks like - register_handler does. Thanks to Oscar Rodriquez - <Oscar.Rodriquez@eln.ericsson.se> for prompting this clarification. - - * ace/WFMO_Reactor.cpp (ACE_WFMO_Reactor_Notify::handle_signal): - The call to ACE_Message_Queue::dequeue_head may change the - ACE_Time_Value passed to it, so don't override ACE_Time_Value::zero's - const-ness, lest ACE_Time_Value::zero take on some strange new value. - Thanks to Edan Ayal <edana@bandwiz.com> for this fix. - -Thu Jan 25 05:34:58 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Connector.cpp (connector): Added an ACE_const_cast() to - get rid of the const for the accessor method! - - * ace/Acceptor.cpp (acceptor): Added an ACE_const_cast() to - get rid of the const for the accessor method! - - * ace/Log_Msg.{h,cpp}, - * ace/Trace.{h,cpp}: The Log_Msg -I flag now uses the current - ACE_Trace nesting level rather than always using 1. Thanks to - Mike Curtis for providing this. - -Wed Jan 24 19:43:24 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/OS.i (lstat,stat): Separated win32 cases out. - -Wed Jan 24 18:15:59 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/OS.i (fstat): Oops, wrong version of this function was - modified. - -Wed Jan 24 14:44:12 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/FILE.cpp: - * ace/Filecache.cpp: - * ace/Filecache.h: - * ace/OS.h: - * ace/OS.i: - * ace/OS.cpp: Changed the signature of <stat>, <fstat>, and - <lstat> to use ACE_stat instead of "struct stat". Also changed - to use _fstat and _stat on win32 instead of <fstat> and <stat> - directly. Also replaced several use of "struct stat" to - ACE_stat. Thanks to Mike Anderson <manderson@sonusnet.com> for - reporting this. [Bug 762] - -Wed Jan 24 16:13:10 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/OS_Dirent.cpp: Fixed a bug in the readdir_emulation() method. - Thanks to Yung Trinh <ytrinh@email.com> for reporting this. - - * ace/Connector.{h,cpp}: Added a new connector() accessor to - return the underlying ACE_PEER_CONNECTOR. Thanks to Pedro - Brandao <pbrandao@inescn.pt> for suggesting this. - -Wed Jan 24 10:17:03 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Makefile: - Add dependencies (again). They were lost is a previous commit. - - * */Makefile: - Update dependencies (yet another time). - -Wed Jan 24 09:41:54 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Configuration.cpp: - Fixed warning under gcc. Also made the for() loop more - ACE-like, not better, but at least consistent. - -Wed Jan 24 08:56:16 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.h: - The changed to document the ACE_SVC_* macros were accidentally - lost, fixed. - - * ace/Service_Config.cpp: - New debug message when processing an explicit directive, useful - to find out when and why TAO invokes - ACE_Service_Config::process_directive() directly. - As with all other debug messages in this file it only shows up - if ACE::debug() returns non-zero. - -Wed Jan 24 01:44:47 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Configuration.cpp (expand_path): Fixed a bug with assignment to - temp in the loop. Thanks to Jonathan Reis for reporting this! - -Tue Jan 23 17:02:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/msvc_auto_compile.pl: - - Removed PACE until we figure out how to handle it in the - DLL builds. - -Tue Jan 23 16:50:35 2001 Darrell Brunsch <brunsch@uci.edu> - - * tests/Dirent_Test.dsp: - - Updated to make consistent with the rest of the dsps in - this directory in regards to output directories and non-use - of ACE_ROOT. - - * tests/Dirent_Test.cpp: - - Updated wide character compatibility and removed the use - of ACE_ROOT (now looks at ../tests", which should give - the same results). - - * tests/run_test.lst: - - Added the Dirent_Test to the list - - * tests/version_tests/Dirent_Test.dsp: (added) - * tests/version_tests/Refcounted_Auto_Ptr_Test.dsp: (added) - * tests/version_tests/version_tests.dsw: - - Used the create_vt_dsps.pl script to update this directory. - -Tue Jan 23 18:03:26 2001 Jeff Parsons <parsons@cs.wustl.edu> - - * ace/CDR_Stream.cpp: - - Added patches to read_8 and write_8 sent in by - Keith Nicewarner <knicewar@erg.sri.com> to deal - with the ARM byte format for doubles - -Tue Jan 23 15:06:18 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/Configuration.cpp: - * ace/OS_Dirent.cpp: - - Updated wide character compatibility. - - * ace/ace_dll.dsp: - - Removed unneeded verbose library option. - -Tue Jan 23 10:54:14 2001 Jeff Parsons <parsons@cs.wustl.edu> - - * ace/config-doxygen.h: - * bin/autoconf_compile: - - Removed all occurrences of 'smart_proxies' and 'interface_repo'. - These are no longer necessary. - - * include/makeinclude/ace_flags.bor: - - Added necessary variables to go along with the Borland - makefiles for the new libraries tao/Domain and - tao/IFR_Client. - -Mon Jan 22 17:01:17 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS_String.cpp: - * ace/OS_String.inl: - * ace/ace_wchar.inl: - * ace/config-qnx-rtp.h: - - ACE_HAS_WCHAR fixes. Support is really bad on QNX RTP - so we just end up emulating most everything. As far as - I could tell, there isn't even a way to convert between - the two types of strings. - - * ace/OS_Dirent.cpp: - - Rewrote a paragraph to remove the use of "/*" in a larger - /*...*/ comment, since gcc complains about it. - - * tests/Message_Queue_Test.cpp: - - Backed out some changes to it on Jan 21, since it had - problems and I couldn't find any ChangeLog entry for the - changes (mistakenly checked in?). - -Mon Jan 22 13:51:11 2001 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/OS_Dirent.cpp (opendir_emulation): Added code to make the - emmulation work properly on Win32. Thanks to Edwin Wrench - <edwin.wrench@itt.com> for finding this. - - * tests/Dirent_Test.cpp: - tests/Makefile: - tests/run_tests.bat: - tests/run_tests.lst: Added test to verify correctness of above - fix. This test attempts to scan $ACE_ROOT/tests and will fail if - the number of entries is 0 or 1. - -Mon Jan 22 10:21:20 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Map_Manager.h: Clarify that find() returns 0, rather than - saying "a non-negative number". Thanks to Albert Wijna - <albert.wijnja@meco.nl> for clarifying this. - -Mon Jan 22 15:38:12 2001 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Containers_T.h: - ace/Containers_T.cpp: - Added operator* to the ACE_Ordered_Multiset_Iterator class - - * tests/Ordmultiset_test.cpp - Expanded test for the new operator* of the ACE_Ordered_Multiset_ - Iterator class - -Sat Jan 20 14:53:07 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Configuration.{h,cpp}: Fixed some problems with const char * - that was busting the compilation. Thanks to Carlos for pointing - this out. - - * ace/Configuration.{h,cpp}: Added several fixes for - mistakes with memory management and other minor problems. - Thanks to Jonathan Reis <reis@stentorsoft.com> for contributing - these fixes! - -Sat Jan 20 10:49:05 2001 Carlos O'Ryan <coryan@uci.edu> - - * docs/ACE-guidelines.html: - Update the guidelines to point people to the Doxygen - documentation, instead of the now abandoned OSE tools. - -Sat Jan 20 10:21:08 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.cpp: - Another pass fixing problems with ACE_BEGINTHREADEX() under - Win32, this time Win32 is working fine. - -Sat Jan 20 10:20:50 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * doc/tutorials: Integrated the new Service Configurator tutorial - into the main tutorials page. - -Fri Jan 19 16:57:43 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Svc_Handler.h: Updated the comments to explain why - operator new is overloaded. Thanks to Kirill Kuolechov - <Kirill.Koulechov@gmx.net> for reporting this. - -Fri Jan 19 15:39:43 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.cpp: - QNX/RTP has the same problem that LynxOS has, after fork() is - invoked trying to destroy the preallocated objects in - ACE_OS_Object_Manager fails. - Factor out this variation in a new macro: - ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK - - * ace/config-lynxos.h: - * ace/config-qnx-rtp.h: - Define the new macro for the two relevant platforms. - - * ace/README: - Document the macro. - -Fri Jan 19 15:08:37 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.cpp: - I disabled too much in the commit at 10:50am... Now it seems to - be OK. - - * ace/Makefile: - Remove extra -v - -Fri Jan 19 13:16:49 2001 Priyanka Gontla <pgontla@ece.uci.edu> - - * include/makeinclude/platform_hpux_aCC.GNU: - Added new options to the CCFLAGS so that the known future errors - arising because of HPUX are suppressed. - -Fri Jan 19 13:01:13 2001 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/SSL/Makefile: - Put a check for defining ACE_SHLIBS to get it compiled on HPUX. - - * ace/RMCast/Makefile: - * ace/Makefile : - Updated dependencies - - * ace/config-all.h - Fix a build problem on HP-UX 11.00 with aCC A.03.25. The macro - used to determine the use of the std namespace changed from - RWSTD_NO_NAMESPACE to _NAMESPACE_STD. NOTE: I did preserve the - check for RWSTD_NO_NAMESPACE with aCC versions less than A.03.25. - - Thanks to Chad Elliott <elliott_c@ociweb.com> for making this fix. - -Fri Jan 19 11:22:42 2001 Priyanka Gontla <pgontla@ece.uci.edu> - - * docs/tutorials/022/client_handler.cpp : - * docs/tutorials/022/client_hander.h : - * docs/tutorials/022/Acceptor_Service.cpp : - * docs/tutorials/022/Acceptor_Service.h : - * docs/tutorials/022/server.cpp : - * docs/tutorials/022/Makefile : - - * docs/tutorials/022/client/Makefile: - * docs/tutorials/022/client/client.cpp: - - * docs/tutorials/022/page01.html: - * docs/tutorials/022/page02.html: - * docs/tutorials/022/page03.html: - * docs/tutorials/022/page04.html: - * docs/tutorials/022/page05.html: - - Developed a new tutorial for the ACE_Service_Configurator. - Based on the ACE tutorial 005. - -Fri Jan 19 10:50:11 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.cpp: - Use the Green Hills specific tricks *only* if we are compiling - under Green Hills, and only for the platform where they make - sense (in this case Win32). - -Thu Jan 18 23:21:53 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.h: - Document the infamous ACE_STATIC_SVC macros. - -Thu Jan 18 23:50:35 2001 Rick Stille <stille_r@ociweb.com> - - The Green Hills(GHS) Native x86 compiler does not provide support - for 64-bit integers, structural exceptions, or DLL's. Thus the - keywords __int64, __try, __dllimport, etc., are not defined. In - addition, exceptions do not work in a multi-threaded environment. - The following changes were made to address these shortcomings. - - * ace/Basic_Types.h: Because the GHS compiler has both - ACE_LACKS_LONGLONG_T and ACE_WIN32 defined, the - ACE_LACKS_LONGLONG_T macro must appear first, so the order of - these two macros has been reversed in the defines of both - ACE_UINT64_LITERAL(n) and ACE_UINT64_DBLCAST_ADAPTER(n). - - * ace/config-win32-common.h: The typedef of ACE_UINT64 as an - unsigned __int64 and the define of ACE_HAS_LLSEEK are blocked - out for ghs. - - * ace/config-win32-ghs.h: This is the new configuration file for - Green Hills/Win32. - - * ace/Configuration.cpp(resolve_key): The "return 0" at the end of - this function has been blocked out for ghs to eliminate an - "unreachable code" warning. - - * ace/Event_Handler_T.h(handle_signal): The type of the "signum" - parameter has been changed to "int" so that it matches the type - in the Event_Handler class. - - * ace/Event_Handler_T.i(handle_signal): The type of the "signum" - parameter has been changed to "int" so that it matches the type - in the Event_Handler class. - - * ace/High_Res_Timer.cpp(global_scale_factor): The Native x86 - compiler defines "QuadPart" in the LARGE_INTEGER union as a - "double," so it cannot be used in the calculation of - "global_scale_factor." Instead, for GHS, the low and high parts - of the LARGE_INTEGER structure are copied into an ACE_UINT64 - structure (which is actually an ACE_U_LongLong) and the - ACE_U_LongLong operators are used. The code segment if - (ACE_High_Res_Timer::global_scale_factor_ == 1u) // Failed to - retrieve CPU speed from system, so calculate it. - ACE_High_Res_Timer::calibrate (); is unreachable hen ACE_WIN32 - is defined, so it has been blocked out for Win32 platforms to - silence the Green Hills "unreachable code" warning. - - * ace/High_Res_Timer.i(hrtime_to_tv): There is no assignment - operator that converts an ACE_U_LongLong to a "long," so an - intermediate ACE_U_LongLong variable "usec64" has been - introduced. The type of "msec" and "usec" have been changed from - "long" to ACE_UINT32, as have been the casts. The conversion is - then carried out by using the lower part of "usec64." - - * ace/Local_Name_Space_T.cpp(remap): The "DWORD" cast has been - removed from both EXCEPTION_CONTINUE_SEARCH and - EXCEPTION_CONTINUE_EXECUTION beause the function return value is - of type "int" and the cast was causing an "integer conversion - resulted in a change of sign" warning. - - * ace/Memory_Pool.cpp(map): Removed references to the "mem_offset" - variable because it was not being used and the compiler was - issuing a warning to this effect. - - * ace/NT_Service.cpp(startup): This function was returning "-1" - when svc_sc_handle() failed, and returning a "0" when - QueryServiceConfig() failed. Since the return type of this - function is "DWORD," the compiler was issuing an "integer - conversion resulted in a change of sign" warning for the "-1" - value. Upon investigation of this issue, it was discovered that - "0" is a valid service type value, and thus the use of "0" to - indicate failure is a bug. The return value for svc_sc_handle() - failure has been changed to "MAXDWORD - 1," which is the DWORD - equivalent of "-2," and the return value for failure of - QueryServiceConfig() has been changed to "MAXDWORD," which is - the DWORD equivalent of -1. - - * ace/OS.cpp: The compiler cannot handle a 64-bit literal, so the - literal passed to FILETIME_to_timval_skew has been created as - ACE_U_LongLong(0xd53e8000, 0x19db1de). - - * ace/OS.cpp(set): The Native x86 compiler defines "QuadPart" in - the LARGE_INTEGER union as a "double," so it cannot be used in - the calculations of tv_sec and tv_usec. Instead, the low and - high parts of the LARGE_INTEGER structure are copied into an - ACE_U_LongLong structure, and the ACE_U_LongLong operators are - used. - - * ace/OS.cpp(operator FILETIME): The Native x86 compiler defines - "QuadPart" in the LARGE_INTEGER union as a "double," so it - cannot be used in the calculation of file_time. Instead, tv_sec - and tv_usec are converted iinto ACE_U_LongLong structures and - the ACE_U_LongLong operators are used. - - * ace/OS.cpp(uname): The Native x86 compiler names both the union - and the structure within the SYSTEM_INFO structure, so the - "wProcessorArchitecture" member within the "s" structure, which - is itself within the "u" union, must be accessed by using - ".u.s." - - * ace/OS.cpp(ACE_BEGINTHREADEX): Green Hills compiler gets - confused when __stdcall is imbedded in parameter list, so the - type ACE_WIN32THRFUNC_T has been defined, then used within the - parameter list of ::_beginthreadex(). - - * ace/OS.h(ACE_Time_Value): The Native x86 compiler defines - "DWORDLONG" as type "double," so FILETIME_to_timval_skew is - instead defined as type ACE_U_LongLong. - - * ace/OS.h: The pragmas "#pragma warning( disable : ... " are - unknown to the Native x86 compiler, so it produces warnings to - this effect. These pragma have been blocked out for ghs. - - * ace/OS.h: Because the Native x86 compiler does not support the - __int64 keyword, the typedef of ACE_hrtime_t has been changed - from "unsigned __int64" to "ACE_UINT64" for ghs. Because no - usage of "ACE_QWORD" could be foound, its definition has been - blocked out for ghs. - - * ace/OS.i(gettimeofday):The code at the end of this function is - not reachable if either ACE_HAS_WINCE or ACE_WIN32 is - defined. In order to quiet the Green Hills compiler warnings - about unreachable code, this code has been blocked out for - ACE_HAS_WINCE and ACE_WIN32. With this code blocked out, - however, the variables "tv" and "result" are not used, and the - compiler warns about about variables defined, but never used. In - order to quiet these warnings, the definitions of these two - variables have been blocked out for ACE_HAS_WINCE and ACE_WIN32. - - * ace/OS.i(gethrtime): The ACE_gethrtime() function is not meant - to be used by a Win32 platform, but because both "ghs" and - "ACE_HAS_PENTIUM" are defined for the Native x86 platform, a - call to ACE_gethrtime() was included in the code. This problem - has been solved by adding "&& !defined(ACE_WIN32)" to the two - "... defined (ghs) && defined (ACE_HAS_PENTIUM)" statements - which block out references to ACE_gethrtime(). - - The Native x86 compiler defines "QuadPart" in the LARGE_INTEGER - union as a "double," so it cannot be used as the return - value. Instead, because the return type is "ACE_hrtime_t," which - is type "ACE_UINT64," the low and high parts of the - LARGE_INTEGER structure are copied into an ACE_UINT64, which is - then returned. - - * ace/Process_Manager.cpp(wait): The "result >= WAIT_OBJECT_0" - test within the ACE_ASSERT statement causes the Native x86 - compiler to produce a ôpointless comparison of unsigned - integer with zeroö warning because "result" is of type - "DWORD," which is defined by the Native x86 compiler as type - "unsigned int." This test has been blocked out for ghs. - - * ace/Profile_Timer.cpp(elapsed_time): Because the "__int64" - keyword is not defined by the Native x86 compiler, it cannot be - used to cast the value of "delta_t" in the calculation of - "real_time." But "delta_t" is of type "ACE_hrtime_t," and - ACE_hrtime_t is typedefed as ACE_U_LongLong, so the division - operator defined for in the ACE_U_LongLong class can be used - directly with a divisor of type "double." Thus the "__int64" - cast has been removed for ghs. - - * ace/Sock_Connect.cpp(get_reg_value): This function is used - within the function get_ip_interfaces() function only when - either ACE_HAS_WINSOCK2 is not defined or when ACE_HAS_WINSOCK2 - is defined as "0." Because ACE_HAS_WINSOCK2 is defined on the - Native x86 platform, the compiler was issuing a ôdefined, but - never usedö warning. This warning has been eliminated by - blocking out the definition of get_reg_value() when - ACE_HAS_WINSOCK2 is defined as a value other than "0." - - * ace/Stats.cpp(accumulate): The comparison "rhs.samples_count () - == 0" was producing a warning because rhs.samples_count() - returns an ACE_UINT32, but is being compared to the signed - literal "0." The "0" has been changed to "0u." - - * ace/WFMO_Reactor.cpp(ok_to_wait): The comparison of the "switch" - statement parameter "result" to "DWORD" values in the case - statements elicited an "integer conversion resulted in a change - of sign" warning from the compiler, so the type of "result" has - been changed to "DWORD." - - * ace/WFMO_Reactor.cpp(dispatch): The comparison of the "switch" - statement parameter "wait_status" to "DWORD" values in the case - statements elicited an "integer conversion resulted in a change - of sign" warning from the compiler, so the type of "wait_status" - has been cast to "DWORD." - - * ace/WFMO_Reactor.cpp(dispatch_handles): The "wait_status >= - WAIT_OBJECT_0" comparison was producing a ôpointless - comparison of unsigned integer with zeroö warning because - "wait_status" is an unsigned integer. This was a known problem - with Borland, so the blocking out of this comparison has been - extende to ghs. - - * tests/Basic_Types_Test.cpp(main): Because both the - ACE_LACKS_LONGLONG_T and ACE_WIN32 macros are defined, the - ACE_LACKS_LONGLONG_T macro must appear first, so the order of - these two macros has been reversed. - - * tests/Cached_Accept_Conn_Test.cpp: The template class - ACE_Node<ACE_HANDLE> must be explicitly instantiated for this - platform. - - * tests/Cached_Conn_Test.cpp: The template class - ACE_Node<ACE_HANDLE> must be explicitly instantiated for this - platform. - - * tests/Handle_Set_Test.cpp: The template class - ACE_Node<ACE_HANDLE> must be explicitly instantiated for this - platform. This was already being done for the _CRAYMPP, so it - has been extended to ghs. - - * tests/Malloc_Test.cpp: Because the Native x86 compiler does not - support structural exceptions, it cannot support the "remap" - function, so the blocking of the ACE_TEST_REMAP_ON_FAULT macro - definition, which was already in effect for linux, has been - extended to ghs. - -Thu Jan 18 12:49:53 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/SUN_Proactor.cpp: Added support for cancel_aiocb(). Thanks - to Alexander Libman <Alibman@baltimore.com> for contributing - this. - - * tests/Makefile.bor (TESTS): Added Config_Test so that this test - runs on Borland. - - * tests: Moved the config_test stuff (which tests ACE_Configuration* - classes) from the examples/Configuration/ directory to the - tests/ directory and made it a one-button test. - - * ace/Future.h: Changed the order of the thread mutex and the condition - variable to avoid confusion in the future regarding "order of - initialization." Thanks to Edan Ayal <edan@bandwiz.com> for - reporting this. - - * examples/Configuration: Updated this example to include the new - test for the ACE_Configuration_Heap methods. Thanks to Michael - Searles <msearles@base16.com> for contributing this. - -Thu Jan 18 18:55:37 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/nightlybuilds/builds.lst: - Add the RedHat_Implicit_Templates build. - -Thu Jan 18 18:48:33 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Log_Msg.cpp: - Declare sys_nerr as const int under QNX/RTP (and NTO). - - * ace/Pipe.cpp: - Use pipe() under QNX because it lacks both socketpair() and it - cannot open a socket to itself. - - * ace/config-qnx-rtp.h: - Remove ACE_NTRACE hacks. - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - Do not enable the repo by default it breaks QNX. - Instead of removing the definition of DCFLAGS by default we - set debug=0 all the time, that seems like a cleaner way to - disable debugging. - -Thu Jan 18 09:34:35 2001 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/platform_linux.GNU: - The -fno-implicit-templates flag was hardcoded, but this gave - the users no recourse to remove should they want to use - -fimplicit-templates. - The macro IMPLICIT_TEMPLATES_FLAG is used to set the flag now, - unless the user provides a value for the macro the makefiles - continue to work as they did before this change, i.e., adding - -fno-implicit-templates to CCFLAGS. - Notice that this functionality was available in - platform_linux_lxpthreads.GNU, but dissapeared when everything - was rolled into platform_linux.GNU. - -Thu Jan 18 06:26:42 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Configuration.{h,cpp}: Added functionality to read in all - values in a config file without requiring a type prefix on each - value, skips whitespace and allows comments on the end of lines. - Thanks to Michael Searles <msearles@base16.com> for contributing - this. - -Wed Jan 17 11:48:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/msvc_auto_compile.pl: - - Added PACE to the list of ACE directories so PACE is - compiled in full auto builds. - -Wed Jan 17 10:00:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/Handle_Ops.cpp: (handle_timed_open) - - Removed the use of ACE_NONBLOCK on Win32. This use - didn't function as expected, since ACE_NONBLOCK would - be interpreted as O_WRONLY. Also, the CreateFile API - call doesn't support any nonblocking option, so - redefining ACE_NONBLOCK would not seem to fix anything. - - Thanks to Matthias Wittig <m.wittig@com-on.de> for reporting - a problem report form about this. - - * bin/PerlACE/Process_Unix.pm: - - Fixed up the use of the RUNNING state, so wait and kill - work properly. Also made Kill automatically use waitpid - (since I can't think of any time we'd kill without wanting to - clean up the resources). - -Wed Jan 17 07:44:29 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp (send): Set errno to - EWOULDBLOCK if n < len so that the caller will initiate a - handle_output()-driven reply. Thanks to Klaus H. Wolf - <hw@cyland.com> for reporting this. - - * ace/Log_Msg.h (ACE_Log_Msg): Clarified that only the current message - is stored in TSS. Thanks to Pierre Oberson - <oberson@nagra-kudelski.ch> for pointing out the need for this - clarification. - - * examples/Log_Msg/test_log_msg.cpp (main): Fixed the example by - adding ACE_Log_Msg::PROCESS so that the messages do not print - out (which is the correct behavior for this test). Thanks to - Mike Curtis <mccurry@my-deja.com> for reporting this. - * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp (send): Set errno to - EWOULDBLOCK if n < len so that the caller will initiate a - handle_output()-driven reply. Thanks to Klaus H. Wolf - <hw@cyland.com> for reporting this. - - * ace/Log_Msg.h (ACE_Log_Msg): Clarified that only the current message - is stored in TSS. Thanks to Pierre Oberson - <oberson@nagra-kudelski.ch> for pointing out the need for this - clarification. - - * examples/Log_Msg/test_log_msg.cpp (main): Fixed the example by - adding ACE_Log_Msg::PROCESS so that the messages do not print - out (which is the correct behavior for this test). Thanks to - Mike Curtis <mccurry@my-deja.com> for reporting this. - -Tue Jan 16 15:28:22 2001 Carlos O'Ryan <coryan@uci.edu> - - * netsvcs/lib/Server_Logging_Handler_T.cpp: - The formal parameter names must match in the .h and .cpp file - to make Sun/CC 6.0 happy. - -Tue Jan 16 11:25:32 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Log_Msg.cpp (log): Convert strerror() text string to a - TCHAR so that this call will work correctly with Unicode. - Thanks to Matthias Wittig <m.wittig@com-on.de> for reporting - this. - -Tue Jan 16 09:58:20 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/ace_wchar.inl: - - Updated ACE_Ascii_To_Wide and ACE_Wide_To_Ascii to - preserve null pointers. - - Thanks to Matthias Wittig <m.wittig@com-on.de> for - reporting this and suggesting a fix. - -Tue Jan 16 10:47:33 2001 Frank Hunleth <fhunleth@cs.wustl.edu> - - * ace/config-win32-common.h: - * ace/config-win32-msvc.h: - Moved #define ACE_HAS_LLSEEK from config-win32-common.h to - config-win32-msvc.h, since _lseeki64 isn't defined for - Borland. Also implicitly removed ACE_HAS_LLSEEK for the - VisualAge compiler - it might have worked (didn't know, - couldn't test) - -Mon Jan 15 15:22:42 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Asynch_IO.h: Changed the ACE_Asynch_Read_Stream::read() - method's "bytes_to_read" parameter to "num_bytes_to_read" to - workaround a weird problem with some compilers. Thanks to Chris - Kohlhoff <chris@kohlhoff.com> for this fix. - - * examples/Service_Configurator/IPC-tests/README: Updated this - file so that it's now up-to-date and also explains how to - reconfigure a server if SIGHUP isn't supported. Thanks to Mike - Curtis <mccurry@my-deja.com> for reporting this. - -Mon Jan 15 12:13:48 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/nightlybuilds/builds.lst: [Added] - * bin/nightlybuilds/scoreboard_update.pl: [Added] - - Moved the scoreboard stuff from the internal cvs repos - to this one, so it is easier for people to edit the - list. - -Mon Jan 15 12:29:53 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/config-macosx.h: Fixed typo so that ACE_HAS_CLOCK_GETTIME - is spelled correctly. Thanks to Mike Curtis - <mccurry@my-deja.com> for reporting this. - - * ace/Strategies_T.cpp (open): Replace the ACE_OS::strncpy() functions - with ACE_OS::strcpy() functions. Thanks to Ron Hashimshony - <Ron@bandwiz.com> for reporting this. - -Mon Jan 15 09:44:16 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/RMCast/Makefile: - Fixed Makefile to link the ACE library, otherwise we get - undefined symbols under certain platforms (AIX). Thanks to - Scott Bolin <scott.bolin@pgs.com> for pointing this out. - -Mon Jan 15 09:11:12 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/config-win32-common.h: Added support for ACE_HAS_LLSEEK, though - this should probably be changed to be compiled only on some - Win32 platforms. - - * ace/OS.{h,i}: Added support for ACE_OS::llseek() on Win32. Thanks - to Nick Lin <nicklin@vantech.com.tw> for contributing this. - - * ace/Log_Priority.h: Clarified the fact that we only use 12 bits - for ACE_Log_Priority. Thus, the remaining bits are available - for application use. Thanks to David Singer - <David_P_Singer@res.raytheon.com> for motivating this comment. - -Sun Jan 14 16:53:11 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Configuration.{h,cpp}: Fixed a memory leak that occurred - with transient heaps. Also added a list of current limitations - to import/export routine. Thanks to Chris Hafey - <chafey@stentor.com> for contributing this stuff. - -Fri Jan 12 20:46:05 2001 Angelo Corsaro <corsaro@cs.wustl.edu> - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - Platform macros needed to run ACE on QNX RTP. - - * ace/config-qnx-rtp.h: - Configuration file needed to run ACE on QNX RTP. - - * ACE-INSTALL.html: - Added documentation on how to install ACE on QNX RTP, - and the issue with the current version of QNX RTP. - - -Fri Jan 12 14:59:15 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/RMCast/RMCast_Fragment_Test.cpp: - Fixed conversion from 64-bit ulong to 32-bit ulong under some - VxWorks compilers where 64 bits are emulated. Thanks to Edwin - McKay <mckayea@betalasermike.com> for pointing this out. - -Fri Jan 12 07:18:16 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/OS.{h,i}: Moved some "using std::*" definitions from OS.i to - OS.h. Thanks to Mike Curtis <mccurry@my-deja.com> for reporting - this and to Christopher Kohlhoff <chris@kohlhoff.com> for - suggesting the fix. - -Fri Jan 12 15:34:28 2001 Steve Huston <shuston@riverace.com> - - * ace/Managed_Object.h: Added <TYPE> to the unimplemented operator= - declaration. Fixes compile w/ IBM C/C++ 3.6 on AIX. - -Fri Jan 12 07:59:19 2001 Joe Hoffert <joeh@cs.wustl.edu> - - * Makefile: - Add the PACE directory back into the build. PACE should - not generate any build failures for the platforms - currently supported. - -Wed Jan 10 23:30:21 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/FILE_Addr.cpp (set): Replace (sizeof this->filename_) - with (sizeof this->filename_ / sizeof (ACE_TCHAR)). Thanks to - Matthias Wittig <m.wittig@com-on.de> for reporting this. - -Tue Jan 9 07:27:19 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Containers_T.h: Clarified that the ACE_Ordered_Multiset class - allows duplicates. Thanks to Albert Wijna - <albert.wijnja@meco.nl> for clarifying this. - -Sat Jan 6 10:20:55 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/File_Lock.{h,inl}: Made the get_handle() method const. - Thanks to Johnny Willemsen <johnny.willemsen@meco.nl> for - reporting this. - - * ace/TP_Reactor.h: - * ace/Get_Opt.h: - * ace/Caching_Utility_T.h: Added "ACE_UNIMPLEMENTED_FUNC" macros - for all copy constructors and assignment operators. Thanks to - Johnny Willemsen <johnny.willemsen@meco.nl> for reporting this. - -Fri Jan 5 01:09:28 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * performance-tests/Misc/context_switch_time.cpp (get_options), - * performance-tests/Misc/preempt.cpp (open), - * examples/Reactor/Misc/pingpong.cpp (run_svc), - * examples/Reactor/Misc/notification.cpp (main), - * examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp (main), - * examples/Shared_Malloc/Options.cpp (print_usage_and_die), - * examples/Service_Configurator/IPC-tests/client/: Updated all - these programs so that don't abort via %a, but instead call - ACE_OS::exit(). Thanks to Mike Curtis <mccurry@my-deja.com> for - suggesting this. - - * apps/Gateway/Peer/Options.cpp (print_usage_and_die): Make sure to - actually *die* when we're done with this function! Thanks to - Mike Curtis <mccurry@my-deja.com> for suggesting this. - -Thu Jan 4 00:10:26 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Select_Reactor_T.i: The cancel_timer() method should return the - number of events canceled, rather than 0 or 1. Thanks to Joe - Guan <jguan@mistwireless.com> for reporting this and providing - the fix. - - * ace/Synch.h: Added an acquire (ACE_Time_Value &) method to ACE_Null_Mutex - so that this will work properly when - ACE_HAS_OPTIMIZED_MESSAGE_QUEUE is enabled. Thanks to Yuriy - Zaporozhets <zaz@internet-zahav.net> for reporting this. - -Wed Jan 3 23:00:52 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Lib_Find.cpp (ldfind), - * ace/Makefile.bor (CFLAGS), - * include/makeinclude/outputdir.bor (OBJDIR), - * ace/config-win32-msvc.h: Added support for the new ACE_LD_DECORATOR_STR - macro which is used to work around the fact that Borland - attaches a so-called "decorator suffix" to all library names. - Thanks to Chris Kohlhoff <chris@kohlhoff.com> for reporting - this. - - * ace/Lib_Find.h: Fixed a typo where ACE_LIB_FIND_H was misspelled. - Thanks to Chris Kohlhoff <chris@kohlhoff.com> for reporting - this. - - * ace/SOCK_Stream.i, - ace/MEM_Stream.i: Updated the calls to ACE_OS::shutdown() to use - the new macros described below! - - * ace/OS.h: Added better support for the ACE_OS::shutdown() second - parmeter in the form of new macros ACE_SHUTDOWN_READ, - ACE_SHUTDOWN_WRITE, and ACE_SHUTDOWN_BOTH. Thanks to Mike - Curtis <mccurry@my-deja.com> for suggesting this. - - * ace/SOCK_Stream.h: Clarified the role of the timeout parameters in - the various methods. Thanks to Allen Broadman - <broadmana@plural.com> for motivating this. - -Thu Jan 11 17:24:30 2001 Carlos O'Ryan <coryan@uci.edu> - - * Makefile: - Add new target 'Core' to quickly compile the basic ACE+TAO - components. - -Thu Jan 11 09:56:43 2001 Frank <fhunleth@cs.wustl.edu> - - * ACE version 5.1.12 released. - -Thu Jan 11 05:38:24 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/TP_Reactor.cpp: Reverted the change that was made for SPRO - 5.1 compilers. The change that was reverted is this - - Thu Jan 4 17:14:33 2001 Balachandran Natarajan - <bala@cs.wustl.edu> - - * ace/Handle_Set.cpp: Changed the macro - - ACE_DIV_BY_WORDSIZE(x) ((x) >> (ACE_Handle_Set::WORDSIZE)) to - - ACE_DIV_BY_WORDSIZE(x) ((x) >> ((int) - ACE_Handle_Set::WORDSIZE)). This seems to be a better - fix. Thanks to David Allen <dallen@storm.com> for suggesting - this. - -Tue Jan 9 09:53:53 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/MEM_Stream_Test.cpp: - Run the event loop for at most 1 minute. After that we know - that something is amiss with the client threads, and we should - exit. This fixes the deadlock problems we were seeing in the - nightly builds. - The real cause of the problem is something broken with the way - MEM_Addr objects compare local addresses, sometimes they fail to - compare equal. In the test this results in failed connections. - -Mon Jan 8 18:53:39 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> - - * examples/Map_Manager/test_hash_map_manager.cpp: - Removed template instantiations for - ACE_Guard<ACE_SYNCH_RW_MUTEX>, - ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>, and - ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> to fix linker - errors under Lynx_I386. - -Mon Jan 8 10:44:57 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS.h: - - Added some more protection (!VXWORKS) around the cuserid - inline statement since VXWORKS doesn't have cuserid. - -Mon Jan 08 10:04:55 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/Thread_Manager.cpp (terminate): Reordered some statements so - we get the thread descriptor's log_msg pointer before we delete - the thread descriptor. Thanks to Tomer Amiaz - <Tomer@bandwiz.com> for reporting this. - -Sun Jan 7 16:51:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/ace_dll.dsp: - - Removed the PACE libraries from linking. We are going to come - up with a different solution for pace. - - * docs/run_test.txt: - - Changed the instructions a little to use PerlACE::LocalFile - for the server's IOR file. - -Sun Jan 7 08:59:09 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/DLL_Test.cpp: Added a message in a ACE_ERROR statement. - * tests/run_test.lst: Disabled MEM_Stream_Test in Linux. - -Thu Jan 4 17:14:33 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/TP_Reactor.cpp (dispatch_i): Eliminate a portion of the - code from SunCC5 builds. This piece of code was trying to set - things right when it sees all the masks clear and the <size_> - greater than zero. This seems to be creating problems with SunCC - 5 builds alone. Commenting out this piece for SunCC5 helps. This - should also be a work around for the bug #750 in bugzilla. - -Thu Jan 04 17:07:48 2001 Luther Baker <luther@cs.wustl.edu> - - * ace/ace_dll.dsp - - Consistent typography (win32 specific backslash). - -Thu Jan 4 15:34:14 2001 Luther J Baker <luther@cs.wustl.edu> - - * ace/ace_dll.dsp - - Added PACE library to the ACE DLL project file. - (also changed the library search path) - -Wed Jan 3 17:24:11 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS.h: - - Mistakenly changed the ace_timezone () method to use - timezone () instead of timezone. Changed back. - -Wed Jan 3 16:00:22 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/ACE.cpp - - Changed the types of day_of_week_name and month_name in - ACE::timestamp to ACE_TCHAR (since that was the data - being assigned to it and the type that is later expected). - This fixed errors in Win32's Unicode build. - -Wed Jan 3 15:44:31 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS.i: - - Removed ACE_TIMEZONE since we found another workaround for - platforms that define timezone () as a macro. - - * ace/OS.h: - * ace/OS.i: - - Moved much of the code from ACE_OS::timezone and - ACE_OS::difftime into ace_timezone and ace_difftime. Since - some platforms don't have timezone or difftime, we needed - to do something here so those methods aren't used. Instead - of figuring out what larger #if !... should be, it is easier - (and less error prone) to just move the code here. - -Wed Jan 3 13:10:39 2001 Darrell Brunsch <brunsch@uci.edu> - - * apps/JAWS/server/HTTP_Helpers.cpp: - - Added ACE_MT around an ACE_Guard to remove an unused var - warning in the single threaded builds. - -Wed Jan 3 12:56:13 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/Timer_Wheel_T.cpp: - * ace/Timer_Wheel_T.h: - - Doug noticed some redundant code in expire while making his - change on the 21st. I checked and he was right, it looks like - I was moving around the loop termination conditionals and left - some around. Removed them and also added some better comments - and made it more doxygen complient. - -Wed Jan 3 12:06:20 2001 Darrell Brunsch <brunsch@uci.edu> - - * tests/Refcounted_Auto_Ptr_Test.dsw: - - Projects are listed in tests.dsw, so this is unneeded. - - * tests/tests.dsw: - - Added Refcounted_Auto_Ptr_Test.dsp. - -Tue Jan 3 10:30:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * docs/msvc_notes.txt: - - Added this file explaining some issues or explanations on how - ACE/TAO are set up for use with MSVC. Mainly I'm thinking of - this as a place to put random stuff about ACE and TAO on MSVC. - - Plus I think we need more nifty doxygen documents. ;-) A tip of - the hat goes to Letha Etzkorn <letzkorn@cs.uah.edu> and - Shivakumar Patil <shivakumar.patil@stdc.com> for bringing up - questions that led to the dump of info to this file. - - * ACE-INSTALL.html: - - Added a reference to msvc_notes.txt. - -Wed Jan 3 09:15:24 2001 Jeff Parsons <parsons@cs.wustl.edu> - - * ace/ACE.cpp: - - Replaced these lines - - SYSTEMTIME local; - ::GetLocalTime (&local); - - in the timestamp() method. - They were removed the last time this file was - modified, breaking the Win32 builds. - -Wed Jan 03 05:49:11 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.h: - The ace_cuserid() helper cannot be defined in Win32 - -Wed Jan 03 05:42:20 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.h: - Remove broken #include of unistd.h, it was a debug statement - that sneaked through the commit. - -Tue Jan 2 18:33:03 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.h: - * ace/OS.i: - Workaround platforms that define timezone, difftime or cuserid - as macros. Instead of just dropping support for the ACE_OS::XXX - method we create an inline ace_XXX() function, that uses the - original macro expansion, then we #undef the offending macro, - and use the inline function in the code. - - * ace/config-tru64.h: - Enable cuserid() again, with the new workaround it should work - without problems. - This fix should remove some of the redness in the TRU64_CXX - builds. - -Tue Jan 2 14:22:21 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - Add the DII version of Param_Test to the nightly builds. - -Tue Jan 2 10:25:30 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/Cached_Connect_Strategy_T.cpp: Added the patch provided by - Edan Ayal <edan@bandwiz.com> for - ACE_Bounded_Cached_Connect_Strategy::find_or_create_svc_handler_i (). - -Tue Jan 2 09:03:18 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Asynch_Acceptor.{h,cpp}, - ace/POSIX_Async_IO.{h,cpp}, - ace/POSIX_Proactor.{h,cpp}, - ace/SUN_Proactor.{h,cpp}: Added enhanced versions of ACE_POSIX_Proactor - and ACE_SUN_Proactor to fix various problems uncovered and fixed by - Alexander Libman <Alibman@baltimore.com>. - - * ace/ACE.{h,cpp}: Fixed the timestamp() method so that it works - identically on Win32 and on UNIX. Also provided a new option - that'll make it possible to return a pointer to the beginning of - the time portion of "date and time." Thanks to Michael Searles - <msearles@base16.com> for contributing these fixes. - -Mon Jan 01 16:35:00 2000 Michael Kircher <Micahel.Kircher@mchp.siemens.de> - - * tests/Reader_Writer_Test.cpp: Added a #ifdef to check for native - RW lock support. If the platform supports native RW locks we should - not report a failure on upgrading, because native RW locks do not - support upgrading, only our RW lock emulation does this. - Thanks to Frank and Doug for pointing out this failure. - -Sun Dec 31 14:12:08 2000 Ossama Othman <ossama@uci.edu> - - * bin/auto_run_tests.lst: - - Added TAO's "ForwardRequest" PortableInterceptor test to the - list of tests to run. - -Sun Dec 31 13:59:02 2000 David L. Levine <levine@cs.wustl.edu> - - * tests/Refcounted_Auto_Ptr_Test.cpp: on DIGITAL_UNIX - only, added a call to ACE_OS::exit () at the end of - the test so that it will terminate. [Bug 758] - -Sun Dec 31 10:28:43 2000 David L. Levine <levine@cs.wustl.edu> - - * include/makeinclude/platform_osf1_4.0.GNU (LIBS): - wrapped /usr/lib/cmplrs/cxx/libcxxstd.a with - $(wildcard), so that is ignored on systems on which - it doesn't exist, such as Tru64 5.1. - -Sun Dec 31 09:23:09 2000 David L. Levine <levine@cs.wustl.edu> - - * include/makeinclude/platform_tru64_cxx.GNU: added - support for Tru64 5.1 (DIGITAL_UNIX 0x510). - - * ace/config-tru64.h: added ACE_LACKS_CUSERID with - DIGITAL_UNIX >= 0x510, because cuserid () is a macro - in Tru64 5.1. - - Thanks to Carlos for tracking down this source of compilation - failure. - -Sat Dec 30 16:21:49 2000 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/Hash_Map_Manager_T.h: - * ace/Map_T.i: Fixed errors in g++ that were introduced while - applying the patches. - -Sat Dec 30 15:10:00 2000 Chris Gill <cdgill@cs.wustl.edu> - - * ace/RB_Tree.{cpp, h, i}: - tests/RB_Tree_Test.cpp: Fixed a bug in RB_delete_fixup that - occurs when the pointer to be fixed up is zero - solution is to - pass in a pointer to its parent, and maintain the parent pointer - and fixup pointer in tandem during the fixup function. Also - added a few functions to test the red-black invariant(s) at each - node of the tree, and added an invariant test call after each - bind and unbind in a new stress test in RB_Tree_Test.cpp. - - Thanks to Klaus H. Wolf <hw@cyland.com> for pointing out the - problem and for contributing the stress test (which in a - slightly modified form is now part of the RB_Tree_Test.cpp code) - that reproduced the problem. - -Sat Dec 30 11:12:08 2000 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/Hash_Map_Manager_T.h: - * ace/Map_T.i: - * ace/Message_Block_T.cpp: Added patches provided by J. Russell - Noseworthy <rnosewor@objectsciences.com> for SPRO 5.1. The patch - to config-sunos-5.5.h has not been applied as it breaks builds - on SunCC 5.0. - -Fri Dec 29 17:08:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * bin/auto_compile: - - Added a -sendreport option to enable the sending of email at all. - Now by default it will not. - -Fri Dec 29 16:53:22 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp (main), - * performance-tests/TTCP/C/new-ttcp.cpp (main), - * tests/Conn_Test.cpp: Incorrect use of %r, which caused - problems... Thanks to Mike Curtis <mccurry@my-deja.com> for - pointing this out. - -Fri Dec 29 14:21:01 2000 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/MEM_SAP.cpp: Fixed incorrect ACE_RCSID identifier. Thanks - to Jerry Odenwelder <jerryo@atl.fundtech.com> for noticing this. - -Thu Dec 28 16:02:51 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/sandbox.cpp: - This program executes a child process (and its children), in a - new session and process group. If the process tree does not - finish before a given timeout (the first argument) the whole - tree is terminated. - The program is useful for test scripts and programs, - occasionally they hang the whole auto build. - - * bin/auto_compile: - Add new options '-sandbox' and '-sandbox_timeout' to support the - sandbox program. - -Thu Dec 28 16:10:59 2000 Frank Hunleth <fhunleth@cs.wustl.edu> - - * performance-tests/UDP/udp_test.cpp: - * performance-tests/Server_Concurrency/Latency_Stats.h: - * performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp - * performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp - Fixed compile problems under VxWorks when handling - 64 bit integers. Basically, truncated the 64 bit integers - to 32 bit integers for operations not supported by - ACE_U_LongLong. - -Wed Dec 27 15:32:43 2000 Frank Hunleth <fhunleth@cs.wustl.edu> - - * examples/Reactor/WFMO_Reactor/test_network_events.cpp: - Added missing ; - -Wed Dec 27 11:11:02 2000 Carlos O'Ryan <coryan@uci.edu> - - * examples/Map_Manager/test_hash_map_manager.cpp: - * examples/Misc/test_trace.cpp: - * performance-tests/Misc/test_singleton.h: - * performance-tests/Misc/test_singleton.cpp: - Fixed problems in single threaded builds, basically I use the - ACE_SYNCH_* macros instead of using the class directly. - -Tue Dec 26 18:53:06 2000 Carlos O'Ryan <coryan@uci.edu> - - * performance-tests/Server_Concurrency/Makefile: - The tests make no sense if threads are disabled, so they are not - compiled under that configuration. - -Tue Dec 26 18:31:08 2000 Carlos O'Ryan <coryan@uci.edu> - - * examples/Naming/test_open.cpp: - Fixed compilation problems under Sun/CC 4.2, the Log_Msg.h file - was not #included - -Tue Dec 26 14:45:50 2000 Ossama Othman <ossama@uci.edu> - - * bin/auto_run_tests.lst: - - Added TAO's "Dynamic" and "IORInterceptor" PortableInterceptor - tests to the list of tests to run. - -Tue Dec 26 11:49:49 2000 Nanbor Wang <nanbor@cs.wustl.edu> - - * examples/IPC_SAP/SPIPE_SAP/server.cpp: Fixed a statement not - reachable warning on KCC. - -Sat Dec 23 18:11:02 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/SString.cpp: Enhanced the implementation so that it works - correctly when binary data (i.e., data that may contain NUL - characters) is stored in a string. Thanks to Michael Lindner - <mikel@att.net> for reporting this. - -Fri Dec 22 15:18:49 2000 Steve Huston <shuston@riverace.com> - - * ace/ace-dll.icc: Added Basic_Stats.{h cpp} to build clean. - -Fri Dec 22 14:00:41 2000 Steve Huston <shuston@riverace.com> - - * ace/config-all.h: On HP-UX 11, when figuring ACE_bad_alloc exception - class, account for older compilers that don't define __HP_aCC. - -Fri Dec 22 12:56:06 2000 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/ACE.cpp (process_active): Call CloseHandle before return to - avoid handle leaks on Win32. Thanks to Arnaud Compan - <compan@ipanematech.com> for the fix. - -Fri Dec 22 13:04:58 2000 Balachandran Natarajan <bala@cs.wustl.edu> - - * bin/run_all_list.pm: Added the bidirectional test to the list. - -Fri Dec 22 12:43:54 2000 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/OS.h: Fixed a typo. - -Fri Dec 22 09:12:37 2000 Steve Huston <shuston@riverace.com> - - * ace/OS.h: ACE_DEFAULT_FILE_PERMS - added FILE_SHARE_DELETE to the - bits if building on Win NT4 or greater. Thanks to Nanbor Wang - for calling attention to this. - -Fri Dec 22 08:06:10 2000 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> - - * tests/Refcounted_Auto_Ptr_Test.cpp: Fixed the problem with an - undefined ACE_Auto_Basic_Ptr<Scheduler> by adding an explicit - template instantiation. Thanks to Frank A. Hunleth - <fhunleth@cs.wustl.edu> for reporting this. - -Thu Dec 21 18:12:38 2000 Steve Huston <shuston@riverace.com> - - * ace/ace-dll.icc, ace-lib.icc: Added OS_Errno.(cpp h) to the files - list. Thanks to Jerry Odenwelder for pointing out the need for these. - -Thu Dec 21 16:45:28 2000 Steve Huston <shuston@riverace.com> - - * tests/Capabilities_Test.cpp: Added missing \n to a ACE_ERROR - statement, and added ACE_DEFAULT_FILE_PERMS to the ACE_OS::open - call to create the test file. It used to be 0600, but that was - removed to satisfy Win32 which now pays attention to that arg. - -Thu Dec 21 05:50:51 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Timer_Wheel_T.cpp (expire): Fixed a mistake where - next_earliest_time should have been next_earliest. Thanks to - Keith Brown <kalbrown@ix.netcom.com> for reporting this. - - * examples/IPC_SAP/SOCK_SAP/Makefile.bor: Reenable CPP-inserver-fancy.cpp - now that it compiles! Thanks to Johnny Willemsen - <johnny.willemsen@meco.nl> for confirming this. - - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp (handle_events): Added - casts for (SOCKET) when using FD_SET to work around problems - with Borland. Thanks to Johnny Willemsen - <johnny.willemsen@meco.nl> for reporting this. - - * ace/Message_Block.h (ACE_Dynamic_Message_Strategy): Fixed a bunch - of non-const accessor methods to be const. Thanks to Johnny - Willemsen <johnny.willemsen@meco.nl> for reporting this. - - * examples/Naming/Makefile (BIN2): Added the test_open.cpp file - to the Makefile. Thanks to Johnny Willemsen - <johnny.willemsen@meco.nl> for reporting this. - - * docs/tutorials/016/page02.html: Clarify that signal() or - broadcast() don't release the mutex. Thanks to Mike Curtis - <mccurry@my-deja.com> for pointing this out. - -Wed Dec 20 19:44:16 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * examples/Reactor/WFMO_Reactor/test_abandoned.cpp, - * examples/Reactor/WFMO_Reactor/test_directory_changes.cpp, - * examples/Reactor/WFMO_Reactor/test_network_events.cpp, - * examples/Reactor/WFMO_Reactor/test_prerun_state_changes.cpp, - * examples/Reactor/WFMO_Reactor/test_registration.cpp, - * examples/Reactor/WFMO_Reactor/test_registry_changes.cpp, - * examples/Reactor/WFMO_Reactor/test_talker.cpp, - * examples/Reactor/WFMO_Reactor/test_window_messages.cpp: - - * ace/Sock_Connect.cpp: The ACE 5.1.11 implementation of - ACE_Sock_Connect::get_ip_interfaces() fails when run on Windows - 2000 when ACE_HAS_WINSOCK2 = 0. This is because - get_ip_interfaces() checks the registry for the available - interfaces and fails when it encounters a new entry in windows - 2000 named "Device\NDisWanIP". The patch is to ignore invalid - devices and continue checking. Thanks to Chris Hafey - <chris@stentorsoft.com> for contributing this fix. - -Wed Dec 20 15:57:32 2000 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/RMCast/RMCast_IO_UDP.cpp - * ace/RMCast?RMCast_IO_UDP.h - * ace/RMCast/RMCast_IO_UDP.i : cleaned up tabs and trailing ws from - last submission... - -Wed Dec 20 16:18:49 2000 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/simple_test_proactor.cpp: Removed unused - 'initial_read_size' variable from file scope. - - * examples/Reactor/Proactor/test_aiosig_ace.cpp (setup_signal_handler): - * examples/Reactor/Proactor/post_completions.cpp: - * examples/Reactor/Proactor/test_end_event_loop.cpp: - * examples/Reactor/Proactor/test_cancel.cpp (Receiver::open): - Fixed unused variable warnings for gcc. - -Wed Dec 20 15:42:36 2000 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/RMCast/RMCast_IO_UDP.cpp - * ace/RMCast?RMCast_IO_UDP.h - * ace/RMCast/RMCast_IO_UDP.i : The g++ cross compiler 2.9-gnupro-98r2 - for target Lynx 3.0.1 host Solaris 2.6 was breaking with an internal - error at the end of handle_input(). Replacing a couple of lines of - code with the private, inline method allocate_and_bind_proxy() gets - around the problem. - -Wed Dec 20 15:32:44 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * examples/Threads/wfmo.cpp: Move the function calls etc. out of - the ACE_ASSERT() macros. Thanks to Mike Curtis - <mccurry@my-deja.com> for pointing this out. - -Tue Dec 19 15:08:40 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Logging_Strategy.cpp: If ACE_LACKS_IOSTREAM_TOTALLY we'll - use a "regular" file. Thanks to Sangwoo Jin for contributing - this fix. - - * ace/Mem_Map.cpp (map_it): In using ACE_Mem_Map, if the - ACE_Mam_Map::map's <offset> parameter is set to non-zero and the - <len> parameter is set to -1 then the right value to map should - be <mapped file size> - offset. Thanks to Sangwoo Jin for - reporting this and suggesting the fix! - - * ace/INET_Addr.{h,i}: Make operator < const. Thanks to - Michael Lindner <mikel@att.net> for reporting this. - -Tue Dec 19 18:39:27 2000 Luther J Baker <luther@cs.wustl.edu> - - * ace/WFMO_Reactor.cpp (simple_dispatch_handler): - - When ACE_HAS_PACE on NT, ACE must use pace_siginfo_t instead - of creating and using its own. The ACE version of siginfo_t - happens to use constructors and so, the code that uses - this ACE siginfor_t instantiates the struct via a constructor. - When ACE_HAS_PACE, the pace_siginfo_t cannot be instantiated - via constructor. - - My edit just chooses the correct method of instantiation - based on ACE_HAS_PACE. - -Tue Dec 19 18:21:52 2000 Luther J Baker <luther@cs.wustl.edu> - - * ace/Thread.h (ACE_Thread): - - Removed the default value on the overriden join (...) - function that took three parameters. - -Tue Dec 19 14:50:38 2000 Steve Huston <shuston@riverace.com> - - * ace/OS.h: If on ACE_WIN32, set ACE_DEFAULT_FILE_PERMS to - (FILE_SHARE_READ | FILE_SHARE_WRITE), not 0666. - -Tue Dec 19 14:40:26 2000 Steve Huston <shuston@riverace.com> - - * ace/Filecache.cpp: Changed definition of R_MASK and W_MASK to - 0 for ACE_WIN32; used to be for __BORLANDC__. This is related - to the change below because the third arg to ACE_OS::open is - not ignored any longer for Win32. - - * tests/Capabilities_Test.cpp: On ACE_OS::open, don't supply a - <perms> arg - let it default. The file gets deleted at the end of - the test and has nothing to be protected. Related to the below - change as well. - - * tests/Mem_Map_Test.cpp: Changed all the 0666 args to ACE_OS::open - to ACE_DEFAULT_FILE_PERMS. - -Tue Dec 19 11:02:41 2000 Steve Huston <shuston@riverace.com> - - * ace/OS.{h cpp} (open(char), open(wchar)): Changed the <perms> - argument to be used in the CreateFile call on Win32. Made the - default value of the argument match the old behavior (defaults - to FILE_SHARE_READ | FILE_SHARE_WRITE (and FILE_SHARE_DELETE on - NT4 and Win2K)). Thanks to Edan Ayal <edana@bandwiz.com> for this - suggestion! - -Mon Dec 18 20:47:40 2000 Ossama Othman <ossama@uci.edu> - - * ace/POSIX_Asynch_IO.h: - - Reverted previous change. It introduced compile-time errors. - -Mon Dec 18 19:07:31 2000 Steve Huston <shuston@riverace.com> - - * ace/Asynch_IO.h, ace/POSIX_Asynch_IO.h: Clarified/corrected some - comments regarding the write() operation getting its data from - the message block's rd_ptr. - -Mon Dec 18 11:44:11 2000 Nanbor Wang <nanbor@cs.wustl.edu> - - * tests/MEM_Stream_Test.cpp (connect_client): Fixed an unused - argument warning on KCC compiler. - -Mon Dec 18 11:00:14 2000 Nanbor Wang <nanbor@cs.wustl.edu> - - * tests/MEM_Stream_Test.cpp: Fixed problems when threads are not - supported and when explicit template instantiation is required. - -Sun Dec 17 20:11:08 2000 Nanbor Wang <nanbor@cs.wustl.edu> - - * tests/MEM_Stream_Test.cpp: - * tests/MEM_Stream_Test.dsp: - * tests/Makefile: - * tests/Makefile.am: - * tests/Makefile.bor: - * tests/run_test.lst: - * tests/run_tests.bat: - * tests/run_tests.lst: - * tests/run_tests.psosim: - * tests/tests.dsw: - * tests/version_tests/MEM_Stream_Test.dsp: - * tests/version_tests/version_tests.dsw: Added a new - MEM_Stream_Test. - -Sun Dec 17 19:32:58 2000 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/Malloc_T.cpp (shared_malloc): After a win32 structural - exception occurs, we need to re-execution the expression that - causes the exception. Thanks to Roger Beck - <roger_beck@royalsun.com.au> for reporting this. - - * ace/MEM_IO.i (fetch_recv_buf, recv): Differentiate the - cases of end of message and errors. - - * ace/Malloc_T.h: - * ace/Malloc_T.i: Added a base_addr method to return the base - address of the ACE_Malloc so we don't have to depend on MMAP's - base_addr method. - - * ace/MEM_SAP.i (set_buf_len,get_buf_len): Changed to computer - buffer location using the base_addr method in ACE_Malloc as the - one in Memory_Pool only indicates the fixed based addr. - - * ace/MEM_Acceptor.i: - * ace/MEM_Acceptor.h: Added a method to set the prefix of MMAP - filename. - - * ace/MEM_Acceptor.cpp (ACE_MEM_Acceptor): - * ace/MEM_Connector.cpp (ACE_MEM_Connector): Changed to MMAP - Options to allow MMAP files to be mapped at any address. - -Sun Dec 17 18:42:13 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Refcounted_Auto_Ptr.h: Need to add "ace/Auto_Ptr.h" here to - get the definition of ACE_Basic_Auto_Ptr. - - * tests: Added the Refcounted_Auto_Ptr_Test.cpp, which tests - the new ACE_Refcounted_Auto_Ptr class. Thanks to Johnny Tucker - <JTucker@infoglide.com> for contributing this. - - * tests/Refcounted_Auto_Ptr_Test.dsp, - tests/Refcounted_Auto_Ptr_Test.dsw - tests/Refcounted_Auto_Ptr_Test.icc: Added the projects to - compile the Refcounted_Auto_Ptr_Test.cpp. - - * tests/Makefile, - * tests/run_test.lst, - * tests/run_tests.lst: Added the Refcounted_Auto_Ptr_Test. - -Sun Dec 17 11:00:47 2000 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/Date_Time.i (update): Fixed a typo. - -Sun Dec 17 08:52:04 2000 Carlos O'Ryan <coryan@uci.edu> - - * etc/tao_smartproxies.doxygen: - This file was left out from a previous commit. - -Sat Dec 16 09:36:56 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Date_Time: Added a new method update() to reset the current - date/time and also added a new constructor that calls update() - to initialize an ACE_Date_Time implicitly, rather than having to - pass all the values into the constructor. Thanks to Jerry - Odenwelder <jerryo@atl.fundtech.com> for contributing this. - -Fri Dec 15 15:27:02 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_compile: - * bin/make_pretty.pl: - The DU/CXX compiler has three levels, 'Error', 'Warning' and - 'Info:', the latter was being ignored. - -Fri Dec 15 14:36:33 2000 Christopher Kohlhoff <chris@kohlhoff.com> - - * include/makeinclude/clean.bor: - * include/makeinclude/recurse.bor: - - Added new 'realclean' target to Borland makefiles for - removing all generated files (both intermediate and final). - Thanks to Johnny Willemsen <johnny.willemsen@meco.nl> for - suggesting this. - -Fri Dec 15 14:32:06 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Log_Msg.h (ACE_Log_Msg): Changed the documentation - to reflect the fact that the %a option causes the program to - abort() rather than exit(). Thanks to Mike Curtis - <mccurry@my-deja.com> for pointing this out. - -Fri Dec 15 14:29:44 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/generate_doxygen.pl: - Generate documentation for the new TAO_SmartProxies library. - -Fri Dec 15 10:22:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * bin/auto_run_tests.pl: - - Included PerlACE::Run_Test instead of ACEUtils and - ConfigList. - -Fri Dec 15 09:22:05 2000 Carlos O'Ryan <coryan@uci.edu> - - * examples/Connection/non_blocking/Makefile: - Fixed dependencies between the binaries and the library - generated in this directory, otherwise parallel builds can - fail. - -Thu Dec 14 10:36:45 2000 Darrell Brunsch <brunsch@uci.edu> - - * bin/auto_run_tests.lst: - * tests/run_test.lst: - - Converted to the new PerlACE::ConfigList style of .lst - files (can now say stuff like "Test: MSVC !Borland") - - * bin/auto_run_tests.pl: - * bin/auto_compile: - * tests/run_test.pl: - - Changed to use PerlACE::ConfigList. - - [Bug 729] - - * bin/ACEutils.pm: - - Made sure it would eat the -Config option so it will not - be a problem if old run_test.pl's don't get updated - immediately. - - * bin/msvc_auto_compile.pl: - - Added -d flag for debugging (just prints out what would be - compiled) - - * bin/fuzz.pl: - - Added a rudimentary run_test.pl out-of-date test. - -Thu Dec 14 10:20:49 2000 Chad Elliott <elliott_c@ociweb.com> - - * include/makeinclude/platform_lynxos.GNU - Allow users to set the debug option without using - 'override debug='. debug=0 now works properly. - -Thu Dec 14 06:00:12 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace: Removed makefile-light since it's no longer needed. - Thanks to Johnny Willemsen <johnny.willemsen@meco.nl> for - reporting this. - -Wed Dec 13 18:33:19 2000 Carlos O'Ryan <coryan@uci.edu> - - * html/README: - Add README file explaining why the directory is empty and why - the index.html URLs don't work unless you download or generate - the Doxygen files. - - * html/index.html: - Add entry for the smart proxies library. - -Wed Dec 13 18:27:29 2000 Carlos O'Ryan <coryan@uci.edu> - - * THANKS: - Add 'Pedro Ferreira' to the hall of fame. - -Thu Dec 13 18:18:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * bin/PerlACE/ConfigList.pm: (added) - * bin/PerlACE/Process.pm: (added) - * bin/PerlACE/Process_Unix.pm: (added) - * bin/PerlACE/Process_Win32.pm: (added) - * bin/PerlACE/Run_Test.pm: (added) - - These are a couple of Perl modules that will be used - to simplify current run_test.pl's and the auto_builds - and to allow us to run tests on Win32 for configurations - that output executables into subdirs (Win32 Release, - Win32 Static *, Borland). The conversion of scripts over - to the new style will occur in separate checkins. - - ConfigList provides a more powerful *.lst format for - specifying test lists. Process is a newer version of - the old bin/Process.pm that has a different interface - and a couple of extra methods for common tasks for - our scripts. And Run_Test.pm will replace the - bin/ACEutils.pm and be the main module for our - run_test.pl scripts. It contains some common subroutines - and automatically parses some arguments via ARGV. - - * docs/run_test.txt: (added) - - A bit of documentation on how new run_test.pl's will - look. - -Wed Dec 13 18:15:03 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/CDR_Stream.h: - Made some of the adjust() methods public, this is used to - optimize TAO's implementations of CORBA::Any. - -Wed Dec 13 12:59:49 2000 Darrell Brunsch <brunsch@uci.edu> - - * bin/PerlACE/Process_Unix.pm: - - Fixed PerlACE::Process on Unix to have the same interface as - the Win32 version. - -Tue Dec 12 09:52:00 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * Well, it looks like we finally have a new president in the - US, yow! - -Tue Dec 12 04:53:17 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Service_Config.{h,i}: Added an inequality operator. - Thanks to Mike Curtis <mccurry@my-deja.com> for pointing this - out. - - * ace/Service_Config.cpp (process_commandline_directives): Changed - a check for error values being -1 to being != 0 since process_directive() - can return - - 1) a positive number of parse errors - 2) and -1 on a certain ACE_NEW_RETURN call - 3) but always zero on success. - - Thanks to Mike Curtis <mccurry@my-deja.com> and - Munagala Ramanath <Munagala.Ramanath@PostX.com> - for pointing this out. - -Tue Dec 12 01:07:39 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/Log_Msg.cpp: - - Changed a comment to remove a false warning by fuzz. - -Mon Dec 11 15:10:00 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Get_Opt.h: - In some platforms 'optind', 'optarg' and 'opterr' are defined as - macros, undefine them because we use the same identifiers as - variable names. - - * ace/OS.h: - If 'timezone' is defined as a macro in the system header files - then define ACE_TIMEZONE and #undef timezone. - The ACE_OS::timezone() method cannot be compiled otherwise, but - unfortunately this forces us to disable support for the method - under that sort of platform. - - * ace/OS.h: - Do not include sys/shm.h if ACE_LACKS_SYSV_SHMEM is defined, - there is no reason to #include the file if we are not using it - anyway. - - * ace/ACE.cpp: - Check the return value from getrlimit() before accepting its - results. - -Mon Dec 11 00:50:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/ace_wchar.h: - - Created an ACE_ANTI_TCHAR and ACE_TEXT_ANTI_TO_TCHAR. - ACE_ANTI_TCHAR has the opposite behavior of ACE_TCHAR. - - * ace/Process.cpp: - * ace/Process.h: - * ace/Process.i: - - Added wchar_t versions of: - - - ACE_Process_Options::working_directory (wd) - - ACE_Process_Options::command_line (format, ...) - - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - - Added wchar_t versions of: - - - ACE_OS::cond_init () - 2 versions - - ACE_OS::mutex_init () - - ACE_OS::thread_mutex_init () - - ACE_OS::event_init () - - ACE_OS::sema_init () - - On Win32, these should be implemented using the *W version - of the APIs. On other platforms, they call the char version - of the same ACE_OS call with a converted string. - - * ace/Log_Msg.h: - * ace/Log_Msg.cpp: - - Changed the first parameter to set and conditional_set from - being ACE_TCHAR to just char. We'll assume filenames are - always ansi strings (since __FILE__ seems to act this way). - There was actually a dangling pointer problem in the - conditional_set when ACE_USES_WCHAR was defined before. - - Added an ANTI_TCHAR version of log (priority, format, ...). - What this means is now we can use either narrow or wide - format strings with Log_Msg, regardless of whether ACE_USES_WCHAR - is defined or not. Hopefully this means we can get rid of a lot - of the ACE_TEXT and ACE_LIB_TEXT's in our code. - - Added a couple of more specifiers, %C and %w. So for characters - and strings we have: - - %c : print out an ansi character - %C : print out an ansi string - %s : print out an ACE_TCHAR * string - %w : print out a wide character - %W : print out a wide string - - An example, which will also function correctly even when - ACE_USES_WCHAR is defined: - - void print (char *a_str, wchar_t *w_str, ACE_TCHAR *t_str) - { - ACE_DEBUG ((LM_DEBUG, - "%C %s %W\n", - a_str, - t_str, - w_str)); - } - - Unfortunately this only really takes care of the string - specifiers. There is still work to be done with the other - implicit string specifiers (%p, %N, etc.). - - * ace/RMCast/RMCast_IO_UDP.cpp: - * ace/RMCast/RMCast_Reassembly.cpp: - * ace/SSL/SSL_Context.cpp: - * ace/SSL/SSL_SOCK_Acceptor.cpp: - * ace/SSL/SSL_SOCK_Connector.cpp: - * ace/SSL/SSL_SOCK_Stream.i: - - Removed unnecessary ACE_TEXT's to see how things go. - - * docs/wchar.txt: - - Updated the documentation. - -Fri Dec 8 13:47:58 2000 Jeff Parsons <parsons@cs.wustl.edu> - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - - Added Refcounted_Auto_Ptr.{h,i} to these projects. - -Fri Dec 8 10:34:32 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Makefile: Added Refcounted_Auto_Ptr to the list of template - files. - - * ace/Auto_Ptr.{h,i}: - * ace/Refcounted_Auto_Ptr.{h,i}: Moved the new - ACE_Refcounted_Auto_Ptr into a separate file to reduce - unnecessarily coupling in ACE. Thanks to Darrell Brunsch for - pointing this out. - -Fri Dec 8 09:27:01 2000 Chad Elliott <elliott_c@ociweb.com> - - * include/makeinclude/platform_chorus4.x_g++.GNU: - - Modified to build only static libraries. Something changed - between the time of the port and now, which caused it to try - to build shared libraries (which Chorus 4.0 doesn't support). - -Fri Dec 8 06:47:12 2000 Christopher Kohlhoff <chris@kohlhoff.com> - - * tests/Makefile.bor: - - Use variable called TARGET_NAME instead of NAME to - prevent clash with nightly build scripts. - -Thu Dec 7 13:16:23 2000 Darrell Brunsch <brunsch@uci.edu> - - * examples/IPC_SAP/SPIPE_SAP/server.cpp: - - Removed PERMS global variable, since it wasn't being - used (which KCC noticed). - - * examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp: - * examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp: - * examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp: - * examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp: - - When calling ACE_OS::cuserid and passing a NULL pointer, it - should be cast to something like char * or wchar_t *. In - this case it should be a char *, so I added a - ACE_static_cast for it. - -Thu Dec 7 02:31:44 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/config-WinCE.h: - - Disabled inlining for SH3 Release configuration. The SH3 compiler - has problems with inlined functions (in this case, ACE_OS::dlerror's - static variable was staying unresolved). Thanks to Ricardo Chan - <ricchan@nortelnetworks.com> for pointing this out to me. - -Thu Dec 7 03:33:49 2000 Marina Spivak <marina@cs.wustl.edu> - - * bin/auto_run_tests.lst: - - Added RTCORBA MT test. - -Wed Dec 6 19:52:42 2000 Darrell Brunsch <brunsch@uci.edu> - - - * ace/Auto_Ptr.i: - - Added a couple of ACE_INLINEs and an include of Synch_T.h. - -Wed Dec 06 20:12:35 2000 Irfan Pyarali <irfan@cs.wustl.edu> - - * ace/Containers_T.cpp (operator=): In case the existing array is - larger than the rhs (right hand side), we don't have to free and - reallocate the existing array. However, we do need to run the - destructor on the array elements that will be replaced. Hence, - I added a call to ACE_DES_ARRAY_NOFREE for the elements being - replaced. - - This fixes bug 704. Thanks to Martin Krumpolec - <krumpo@pobox.sk> for reporting the bug and for providing an - example illustrating the problem. - -Wed Dec 6 14:29:13 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Auto_Ptr.{h,i}: Added a new set of class (ACE_Refcounted_Auto_Ptr_Rep, - ACE_Refcounted_Auto_Ptr) that implements support for a reference - counted auto_ptr. Thanks to Johnny Tucker - <JTucker@infoglide.com> for contributing this. - - * ace/Managed_Object.h: Added ACE_UNIMPLEMENTED_FUNC macros for - copy constructor and assignment operator in class - ACE_Cleanup_Adapter. Thanks to Johnny Willemsen - <johnny.willemsen@meco.nl> for reporting this. - - * tests/run_tests.sh: Prevent null or zero-length string test name from being - passed into the run() function. Thanks to Jon Loeliger - <jloeliger@chiaro.com> for reporting this. - - * tests/Log_Msg_Test.cpp, - * examples/Log_Msg/test_log_msg.cpp (main): - Replaced int with u_long to make compilers happy. Thanks to - Mike Curtis <mccurry@my-deja.com> for pointing this out. - -Tue Dec 5 11:45:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/SSL/SSL_SOCK_Acceptor.cpp: - - Added ACE_TEXT to a debug message. - -Tue Dec 5 10:07:14 2000 Carlos O'Ryan <coryan@uci.edu> - - * performance-tests/Misc/childbirth_time.cpp: - Use &function instead of just function, hopefully that will make - Sun/CC 5.0 happy. - -Tue Dec 5 09:38:22 2000 Ossama Othman <ossama@uci.edu> - - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - - Return "-1" instead of the result of the - ACE_SSL_SOCK_Stream::close() method. The latter may actually, - and most likely will return without error. - -Tue Dec 05 05:39:39 2000 Christopher Kohlhoff <chris@kohlhoff.com> - - * tests/Makefile.bor: - - Implemented 'clean' support in the ACE tests makefile. - -Tue Dec 05 02:02:51 2000 Irfan Pyarali <irfan@cs.wustl.edu> - - * ace/IPC_SAP.cpp (disable): Reverted this change: - - Tue Nov 21 17:42:36 2000 Pradeep Gore <pradeep@cs.wustl.edu> - - The change seemed too low level where it might end up effecting - more code than was intended. However, as I discussed with Chris - Uzdavinis <chris@atdesk.com>, the correct solution is to - specialize the activation of the Svc_Handler rather than its - accepting. - -Mon Dec 04 23:54:10 2000 Irfan Pyarali <irfan@cs.wustl.edu> - - * examples/Reactor/Proactor/test_proactor.cpp: - - - Receiver::open(): Only duplicate the message block when we are - faking the result. Otherwise, initiate_read_stream will create - its own message block. - - - Receiver::open(): Delete the fake result. - - - Receiver::handle_read_stream(): When there is no more data to - read, release the message block and delete the receiver. - - - Sender::transmit_file(): No need to duplicate the trailer. - - * ace/Proactor.cpp (~ACE_Proactor_Timer_Handler): - - The following was changed: - - this->thr_mgr ()->wait (); - - to: - - this->thr_mgr ()->wait_grp (this->grp_id ()); - - since Thread_Manager::wait() if called while the - ACE_Object_Manager is shutting down (as a result of program - shutdown or ACE::fini), it will not wait for any threads to - complete. - - Also, the timer_handler thread was not created detached since - Thread_Manager::wait_grp() does not wait on detached threads. - -Mon Dec 04 16:32:11 2000 Ossama Othman <ossama@uci.edu> - - * ace/SSL/SSL_SOCK_Stream.i (recv): - - Shutdown the SSL connection if SSL_read() returns with an - SSL_ERROR_ZERO_RETURN OpenSSL error condition. - SSL_ERROR_ZERO_RETURN indicates that the peer is shutting down, - and that a "close_notify" message SSL message has been issued by - the peer. A "close_notify" message indicates that no further - data will be sent through the given connection, so there is no - need to keep the connection open. - - Removed SSL_ERROR_WANT_{WRITE,X509_LOOKUP} switch statement - cases. They are apparently not necessary when performing a SSL - read. - - (send): - - Removed SSL_ERROR_WANT_{READ,X509_LOOKUP} switch statement - cases. They are apparently not necessary when performing a SSL - write. - - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - - Check that the X.509 verification didn't fail. If the - verification failed then do not continue. - - * ace/SSL/SSL_Context.cpp: - * ace/SSL/SSL_SOCK_Connector.cpp: - * ace/SSL/SSL_SOCK_Stream.cpp: - - Added missing ACE_RCSID macros. - - * ace/SSL/SSL_Context.h: - * ace/SSL/SSL_SOCK.h - * ace/SSL/SSL_SOCK_Acceptor.h: - * ace/SSL/SSL_SOCK_Connector.h: - * ace/SSL/SSL_SOCK_Stream.h: - - Doxygenated these headers. - - * ace/SSL/SSL_Context.i: - * ace/SSL/SSL_SOCK.cpp: - - Cosmetic updates. - -Mon Dec 04 12:45:46 2000 Steve Huston <shuston@riverace.com> - - * ace/High_Res_Timer.cpp: Corrected some problems with Linux on - Pentium that were introduced by this: - Fri Nov 10 10:42:31 2000 Steve Huston <shuston@riverace.com> - - * ace/High_Res_Timer.cpp: Replaced all occurrences of - "defined (ACE_HAS_PENTIUM)" with "defined (ACE_WIN32)" since - there is nothing Pentium-specific any longer in the Win32 - sections. - - Thanks to David Levine and Carlos O'Ryan for weeding this bug out. - -Mon Dec 4 07:39:16 2000 Johnny Willemsen <jwillemsen@remedy.nl> - - * examples/Service_Configurator/IPC-tests/clients: - Added Borland C++ Builder specific makefile. - -Sun Dec 3 20:03:16 2000 Ossama Othman <ossama@uci.edu> - - * examples/Web_Crawler/Command_Processor.cpp: - - Removed duplicate template instantiations. Thanks to Paul Rubel - <prubel@bbn.com> for pointing out this bug, and for providing a - fix. - - * THANKS: - - Added Paul to the Hall-of-Fame. - -Sun Dec 3 15:23:50 2000 Carlos O'Ryan <coryan@uci.edu> - - * performance-tests/Misc/childbirth_time.cpp: - Use 'extern "C"' for the thread entry point, this should make - Sun/CC 5.0 (and other compilers) happy. - -Sun Dec 3 08:50:15 2000 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/OS.i: Fixed a cut and paste error. This was from the BUG# - 734 in bugzilla. Thanks to Martin Krumpolec <krumpolec@pobox.sk> - for reporting this. - -Sat Dec 2 05:58:37 2000 Christopher Kohlhoff <chris@kohlhoff.com> - - * ace/config-win32-borland.h: - - Automatically define WIN32 macro if we are able to - determine that it is the target platform from pre- - defined compiler macros. - - * ace/Makefile.bor: - - Added missing template source file for install target. - -Sat Dec 2 00:19:38 2000 Marina Spivak <marina@cs.wustl.edu> - - * bin/auto_run_tests.lst: - - Added RTCORBA/Explicit_Binding test. - -Fri Dec 01 21:17:35 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Thread_Manager.cpp: - More ACE_LEGACY_MODE fixes. - -Fri Dec 1 13:49:36 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Log_Msg.cpp: - Fixed problems on non-legacy Win32 builds. - -Fri Dec 1 09:46:15 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Log_Msg.h: - * ace/Log_Msg.cpp: - The structured exception handler methods should show up on - ACE_LEGACY_MODE builds. Unfortunately, the change from - ACE_LATEST_AND_GRATEST to LEGACY_MODE didn't work here because - the LATEST_AND_GREATEST macro was misspelled. - -Fri Dec 1 09:30:08 2000 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/platform_linux.GNU: - Add support for wxWindows under linux. - -Fri Dec 1 10:56:42 2000 Jeff Parsons <parsons@cs.wustl.edu> - - * include/makeinclude/ace_flags.bor: - - Added definitions necessary for the new smart proxies - library and its Borland makefile. - -Fri Dec 01 09:21:31 2000 Steve Huston <shuston@riverace.com> - - * ace/Reactor.h: Clarified some comments. - -Thu Nov 30 22:49:10 2000 pradeep@cs.wustl.edu <pradeep@cs.wustl.edu> - - * ACE version 5.1.11 released. - -Wed Nov 29 23:55:37 2000 Pradeep Gore <pradeep@cs.wustl.edu> - - * apps/drwho/server.cpp: - * apps/drwho/BS_Client.cpp: - Used casts to quiet VxWorks/LynxOS. - * bin/auto_run_tests.lst: - Commented out this test - its broken. - -Wed Nov 29 10:35:26 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp (parse_args): - Removed the colon after the "r" in the parse-args list. Thanks - to Mike Curtis <mccurry@my-deja.com> for pointing this out. - - * ace/Method_Request.h: Added ACE_UNIMPLEMENTED_FUNC to the - assignment operator and copy constructor of ACE_Method_Request. - Thanks to Johnny Willemsen <johnny.willemsen@meco.nl> for - pointing this out. - -Wed Nov 29 09:41:51 2000 Johnny Willemsen <jwillemsen@remedy.nl> - - * examples/Reactor/Multicast/*.bor - Added Borland C++ Builder specific makefiles. Thanks to - Albert Wijna <albert.wijnja@meco.nl> for creating these. - -Tue Nov 28 15:39:51 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_compile: - Print out an error message when the script returns a non-zero - code. The errors where reported by email, but they didn't show - up in the make_pretty output. - -Tue Nov 28 15:36:10 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/generate_doxygen.pl: - Don't generate inline code for releases, it bloats the - documentation, and does not make things any clearer. - - * html/index.html: - Fixed URLs - - * etc/ace.doxygen: - * etc/ace_man.doxygen: - * etc/ace_rmcast.doxygen: - * etc/ace_ssl.doxygen: - * etc/tao_dynamicany.doxygen: - * etc/tao_dynamicinterface.doxygen: - * etc/tao_esf.doxygen: - * etc/tao_implrepo.doxygen: - * etc/tao_iormanip.doxygen: - * etc/tao_iortable.doxygen: - * etc/tao_portableserver.doxygen: - * etc/tao_rtevent.doxygen: - * etc/tao_strategies.doxygen: - Make sure that ACE_THROW_SPEC is properly defined. - - * etc/tao.doxygen: - Also fix the relative path to the ace doxygen files. - -Tue Nov 28 13:31:47 2000 David L. Levine <levine@cs.wustl.edu> - - * tests/run_test.pl: prefix exec of run_tests.sh with - $EXEPREFIX, so that it works without . in the user's - PATH. Thanks to Carlos for pointing this out. - -Tue Nov 28 08:09:35 2000 David L. Levine <levine@cs.wustl.edu> - - * tests/run_test.pl: added some more diagnostics to try - to figure out why run_tests.sh can't be exec'd on - UCI machines. - -Mon Nov 27 17:02:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ACE-INSTALL.html: - While following up on Johnny Willemsen's - <johnny.willemsen@meco.nl> suggestion to make sure I removed all - references to .mdp files, I noticed that some of the Win32 - instructions could use some updating. - -Mon Nov 27 17:44:52 2000 David L. Levine <levine@cs.wustl.edu> - - * tests/run_test.pl: if run_tests.sh doesn't exist, print - a diagnostic message and continue with the run_test.pl - version of the tests. For unknown reasons, this change: - Mon Nov 27 11:58:43 2000 David L. Levine <levine@cs.wustl.edu> - doesn't work on the UCI Linux machines, run_tests.sh can't - be exec'd. - -Mon Nov 27 10:17:58 2000 Ossama Othman <ossama@uci.edu> - - * docs/tutorials/005/005.dsp: - - Corrected name of output binary. It should have been - `server.exe' not `client.exe'. Thanks to David Channon - <djc@uq.net.au> for reporting this problem. - -Mon Nov 27 09:56:09 2000 Ossama Othman <ossama@uci.edu> - - The following updates are based on feedback from David Channon - <djc@uq.net.au>. Thanks David! - - * docs/tutorials/003/client.cpp: - * docs/tutorials/003/page01.html: - * docs/tutorials/004/client.cpp: - * docs/tutorials/004/page01.html: - * docs/tutorials/008/broadcast_client.cpp: - * docs/tutorials/008/directed_client.cpp: - * docs/tutorials/008/page02.html: - * docs/tutorials/008/page03.html: - * docs/tutorials/008/page04.html: - * docs/tutorials/008/server.cpp: - * docs/tutorials/009/broadcast_client.cpp: - * docs/tutorials/009/directed_client.cpp: - * docs/tutorials/009/page02.html: - * docs/tutorials/009/page03.html: - * docs/tutorials/009/page04.html: - * docs/tutorials/009/server.cpp: - * docs/tutorials/019/client.cpp: - * docs/tutorials/019/client2.cpp: - * docs/tutorials/019/page02.html: - * docs/tutorials/019/page03.html: - * docs/tutorials/019/page04.html: - * docs/tutorials/019/page05.html: - * docs/tutorials/019/server.cpp: - * docs/tutorials/019/server2.cpp: - * docs/tutorials/019/shmem.cpp: - * docs/tutorials/020/client.cpp: - * docs/tutorials/020/client2.cpp: - * docs/tutorials/020/mmap.cpp: - * docs/tutorials/020/page02.html: - * docs/tutorials/020/page03.html: - * docs/tutorials/020/page04.html: - * docs/tutorials/020/page05.html: - * docs/tutorials/020/server.cpp: - * docs/tutorials/020/server2.cpp: - - Include "ace/Log_Msg.h" to pull in the ACE_{DEBUG,ERROR} - macros. The example code in the HTML files was also updated. - - * docs/tutorials/011/message_queue.cpp: - * docs/tutorials/011/page02.html: - - Removed unnecessary line of code that NULL terminated a string. - It didn't serve any purpose since the string is already - terminated. If it wasn't terminated then that point in the code - would never have been reached since the code prior to it assumes - that the string is NULL terminated. - -Mon Nov 27 11:58:43 2000 David L. Levine <levine@cs.wustl.edu> - - * tests/run_test.pl: on platforms other than Win32, simply - exec run_tests.sh. run_tests.sh properly handles all of - the current ACE tests. [Bug 729] - -Mon Nov 27 14:12:09 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Activation_Queue.h: Added ACE_UNIMPLEMENTED_FUNC to the - assignment operator and copy constructor of - ACE_Activation_Queue. Thanks to Johnny Willemsen - <johnny.willemsen@meco.nl> for pointing this out. - -Sun Nov 26 19:07:48 2000 Pradeep Gore <pradeep@cs.wustl.edu> - - * examples/Map_Manager/test_hash_map_manager.cpp: - * examples/Shared_Malloc/Malloc.cpp: - * examples/Shared_Malloc/test_position_independent_malloc.cpp: - - Removed extraneous explicit template instantiation declarations - causing "multiply defined" errors on VxWorks and LynxOS. - -Sat Nov 25 22:08:46 2000 Pradeep Gore <pradeep@cs.wustl.edu> - - * apps/drwho/Makefile: - Disabled drwho compilation on Vxworks - it doesn't have - protocols/rwhod.h. - -Fri Nov 24 16:58:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/IPC_SAP.cpp: - - WSAEventSelect is not available on Windows CE, so the #ifdefs - were changed so it calls ioctl on Windows CE also. - -Fri Nov 24 15:43:20 2000 Carlos O'Ryan <coryan@uci.edu> - - * docs/ACE-categories.html: - Fixed URLs to Doxygen documents, I used the absolute URL to our - Doxygen site, but in the future we may want to do that - configurable. - - * bin/auto_run_tests.lst: - Disable the Connection_Purging test in TAO, it never worked and - the features are disabled while we continue to improve the - Connection Cache. - -Fri Nov 24 11:42:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ACE-INSTALL.html: - - Updated sections about Windows CE and MSVC. CE stuff - is documented in CE-status.txt, and removed references to old - MSVC 4.2 projects. Thanks to Johnny Willemsen - <johnny.willemsen@meco.nl> for pointing this out. - -Fri Nov 24 05:48:26 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Signal.h: Enhanced the documentation to clarify the role of - sigkey. Thanks to Oscar Rodriquez <Oscar.Rodriquez@eln.ericsson.se> - for motivating this. - - * ace/SOCK_Connector.h: Updated the documentation to clarify the - parameters to the constructors and the connect() method. Thanks - to Pierre Oberson <oberson@nagra-kudelski.ch> for suggesting this. - -Thu Nov 23 21:17:16 2000 David L. Levine <levine@cs.wustl.edu> - - * tests/Reactor_Notify_Test.cpp (main): added - auto_ptr<ACE_Reactor> so that the global Reactor instance - will be destroyed at the termination of main (). The cleans - up memory leaks that we introduced in this change to the test: - Tue Oct 24 12:30:47 2000 Steve Huston <shuston@riverace.com> - -Thu Nov 23 18:38:54 2000 Carlos O'Ryan <coryan@cs.wustl.edu> - - * Makefile: - Add ACE_wrappers/html to the list of files tagged, even though - they are not included in the tar or zip files. - -Thu Nov 23 18:13:32 2000 Carlos O'Ryan <coryan@cs.wustl.edu> - - Don't use 'grep -q' because Solaris' grep does not support it. - -Thu Nov 23 18:27:52 2000 Carlos O'Ryan <coryan@cs.wustl.edu> - - * Makefile: - The ACE-INSTALL file is generated in the staging directory, - there is no need to generate it locally too. - -Thu Nov 23 17:46:56 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Method_Request: Made the priority() method const. Thanks - to Johnny Willemsen <jwillemsen@remedy.nl> - -Thu Nov 23 14:43:40 2000 Carlos O'Ryan <coryan@uci.edu> - - * Makefile: - Do not include the html directory in the release. The doxygen - files are too big for this. - - * ace/config-doxygen.h: - Improve doxygen documentation. - - * bin/generate_doxygen.pl: - Add options to change the path to find dot and perl on the fly. - - * bin/make_release: - Generate the HTML documentation in a separate .tar.gz (or .zip) - file. - -Wed Nov 22 17:35:55 2000 Angelo Corsaro <corsaro@cs.wustl.edu> - - * bin/auto_run_tests.lst: - - Added entry for Collocation test. Moved entry for Client - Exposed Policy test from the old list file to this one. - -Wed Nov 22 09:29:32 2000 Darrell Brunsch <brunsch@uci.edu> - - * etc/ace.doxygen: - - Added the docs directory and *.txt files to be looked - at by doxygen. - - * docs/CE-status.txt: - * docs/wchar.txt: - - Fixed up these files, so they show up correctly in the - doxygen html pages. - -Tue Nov 21 19:55:49 200 0 Pradeep Gore <pradeep@cs.wustl.edu> - - * ace/IPC_SAP.cpp: - Casting param1 to SOCKET did the trick. Thanks Doug! - -Tue Nov 21 19:21:10 2000 Pradeep Gore <pradeep@cs.wustl.edu> - - * ace/IPC_SAP.cpp: - - Reverted previous change applied to ACE_IPC_SAP::disable because - of compile error. - -Tue Nov 21 18:54:14 2000 Pradeep Gore <pradeep@cs.wustl.edu> - - * apps/drwho/CM_Client.cpp: - - Explicitly cast Comm_Manager::sokfd_ to int in calls to - ACE_OS::recvfrom and ACE_OS::closesocket to quiet LynxOS. - -Tue Nov 21 17:42:36 2000 Pradeep Gore <pradeep@cs.wustl.edu> - - * ace/IPC_SAP.cpp: - - Modified ACE_IPC_SAP::disable to call ::WSAEventSelect on Win32. - Thanks to Chris Uzdavinis <chris@atdesk.com> for contributing - these changes. - -Tue Nov 21 11:00:14 2000 Darrell Brunsch <brunsch@uci.edu> - - * tests/run_test.lst: - - Borland shouldn't be running ACE_Init_Test. - -Tue Nov 21 10:15:15 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS_String.inl: - - Changed ::towlower to towlower since it can be a macro. - -Tue Nov 21 09:57:53 2000 Darrell Brunsch <brunsch@uci.edu> - - * tests/Reactor_Exceptions_Test.cpp: - - Code style fix. - - * tests/run_test.lst: - - New_Fail_Test just eats up memory when run, and it only tests - the behavior of new. Not really something we need to run - everynight (and as David Levine reports, using up all the - memory can cause problems in other processes on the nightly - build machines). Commented out the New_Fail_Test. - - * tests/run_test.pl: - - Fixed to clean up some of the backing_store_* files in the - tests directory after running the tests. - - * bin/ACEutils.pm: - - Added the ability to pick -ExeSubDir <dir> from the command - line to alter $EXEPREFIX. This should allow us to start - running tests with different configurations (ie. Win32 Release) - and on Borland. - -Tue Nov 21 07:24:54 2000 Chris Kohlhoff <chris@kohlhoff.com> - - * ace/SSL/Makefile.bor: - * include/makeinclude/build_dll.bor: - * include/makeinclude/build_exe.bor: - * include/makeinclude/build_lib.bor: - - Prevent SSL libraries from being built unless SSL_ROOT is defined. - - * include/makeinclude/build_example.bor: - - Add missing libraries required for statically linking TAO examples. - -Mon Nov 20 21:52:57 2000 Ossama Othman <ossama@uci.edu> - - * ace/Makefile.am: - - Added more missing files to the source lists. - -Mon Nov 20 19:16:12 2000 Ossama Othman <ossama@uci.edu> - - * ace/OS.i (mutex_init): - - Fixed an unused argument warning that was showing up in - ACE+Autoconf builds. - - * ace/Makefile.am (libACE_Utils_la_SOURCES): - - Updated "Init.cpp" to "Init_ACE.cpp." For some reason this - file wasn't updated when the name change was made. - - (libACE_Utils_la_SOURCES): - - Moved `Sock_Connect.cpp' to this list of sources. Similar to - the above change, this files wasn't updated when the - corresponding to changes was made to the classical Makefile. - -Mon Nov 20 15:00:26 2000 Marina Spivak <marina@cs.wustl.edu> - - * bin/auto_run_tests.lst: - - Added RTCORBA/Private_Connection, updated options for other - RTCORBA tests. - -Sun Nov 19 15:26:56 2000 Ossama Othman <ossama@uci.edu> - - * ace/SSL/sslconf.h - (ACE_DEFAULT_SSL_CERT_FILE, ACE_DEFAULT_SSL_CERT_DIR): - - On Win32, do not use UNIX-specific directories in certificate - paths. - -Sun Nov 19 10:37:48 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Add the new files to the MSVC projects. - - * ace/Dynamic_Service_Base.h: - Add missing file. - - * ace/Dynamic_Service_Base.cpp: - Removed template-like protections, this is a regular class. - - * ace/Dynamic_Service.i: - * ace/Dynamic_Service.cpp: - Cosmetic fixes. - -Sun Nov 19 08:05:08 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/Makefile: - Updated. - - * ace/Dynamic_Service.cpp: - * ace/Dynamic_Service.h: - * ace/Dynamic_Service_Base.cpp: - * ace/Dynamic_Service_Base.h: - Not all methods in Dynamic_Service were based on the SERVICE - types. Moved those to the base class 'Dynamic_Service_Base' and - the Dynamic_Service inherits from the base class. - -Sat Nov 18 15:39:49 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp: - Fixed a mistake in the "usage" string. Thanks to Mike Curtis - <mccurry@my-deja.com> for pointing this out. - -Sat Nov 18 11:35:53 2000 Darrell Brunsch <brunsch@uci.edu> - - * tests/OS_Test.cpp: - - Changed the signature of main to use ACE_TCHAR. Although - I don't consider this the "right" way of doing this, it - will make the builds happy with ACE_USES_WCHAR until we - implement something better. - -Sat Nov 18 09:58:17 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Basic_Types.h: - * ace/OS_Log_Msg_Attributes.h: - * ace/config-all.h: - Under LynxOS we must #include stdarg.h before stdio.h. - Thanks to David for letting us know about this. - -Fri Nov 17 14:24:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * include/makeinclude/clean.bor: - - Added the removal of *Cli.cpp, *Ser.cpp, etc. files which - is the output style of the TAO Param_Test. - - * tests/Reactor_Exceptions_Test.cpp: - - Put the handler in its own scope so it must be cleaned up - before the reactor. For whatever reason, it wasn't happening - in the right order on MSVC before. - - Also changed the exception error to a debug message, since - it really doesn't seem an error (we explicitly cause one). - -Fri Nov 17 11:22:08 2000 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/platform_sunos5_kcc.GNU: - Same fix as for platform_linux_kcc.GNU. - A little more detail has surfaced: apparently under this - compiler we attempted to link the static run-time and system - libraries if static_libs_only=1 was set. Not only this would be - unique (in that we don't do this for other compilers), but it - fails when only one directory is compiled with - static_libs_only=1, hile only the dynamic version of ACE (or any - other of our libraries) is compiled. - IMHO it is better to make it consistent with all the other - platforms, and leave the extra optimization of using static - system libraries for a future makefile option. - - * include/makeinclude/platform_linux_kcc.GNU: - Remove obsolete comment - -Fri Nov 17 03:37:37 2000 Marina Spivak <marina@cs.wustl.edu> - - * bin/auto_run_tests.lst: - - Added RTCORBA/Banded_Connections test. - -Fri Nov 17 01:16:25 2000 Ossama Othman <ossama@uci.edu> - - * include/makeinclude/wrapper_macros.GNU (ssl): - - Removed definition of the ACE_HAS_SSL macro. It is no longer - used. - -Thu Nov 16 16:14:03 2000 Carlos O'Ryan <coryan@uci.edu> - - * Makefile: - * html/doxygen.css: - * html/index.html: - New html directory. People normally don't expect html documents - to show up under the man directory. - - * configure.in: - * bin/bootstrap: - * man/Makefile.am: - * man/html/Makefile.am: - Remove the man/html directory. - - * bin/make_release: - Insert code to generate the man pages index. - - * docs/ACE-categories.html: - Change references to man/html so they point to the new doxygen - generated files. - - * bin/README.html: - * bin/class2hxxcxx: - * bin/class2hxxcxxsingle: - * bin/class2info: - * bin/class2info.awk: - * bin/class2man: - * bin/class2mml: - * bin/class2src: - * bin/classinfo.ps: - * bin/generate_html_windex: - * bin/generate_man_pages: - * bin/hiding.fmt: - * bin/html-windex: - * bin/info2doc.awk: - * bin/info2doc.fmt: - * bin/info2head: - * bin/info2head.fmt: - * bin/info2headsrc: - * bin/info2man: - * bin/info2mml: - * bin/info2src: - * bin/info2src.awk: - * bin/man2html: - * bin/man2html1.awk: - * bin/man2html2.awk: - * bin/vendor.fmt: - Remove old scripts used in man page and html document - generation. We do everything with doxygen now. - -Thu Nov 16 17:55:18 2000 Pradeep Gore <pradeep@cs.wustl.edu> - - * apps/JAWS/clients/Blobby/Blob.{h,cpp}: - * apps/JAWS/clients/Blobby/Blob_handler.{h,cpp}: - * apps/drwho/Rwho_DB_Manager.h: - * apps/drwho/Multicast_Manager.{.h,cpp}: - * apps/drwho/Options.{h,cpp}: - Follow const correctness to make suncc5 happy. - - * examples/IOStream/server/iostream_server.h - Use ACE_HAS_TEMPLATE_TYPEDEFS rather than ACE_HAS_TYPENAME_KEYWORD - Thanks to Steve Huston <shuston@riverace.com> for the fix. - -Thu Nov 16 15:31:20 2000 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/platform_linux_kcc.GNU: - Builds with static libraries under Linux/KCC were failing due to - some magical -Bstatic options in the configuration file. When - the options are removed the problem went away. - -Thu Nov 16 15:31:20 2000 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/platform_linux_kcc.GNU: - Builds with static libraries under Linux/KCC were failing due to - some magical -Bstatic options in the configuration file. When - the options are removed the problem went away. - -Thu Nov 16 15:09:25 2000 Carlos O'Ryan <coryan@uci.edu> - - * tests/TkReactor_Test.cpp: - Fixed 'char*' vs. 'const char *' conflict. - -Wed Nov 15 14:23:54 2000 Ossama Othman <ossama@uci.edu> - - * configure.in: - - Fixed bug in the auto_ptr / C++ std namespace test where the - template argument for the auto_ptr being instantiated was - a non-existent type. - Reported by Kevin Marhsall <KCMarshall@att.net> - - * THANKS: - - Added Kevin to the hall of fame list. - -Wed Nov 15 10:19:45 2000 Carlos O'Ryan <coryan@uci.edu> - - * examples/Threads/thread_specific.cpp: - Fixed warning under linux - -Wed Nov 15 08:32:58 2000 Carlos O'Ryan <coryan@uci.edu> - - * apps/JAWS/server/Makefile: - * performance-tests/Misc/Makefile: - Change dependencies to ensure that the libraries are created - before we attempt to link the binaries, otherwise the - compilation fails with parallel builds. - -Tue Nov 14 17:55:52 2000 Carlos O'Ryan <coryan@uci.edu> - - * Makefile: - PACE is disabled by default, unless pace=1 is set in the command - line or the platform_macros.GNU file. - -Tue Nov 14 19:36:47 2000 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/test_siosig_ace.cpp: Don't log - the read/written file using ACE_DEBUG - it will usually overflow - the ACE_Log_Record max message length and do bad things. - -Tue Nov 14 19:19:16 2000 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/simple_test_proactor.cpp: Don't log - the read/written file using ACE_DEBUG - it will usually overflow - the ACE_Log_Record max message length and do bad things. - Thanks to John Buckman <john@lyris.com> for reporting this. - -Tue Nov 14 18:43:51 2000 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/test_proactor3.cpp: Replace use of - list<Sender *> with Sender * [] so it builds without inifintely - complicated explicit instantiations on gcc. KISS ;-) - -Tue Nov 14 17:43:26 2000 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/test_aiocb_ace.cpp: Fixed to work - correctly if one of the aio ops completes, but not the other, - during a pass through the Test_Aio::do_aio loop. Thanks to - John Buckman <john@lyris.com> for reporting this. - -Tue Nov 14 14:19:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/Log_Record.cpp: - - In ACE_Log_Record::print, changed the call to ACE_OS::fprintf - to use ACE_TEXT("%s") as the second argument instead of just - "%s". This should make logging under ACE_USES_UNICODE readable. - Thanks to James Buck <jim@nowsol.com> and Nick Pratt - <npratt@microstrategy.com> for both reporting this problem and - submitting patches. - -Tue Nov 14 09:19:16 2000 Carlos O'Ryan <coryan@uci.edu> - - * examples/Threads/thread_specific.cpp: - Simply use %u to print an ACE_hthread_t. This is what we seem - to be doing in other places in the code. However, this seems to - be non-portable, the code in ACE_Log_Msg to print the thread ID - is a lot more complicated. - -Mon Nov 13 15:13:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/Object_Manager.cpp: - - Protected the assert dialog box disable with _MSC_VER - since it is only for MSVC. - -Mon Nov 13 03:46:21 2000 Darrell Brunsch <brunsch@uci.edu> - - * docs/CE-status.txt: - * docs/wchar.txt: (added) - - Updated documentation == good thing. - -Mon Nov 13 03:39:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/config-win32-borland.h: - - It looks like Borland also uses _wcsdup, so added the - ACE_WCSDUP_EQUIVALENT here. - -Mon Nov 13 01:07:36 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS_String.cpp: - * ace/config-win32-borland.h: - * ace/config-win32-msvc.h: - - Christopher Kohlhoff <chris@kohlhoff.com> mentioned to me - that Borland did have a wcsdup, but it was named differently - than the _wcsdup in MSVC. I took his suggestion and added - a ACE_WCSDUP_EQUIVALENT for MSVC's version and enabled - wcsdup for Borland's config. - -Mon Nov 13 00:36:29 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/Obstack.cpp: - * ace/Obstack.h: - - Nanbor mentioned to me the other day that the interfaces to - this class probably should remain as char *. After looking - at it, I agreed and changed it to that. But since Svc_Conf - uses this class in such a way that it is passing wchar_t - strings to it when ACE_USES_WCHAR is defined, I also added - a wchar_t version of copy to make things happy. - -Sun Nov 12 17:00:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/ace_ce.dsw: (removed) - * ace/ace_dll_ce.dsp: (removed) - * ace/ace.vcw: (added) - * ace/ace_dll.vcp: (added) - * ace/ace_os_dll.vcp: (added) - - Removed the old Windows CE project files, and replaced - them with ones created by the eMbedded Visual C++ from - MS. - - * ace/OS_Errno.cpp: (added) - * ace/OS_Errno.h: (added) - * ace/OS_Errno.inl: (added) - * ace/config-all.h: - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - - Moved the Errno stuff from ACE_OS to a separate class, - since it needed to be in its own layer for Windows CE. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - - Added OS_Errno.* files. - - * ace/ACE.cpp: - * ace/Sock_Connect.cpp: - - Moved get_reg_value () to Sock_Connect since that is where - it is being used. - - * ace/ARGV.cpp: - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - - Added ACE_LACKS_ENV for platforms (like Windows CE) which - doesn't have an environment. Maybe in the future this can - be emulated, for now, we do nothing. - - * ace/Base_Thread_Adapter.h: - * ace/OS.h: - - Replace ACE_Export with ACE_OS_Export. - - * ace/Base_Thread_Adapter.inl: - * ace/Thread_Adapter.inl: - - Moved some of the ACE_OS_Thread_Descriptor methods to - Base_Thread_Adapter, since they were declared in - Base_Thread_Adapter.h. - - * ace/SUN_Proactor.cpp: - - Removed ACE_BUILD_DLL from this file, since it should only - be defined in the project file. - - * ace/OS_Dirent.h: - - Added ACE_WINCE to the #if block around some of the includes. - - * ace/OS_Memory.h: - * ace/OS_Dirent.inl: - * ace/OS_String.inl: - * ace/OS.h: - - Added /**/ to the #includes of pace, since they seem to - totally confuse EVC's automatic dependency generation. - - * ace/OS_String.cpp: - * ace/OS_String.h: - * ace/OS_String.inl: - - Added strerror. On machines without it, just returns - "Unknown Error" all the time. - - Added strspn_emulation, strpbrk_emulation, strtol_emulation, - and strtoul_emulation. - - New compile time defines: - - ACE_LACKS_STERROR - - ACE_LACKS_STRPBRK - - ACE_LACKS_STRSPN - - ACE_LACKS_STRTOL - - ACE_LACKS_STRTOUL - - ACE_LACKS_STRTOD - - * ace/Log_Msg.cpp: - - Since there is now strerror in ACE, removed the !ACE_HAS_WINCE - blocks and replaced them with direct calls to ACE_OS_String's - version. - - * ace/config-win32.h: - - Changed check for #include-ing config-wince.h to be based on - _WIN32_WCE because this definition has been automatically added - to the default projects by the misc WinCE editors. - - * ace/Service_Config.i: - - The char versions of the following fuctions (which are defined - only under WinCE) were recursive and would fail miserably if - ever used. I added ACE_CHAR_TO_TCHAR to resolve the infinate - recursion. - - ACE_Service_Config::initialize () - - ACE_Service_Config::resume () - - ACE_Service_Config::suspend () - - ACE_Service_Config::remove () - - * ace/config-win32-msvc.h: - - We were defining ACE_HAS_GNU_CSTRING_H. I doubt that MSVC has - GNU's cstring.h, so I removed it. - - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - - Added ACE_LACKS_CUSERID and ACE_LACKS_CHDIR. - - Added writev and readv emulation methods to ACE_OS, since they - were just being defined as global functions. This is more - consistent with what we are doing elsewhere. - - Added ACE_LACKS_SYS_NERR emulation. - - * ace/config-WinCE.h: - - Added all the necessary defined to get ACE compiling for Windows - CE 3.0. As for previous versions, they do not currently compile, - although that could change in the future - -Sun Nov 12 12:29:31 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/Cache_Map_Manager_T.h: - * ace/Codeset_IBM1047.h: - * ace/Date_Time.h: - * ace/Dump_T.h: - * ace/Flag_Manip.h: - * ace/Hash_Cache_Map_Manager_T.h: - * ace/LSOCK_Acceptor.h: - * ace/Memory_Pool.h: - * ace/QoS_Decorator.h: - * ace/SV_Semaphore_Complex.h: - * ace/Strategies_T.h: - * ace/Synch_Options.h: - * ace/Time_Request_Reply.h: - * ace/Timer_Wheel_T.h: - * ace/WIN32_Proactor.h: - * ace/ace_wchar.h: - - Fixed @file comments. - -Sat Nov 11 18:55:04 2000 Pradeep Gore <pradeep@cs.wustl.edu> - - * ace/Profile_Timer.cpp: - Included Log_Msg.h to fix compile error. - -Fri Nov 10 19:41:38 2000 Darrell Brunsch <brunsch@uci.edu> - - * bin/fuzz.pl: - - Added a check for the @file comments used by doxygen. - They must be the same as the actual filename, or doxygen will - not pick up the comments for that file. - -Fri Nov 10 20:26:01 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Profile_Timer.cpp: Replaced ACE_OS::perror() with - ACE_ERROR macros so that the output can be redirected to the - same place that the ACE logging output is configured to go. - Thanks to Jeff Greif <jgreif@befree.com> for reporting this. - -Fri Nov 10 17:15:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * bin/fuzz.pl: - - Made the output look a little closer to MSVC's. - -Fri Nov 10 17:08:52 2000 Carlos O'Ryan <coryan@uci.edu> - - * etc/tao_strategies.doxygen: - New doxygen configuration file for the TAO_Strategies library. - - * bin/generate_doxygen.pl: - Add tao_strategies.doxygen to the list. - - * etc/ace_man.doxygen: - Generate man pages in the man directory instead of doxygen_man. - -Fri Nov 10 12:58:53 2000 Darrell Brunsch <brunsch@uci.edu> - - * bin/generate_doxygen.pl: - * etc/tao_implrepo.doxygen: - - New Implementation Repository documentation. - -Fri Nov 10 12:53:28 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_compile: - Format test output so make_pretty.pl can recognize where each - test starts. - - * etc/ace_rmcast.doxygen: - * etc/ace_ssl.doxygen: - * etc/tao.doxygen: - * etc/tao_dynamicany.doxygen: - * etc/tao_dynamicinterface.doxygen: - * etc/tao_esf.doxygen: - * etc/tao_iormanip.doxygen: - * etc/tao_iortable.doxygen: - * etc/tao_portableserver.doxygen: - * etc/tao_rtevent.doxygen: - Don't define the macros explicitly, use the config-doxygen.h - file. - Must define ACE_RCSID and ACE_UNDEFINED_FUNC properly, so - doxygen does not get confused. - -Fri Nov 10 14:26:41 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/config-sunos5.6.h: The AIO definitions were missing the #if - !defined guards that are present in the solaris 2.7 config - header. Thanks to Alex Hornby <alex@anvil.co.uk> for reporting - this. - -Fri Nov 10 11:44:15 2000 Carlos O'Ryan <coryan@uci.edu> - - * examples/RMCast/Send_File/Receiver.cpp: - Fixed errors in Tru64/DUCXX builds. - -Fri Nov 10 10:42:31 2000 Steve Huston <shuston@riverace.com> - - * ace/OS.i (ACE_OS::gethrtime): Removed the ACE_HAS_PENTIUM check - from the #if defined (ACE_WIN32) line surrounding the use of - QueryPerformanceCounter - it works fine on 486 also, per - Bernd Annamaier <bernd.annamaier@de.adtranz.com>. Thanks to - Bernd for testing this out. - - * ace/High_Res_Timer.cpp: Replaced all occurrences of - "defined (ACE_HAS_PENTIUM)" with "defined (ACE_WIN32)" since there - is nothing Pentium-specific any longer in the Win32 sections. - - * THANKS: Added Bernd Annamier to the Hall of Fame. - -Fri Nov 10 12:28:42 2000 Johnny Willemsen <jwillemsen@remedy.nl> - - * examples/log_msg/makefile.bor: - * examples/map_manager/makefile.bor: - * examples/makefile.bor: - * performance-tests/makefile.bor: - * performance-tests/Server_Concurrency/makefile.bor: - New Borland makefiles for ACE - -Thu Nov 9 18:39:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/config-sunos5.5.h: - - Added ACE_LACKS_MEMORY_H for SunCC 5, since it seems there is - a bad interaction between memory.h and string.h on that config. - -Thu Nov 9 17:47:37 2000 Carlos O'Ryan <coryan@uci.edu> - - * examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp: - Antoher missing Log_Msg.h - - * examples/Threads/thread_specific.cpp: - Tru64 does not like the convertion from ACE_hthread_t to - unsigned long. I'm trying with a reinterpret_cast, but I don't - have much hope for it. - - * examples/Service_Configurator/IPC-tests/server/Makefile: - * examples/Service_Configurator/Misc/Makefile: - * examples/Timer_Queue/Makefile: - * apps/Gateway/Gateway/Makefile: - * apps/Gateway/Peer/Makefile: - Avoid problems where the library is linked twice, once for the - required dependency in parallel builds an another for the LDLIBS - flag. - - * etc/ace.doxygen: - * etc/ace_man.doxygen: - Use a separate file to generate man pages. We don't want to - document .cpp files or include code in man pages, but that looks - great in HTML documents. - - * etc/tao.doxygen: - * etc/tao_dynamicany.doxygen: - * etc/tao_dynamicinterface.doxygen: - * etc/tao_esf.doxygen: - * etc/tao_iormanip.doxygen: - * etc/tao_iortable.doxygen: - * etc/tao_portableserver.doxygen: - * etc/tao_rtevent.doxygen: - Update the replacement path to some of the tag files, the - generated documents did not get the right cross references. - - * bin/make_pretty.pl: - Add yet another linker error. - - * bin/generate_doxygen.pl: - Parse the man page generation code to create its output path too. - -Thu Nov 9 15:10:28 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/make_pretty.pl: - In the HTML we replace < with < and > with > otherwise the - output for templates makes no sense. - -Thu Nov 9 12:11:52 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/Makefile (UTILS_FILES): - Modified the Makefile to help when building subsetted shared - libraries. Specifically, moved Addr, INET_Addr, and Sock_Connect - into the Sockets component. That removes the dependancy of the - Utilities and Sockets components on the non-socket IPC component. - - Committing on behalf of Phil Mesnier <mesnier_p@ociweb.com> - -Thu Nov 9 10:38:33 2000 Carlos O'Ryan <coryan@uci.edu> - - * examples/Makefile: - ACE_HAS_GNUG_PRE_2_8 should be used only after - wrapper_macros.GNU is included. - -Thu Nov 9 10:26:01 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/make_pretty.pl: - Add yet another link error message. - -Thu Nov 9 08:51:04 2000 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/rules.local.GNU: - It seems like I cannot get the rules to create the .obj and - .shobj directories right. This last iteration seems to be - happier, it works fine with parallel builds, it works fine for - static and shared libraries, it does not recompile everything - just because the .obj or .shobj directories changed, it creates - the Templates.DB file when needed. - The only problem that I'm aware off is that it can potentially - produce a warning on parallel builds: two separate rules can try - to create the .obj directory simultaneously, adding a dependency - to have only one rule do it results in full-recompilations when - a .obj directory is modified for whatever reason. - I'm using ACE_NUL_STDERR to avoid such warnings, and it seems to - work correctly. - -Thu Nov 9 10:14:06 2000 Jeff Parsons <parsons@cs.wustl.edu> - - * include/makeinclude/ace_flags.bor: - - Added the line - - TAO_DYNAMICINTERFACE_LIB = - $(CORE_BINDIR)\TAO_DynamicInterface$(LIB_DECORATOR).lib - - that I had overlooked when doing the BCB makefile changes - related to the DynamicInterface library. Thanks to - Johnny Willemsen <Johnny.Willemsen@meco.nl> for sending - in the patch. - - -Wed Nov 8 16:11:11 2000 Carlos O'Ryan <coryan@uci.edu> - - * tests/RMCast/RMCast_Membership_Test.cpp: - Remove unused variables - - * bin/make_pretty.pl: - Add regular expression to detect more linker errors. - -Wed Nov 8 14:10:20 2000 Carlos O'Ryan <coryan@uci.edu> - - * examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp: - * examples/IPC_SAP/SPIPE_SAP/client.cpp: - * examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp: - * examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp: - * examples/IPC_SAP/SPIPE_SAP/server.cpp: - * examples/RMCast/Send_File/Sender.cpp: - * examples/Reactor/Misc/test_event_handler_t.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h: - We must explicitly #include "ace/Log_Msg.h", unfortunately the - errors were only detected on platforms that do not define - ACE_TEMPLATES_REQUIRE_SOURCE. - - * include/makeinclude/rules.local.GNU: - More fine tuning, the Templates.DB directory must be created by - the Makefile because SunCC 4.2 generates a warning if it is not - present. - -Wed Nov 8 14:40:25 2000 Chad Elliott <elliott_c@ociweb.com> - - * ace/config-all.h - - Fix a build problem on HP-UX 11.00 with aCC A.03.25. The macro - used to determine the use of the std namespace changed from - RWSTD_NO_NAMESPACE to _NAMESPACE_STD. NOTE: I did preserve the - check for RWSTD_NO_NAMESPACE with aCC versions less than A.03.25. - -Wed Nov 8 10:27:00 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/generate_doxygen.pl: - Automates the invocation of doxygen. It modifies the doxygen - templates in $ACE_ROOT/etc and creates the right directory - hierarchy to receive the files. - - * ace/config-doxygen.h: - Configuration file used to generate the doxygen files. - Notice that this is not a valid configuration for any platform, - for example, it enables both the Win32 and the POSIX AIO calls. - - * etc/ace.doxygen: - * etc/ace_rmcast.doxygen: - * etc/ace_ssl.doxygen: - * etc/tao.doxygen: - * etc/tao_dynamicany.doxygen: - * etc/tao_dynamicinterface.doxygen: - * etc/tao_esf.doxygen: - * etc/tao_iormanip.doxygen: - * etc/tao_iortable.doxygen: - * etc/tao_portableserver.doxygen: - * etc/tao_rtevent.doxygen: - Minor mods to make the generate_doxygen.pl job easier. - -Wed Nov 8 09:02:10 2000 Carlos O'Ryan <coryan@uci.edu> - - * apps/Gateway/Gateway/Makefile: - * apps/Gateway/Peer/Makefile: - * examples/Timer_Queue/Makefile: - * examples/Service_Configurator/IPC-tests/server/Makefile: - * examples/Service_Configurator/Misc/Makefile: - When generating a library and a binary that uses it in the same - Makefile we must add explicit dependency between them, otherwise - parallel builds can fail. - - * apps/JAWS/server/HTTP_Helpers.cpp: - * examples/IPC_SAP/FILE_SAP/client.cpp: - * examples/Naming/test_multiple_contexts.cpp: - * examples/Threads/thread_specific.cpp: - * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp: - Fixed warnings about mismatches between printf-like strings and - their arguments. - -Wed Nov 8 02:57:15 2000 Darrell Brunsch <brunsch@uci.edu> - - * Local_Name_Space.cpp: - * Local_Name_Space.h: - - Conversion between ACE_WString and ACE_NS_String depended on - ACE_WString storing two byte char's (because it was using - fast_rep ()) Changed to ushort_rep (), but this required - ACE_NS_String to clean up the string once it is done. Added - a destructor and a flag to ACE_NS_String for this purpose. - -Tue Nov 7 11:47:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * tests/Cached_Accept_Conn_Test.cpp: - * tests/Cached_Conn_Test.cpp: - * tests/Collection_Test.cpp: - - Protected some of the explicit template instantiations with #if's - to make sure we don't get duplicate ones with ACE_INT32 == int - (since ACE_HANDLE and DATA are also int in some configurations). - -Tue Nov 7 09:04:15 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/RMCast/RMCast.h: - Undefine macro MT_DATA if defined already. - -Tue Nov 7 09:00:08 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_compile: - By default build everything under ACE_wrappers and - ACE_wrappers/TAO, we used to build just a subset of ACE. - We need to provide full coverage because this script is - replacing all nightly builds, if auto_compile does not test it, - nothing will. - - * bin/show_log_dir.pl: - The script was removing the second and third most recent logs - from the list, this used to be required to remove the brief and - html files, but now we filter those earlier on the script. - -Mon Nov 6 16:23:56 2000 Carlos O'Ryan <coryan@uci.edu> - - * tests/RMCast/RMCast_Fragment_Test.cpp: - * tests/RMCast/RMCast_Reassembly_Test.cpp: - * tests/RMCast/RMCast_Retransmission_Test.cpp: - Fixed warnings reported by DU/CXX - -Sun Nov 5 17:23:55 2000 Carlos O'Ryan <coryan@uci.edu> - - * etc/ace.doxygen: - * etc/ace_rmcast.doxygen: - * etc/ace_ssl.doxygen: - * etc/tao.doxygen: - * etc/tao_dynamicany.doxygen: - * etc/tao_dynamicinterface.doxygen: - * etc/tao_esf.doxygen: - * etc/tao_iormanip.doxygen: - * etc/tao_iortable.doxygen: - * etc/tao_portableserver.doxygen: - * etc/tao_rtevent.doxygen: - Commit doxygen templates, I'm still writing the script to use - them effectively. - -Sun Nov 5 14:37:13 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_compile: - Make log files world readable, under Solaris they are created - with 600 mode by default. - -Sun Nov 5 14:05:13 2000 Darrell Brunsch <brunsch@uci.edu> - - * bin/create_vt_dsps.pl: - * tests/version_tests/Atomic_Op_Test.dsp: - * tests/version_tests/Auto_IncDec_Test.dsp: - * tests/version_tests/Barrier_Test.dsp: - * tests/version_tests/Basic_Types_Test.dsp: - * tests/version_tests/Buffer_Stream_Test.dsp: - * tests/version_tests/CDR_Array_Test.dsp: - * tests/version_tests/CDR_File_Test.dsp: - * tests/version_tests/CDR_Test.dsp: - * tests/version_tests/Cache_Map_Manager_Test.dsp: - * tests/version_tests/Cached_Accept_Conn_Test.dsp: - * tests/version_tests/Cached_Conn_Test.dsp: - * tests/version_tests/Capabilities_Test.dsp: - * tests/version_tests/Collection_Test.dsp: - * tests/version_tests/Conn_Test.dsp: - * tests/version_tests/DLL_Test.dsp: - * tests/version_tests/DLList_Test.dsp: - * tests/version_tests/Dynamic_Priority_Test.dsp: - * tests/version_tests/Enum_Interfaces_Test.dsp: - * tests/version_tests/Env_Value_Test.dsp: - * tests/version_tests/Future_Set_Test.dsp: - * tests/version_tests/Future_Test.dsp: - * tests/version_tests/Handle_Set_Test.dsp: - * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp: - * tests/version_tests/Hash_Map_Manager_Test.dsp: - * tests/version_tests/High_Res_Timer_Test.dsp: - * tests/version_tests/IOStream_Test.dsp: - * tests/version_tests/Lazy_Map_Manager_Test.dsp: - * tests/version_tests/MM_Shared_Memory_Test.dsp: - * tests/version_tests/MT_Reactor_Timer_Test.dsp: - * tests/version_tests/MT_SOCK_Test.dsp: - * tests/version_tests/Malloc_Test.dsp: - * tests/version_tests/Map_Manager_Test.dsp: - * tests/version_tests/Map_Test.dsp: - * tests/version_tests/Mem_Map_Test.dsp: - * tests/version_tests/Message_Block_Test.dsp: - * tests/version_tests/Message_Queue_Notifications_Test.dsp: - * tests/version_tests/Message_Queue_Test.dsp: - * tests/version_tests/Naming_Test.dsp: - * tests/version_tests/New_Fail_Test.dsp: - * tests/version_tests/Notify_Performance_Test.dsp: - * tests/version_tests/OS_Test.dsp: - * tests/version_tests/Object_Manager_Test.dsp: - * tests/version_tests/OrdMultiSet_Test.dsp: - * tests/version_tests/Pipe_Test.dsp: - * tests/version_tests/Priority_Buffer_Test.dsp: - * tests/version_tests/Priority_Reactor_Test.dsp: - * tests/version_tests/Priority_Task_Test.dsp: - * tests/version_tests/Process_Manager_Test.dsp: - * tests/version_tests/Process_Mutex_Test.dsp: - * tests/version_tests/Process_Strategy_Test.dsp: - * tests/version_tests/RB_Tree_Test.dsp: - * tests/version_tests/Reactor_Exceptions_Test.dsp: - * tests/version_tests/Reactor_Notify_Test.dsp: - * tests/version_tests/Reactor_Performance_Test.dsp: - * tests/version_tests/Reactor_Timer_Test.dsp: - * tests/version_tests/Reactors_Test.dsp: - * tests/version_tests/Reader_Writer_Test.dsp: - * tests/version_tests/Recursive_Mutex_Test.dsp: - * tests/version_tests/Reverse_Lock_Test.dsp: - * tests/version_tests/SOCK_Connector_Test.dsp: - * tests/version_tests/SOCK_Send_Recv_Test.dsp: - * tests/version_tests/SOCK_Test.dsp: - * tests/version_tests/SPIPE_Test.dsp: - * tests/version_tests/SString_Test.dsp: - * tests/version_tests/SV_Shared_Memory_Test.dsp: - * tests/version_tests/Semaphore_Test.dsp: - * tests/version_tests/Service_Config_Test.dsp: - * tests/version_tests/Sigset_Ops_Test.dsp: - * tests/version_tests/Simple_Message_Block_Test.dsp: - * tests/version_tests/Svc_Handler_Test.dsp: - * tests/version_tests/TSS_Test.dsp: - * tests/version_tests/Task_Test.dsp: - * tests/version_tests/Thread_Manager_Test.dsp: - * tests/version_tests/Thread_Mutex_Test.dsp: - * tests/version_tests/Thread_Pool_Reactor_Test.dsp: - * tests/version_tests/Thread_Pool_Test.dsp: - * tests/version_tests/Time_Service_Test.dsp: - * tests/version_tests/Time_Value_Test.dsp: - * tests/version_tests/Timeprobe_Test.dsp: - * tests/version_tests/Timer_Queue_Test.dsp: - * tests/version_tests/Tokens_Test.dsp: - * tests/version_tests/UPIPE_SAP_Test.dsp: - * tests/version_tests/Upgradable_RW_Test.dsp: - * tests/version_tests/version_tests.dsw: - - Updated to use the new ACE_AS_STATIC_LIBS macro. - - * ace/Sample_History.cpp: - * ace/SSL/SSL_Context.cpp: - * ace/SSL/SSL_SOCK_Stream.i: - - Fixed miscellaneous ACE_USES_UNICODE problems with ACE_LIB_TEXT. - -Sat Nov 4 19:33:39 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_compile: - Fixed the mail message, the path to the CGI script was garbled. - - * include/makeinclude/rules.local.GNU: - My last fixed did not work for static builds, the SOLINK rules - got in the way. It works correctly for both static and shared - builds now. - -Sat Nov 4 18:19:46 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/RMCast/RMCast_IO_UDP.cpp: - * ace/RMCast/RMCast_Reassembly.cpp: - * tests/Reactor_Notify_Test.cpp: - Add missing template instantiations, they only showed up in - builds with disabled inlining. - -Sat Nov 4 17:05:08 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_compile: - New revision of the script. It can copy log files directly to - the destination directory, and it also runs the make_pretty - script to generate both the HTML and HTML summary of the log. - - * bin/show_log_dir.pl: - Corrections to the document and more fixes to make it Apache - friendly. - - * include/makeinclude/rules.local.GNU: - Add special target to force the creation of the .shobj and .obj - directories, even with parallel builds. The faster our - computers get the more often we get failures due to this - problem. - -Sat Nov 4 14:53:39 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/make_pretty.pl: - This is a modified version of Darrell's script to beautify our - auto_compile logs. This version works better with Unix builds - and is going to be invoked by bin/auto_compile to generate - summary logs. - - * bin/show_log_dir.pl: - A CGI script to present all the logs for a particular builds in - a single page. It is a modified version of Darrell's script, - but this time it works better on Unix web servers. - -Fri Nov 3 17:22:10 2000 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/config-sunos5.5.h: Backed of changes given by Russ - Noseworthy through bug id #710. This was breaking SunCC5.0 - builds. - -Fri Nov 3 09:41:20 2000 Carlos O'Ryan <coryan@uci.edu> - - * tests/RMCast/RMCast_Membership_Test.cpp: - Fixed warning about variables possibly uninitialized before - their first use. In fact the variables are initialized before - their first use, but the code flow is too complex for the - compiler to figure that out. - -Fri Nov 3 09:34:39 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Makefile: - * tests/Makefile: - * examples/Makefile: - Disable the RMCast builds for old versions of g++ - -Thu Nov 2 12:11:43 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Name_Request_Reply.h: - * ace/Timer_Hash_T.h: - * ace/Map_Manager.h: - * ace/Log_Record.h: - Minor adjustments to make doxygen happier. - -Thu Nov 2 11:57:37 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Makefile: - * tests/Makefile: - * examples/Makefile: - Enable the RMCast library, tests and examples by default. - -Wed Nov 1 17:24:59 2000 Pradeep Gore <pradeep@cs.wustl.edu> - - * tests/RMCast/Makefile.bor: - Added Makefile, thanks to Christopher Kohlhoff - <chris@kohlhoff.com> and Johnny.Willemsen <Johnny.Willemsen@meco.nl> - for contributing. - -Wed Nov 1 14:11:48 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/*.h: - Change all the header files to generate better docs with - Doxygen. Thanks to Darrell for his wonderful script to automate - this process. - -Tue Oct 31 19:01:19 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * netsvcs/lib/Client_Logging_Handler.cpp (handle_input): Added - a comment explaining why we don't go to heroic lengths to recv() - all the data if it fails after the second recv(). Thanks to - Steve Sivier <Steven.Sivier@Eng.Sun.COM> for motivating this. - -Tue Oct 31 14:21:11 2000 David L. Levine <levine@cs.wustl.edu> - - * bin/check_build_logs: sort the output file names, so - that guajira's cxx build shows up first (locally). - Limit total number of lines to 2000 to keep below - majordomo's size limit. - -Tue Oct 31 10:54:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/Process.i: - - Changed the CREATE_UNICODE_ENVIRONMENT section to be only - in ACE_WIN32 environments. - -Tue Oct 31 11:35:31 2000 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/config-sunos5.5.h: - * ace/Log_Msg.cpp: Added patches provided by Russ. Bugzilla id 710. - -Tue Oct 31 08:14:33 2000 Chris Cleeland <cleeland_c@ociweb.com> - - * wrapper_macros.GNU: - - Set defaults for exceptions, rtti, and fast to all be zero - (0),i.e., off. Henceforth, if you're creating a new port and - you want exceptions to be on, you must explicitly have - "exceptions=1" in your platform_*.GNU file. - - * platform_irix6.x_common.GNU: - - Added an "exceptions=1" directive per the comment above. - -Mon Oct 30 18:56:33 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - - Changed several of the socket calls to use char instead - of ACE_TCHAR, seeing that no OS supports anything but char. - But I am keeping the ACE_TCHAR or dual char/wchar_t - interfaces on classes higher up the stream. - - Methods changed are: - - - gethostbyaddr - - gethostbyname - - gethostbyname2 - - gethostbyaddr_r - - gethostbyname_r - - getprotobyname - - getprotobyname_r - - getservbyname - - getservbyname_r - - inet_addr - - inet_ntoa - - inet_aton - - inet_ntop - - inet_pton - - This should take care of a couple of things. First we don't - have to worry about returning a wchar_t * static buffer - instead of a char * static buffer from something like - inet_ntoa and this should remove some slowdowns reported from - gethostbyname. Thanks to Nick Pratt <npratt@microstrategy.com> - for reporting both of these. - - * ace/INET_Addr.cpp: - * ace/INET_Addr.h: - * ace/INET_Addr.i: - - Fixed references to interface changes and added dual - char/wchar_t interfaces to replace some ACE_TCHAR ones. - - * ace/MEM_Addr.cpp: - * ace/MEM_Addr.h: - * ace/MEM_Addr.i: - - Changed get_host_name and get_host_name to return char * - - * ace/SOCK_Dgram_Mcast.cpp: - * ace/SOCK_Dgram_Mcast_QoS.cpp: - - Fixed all the references to the interface changes. - - * ace/Object_Manager.cpp: - - Added ERROR to the output for AV's and Unhandled Exceptions. - -Mon Oct 30 18:51:40 2000 Darrell Brunsch <brunsch@uci.edu> - - * examples/IPC_SAP/SSL_SAP/SSL-client.dsp: - * examples/IPC_SAP/SSL_SAP/SSL-server.dsp: - - Removed hardcoded OpenSSL include directories. - - * ace/ssl/SSL_Context.cpp: - * ace/ssl/SSL_Context.h: - * ace/ssl/SSL_SOCK.cpp: - * ace/ssl/SSL_SOCK_Acceptor.cpp: - * ace/ssl/SSL_SOCK_Acceptor.h: - * ace/ssl/SSL_SOCK_Connector.cpp: - * ace/ssl/SSL_SOCK_Connector.h: - * ace/ssl/SSL_SOCK_Connector.i: - * ace/ssl/SSL_SOCK_Stream.cpp: - * ace/ssl/SSL_SOCK_Stream.h: - * ace/ssl/SSL_SOCK_Stream.i: - - Removed the ACE_HAS_SSL #ifdefs, since ACE_SSL is a - separate library, so it isn't really needed. - -Mon Oct 30 16:34:33 2000 Chris Cleeland <cleeland_c@ociweb.com> - - * include/makeinclude/platform_vxworks5.x_g++.GNU: - - More exceptions/fast/rtti canonicalization fixes. Thanks again, - Carlos. - -Mon Oct 30 11:56:13 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Makefile.am: - * ace/Makefile.bor: - Add missing files to the Borland and Automake makefiles. - -Mon Oct 30 11:38:07 2000 Carlos O'Ryan <coryan@cs.wustl.edu> - - * ace/Basic_Stats.cpp: - * ace/Basic_Stats.inl: - * ace/Sample_History.cpp: - * ace/Stats.cpp: - Fixed problems on platforms that lack 64-bit integers. - -Mon Oct 30 11:10:26 2000 Chris Cleeland <cleeland_c@ociweb.com> - - * include/makeinclude/platform_linux.GNU: - * include/makeinclude/platform_chorus_ghs.GNU: - - The change to canonicalize the values used for - exceptions/fast/rtti caused the default for "exceptions" on these - two platforms to change from exceptions off to exceptions on. - There may be others, but without access to the compiler itself - it's hard to tell what the default behavior is for the compiler - and thus set the value for exceptions/rtti/fast accordingly. - - Thanks to Carlos O'Ryan <coryan@uci.edu> for pointing this out. - -Mon Oct 30 00:57:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * tests/OS_Test.cpp: - - Was a bit overzealous on a previous [] to * change, - so switched one back to [] to remove a segfault - with the strncmp section. - -Sun Oct 29 23:46:54 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/ace_wchar.h: - - Removed the definitions for LPTSTR and LPCTSTR. They - will need to be defined outside of ace or in config.h - to be made available on other platforms. Here is a - sample block which can be added to a non-Win32 config.h: - - typedef char *LPSTR; - typedef const char *LPCSTR; - typedef wchar_t *LPWSTR; - typedef const wchar_t *LPCWSTR; - - #if defined (UNICODE) - typedef const wchar_t *LPCTSTR; - typedef wchar_t *LPTSTR; - typedef wchar_t TCHAR; - #define __TEXT(literal) L##literal - #else - typedef const char *LPCTSTR; - typedef char *LPTSTR; - typedef char TCHAR; - #define __TEXT(literal) literal - #endif - - #define TEXT(literal) __TEXT(literal) - - * ace/config-vxworks5.x.h: - - Added ACE_LACKS_WCSDUP. - -Sun Oct 29 01:59:11 2000 Darrell Brunsch <brunsch@uci.edu> - - * bin/doxygen-convert-h.pl: (added) - - New script to convert old header files to new doxygen - style commented files. Works well, but some things - do throw it for a loop, be sure to check output before - checking in. - -Sat Oct 28 15:02:40 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Stats.h: - Cosmetic fixes to make doxygen happier. - -Fri Oct 27 17:21:56 2000 Darrell Brunsch <brunsch@uci.edu> - - * tests/OS_Test.cpp: - - Darrell learned how to use strtok_r properly. 'nuff said. - -Fri Oct 27 17:04:02 2000 Darrell Brunsch <brunsch@uci.edu> - - * tests/OS_Test.cpp: - - Changed the arrays ([]) to array pointers (*) since the - pointer arithmatic I do doesn't seem to work with the - arrays. - -Fri Oct 27 15:45:57 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Add the new files to the MSVC projects. - -Fri Oct 27 15:02:56 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - * ace/Sample_History.h: - * ace/Sample_History.inl: - * ace/Sample_History.cpp: - Add new class to keep a full history of all the samples in a - performance test. - - * ace/Basic_Stats.h: - * ace/Basic_Stats.inl: - * ace/Basic_Stats.cpp: - * ace/Stats.h: - * ace/Stats.cpp: - Refactor code to compute minimum, maximum, average and jitter - into its own class. It used to be part of ACE_Througthput_Stats - - * performance-tests/TCP/Makefile: - * performance-tests/TCP/tcp_test.cpp: - Use the new ACE_Sample_History class. - -Fri Oct 27 12:04:17 2000 Chris Cleeland <cleeland_c@ociweb.com> - - * platform_chorus.GNU: - * platform_chorus4.x_g++.GNU: - * platform_chorus_ghs.GNU: - * platform_cray.GNU: - * platform_hpux_kcc.GNU: - * platform_linux_cxx.GNU: - * platform_osf1_4.0.GNU: - * platform_sunos5_ghs.GNU: - * platform_sunos5_kcc.GNU: - * platform_sunos5_sunc++.GNU: - * platform_vxworks5.x_diab.GNU: - * platform_vxworks5.x_g++.GNU: - * wrapper_macros.GNU: - - Changed the way that 'rtti', 'exceptions', and 'fast' makeflags - get processed in wrapper_macros.GNU. There was a discrepancy - between the "command line" value and the "platform_macros file" - value each needed in order to turn the feature off, e.g., zero - on the command line and "null" in the file. After - investigation, the discrepancy seemed to be without reason, so - I've canonicalized them. You can now put "exceptions=0" on - either the command line OR in the platform_macros.GNU file. - -Fri Oct 27 10:51:26 2000 Steve Huston <shuston@riverace.com> - - * tests/Reactor_Notify_Test.cpp: Moved definition of 'int status' - outside the auto_ptr-scoping block. - -Fri Oct 27 02:06:29 2000 Luther J Baker <luther@cs.wustl.edu> - - * ace/OS.cpp: - * ace/OS.i: - - Fixed some warnings due to int ace_result_ declared for NT. - -Thu Oct 26 22:18:42 2000 Alex Arulanthu <Alex.Arulanthu@sylantro.com> - - * ace/Log_Msg.h: - * ace/Log_Msg.cpp: - * ace/Service_Config.h: - * ace/Service_Config.cpp: - * ace/Service_Config.i: - - Setting the right default values for process and thread level - priority masks. I had already talk to Steve H about this - change. I just forgot to get this in. - -Thu Oct 26 14:04:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS.h: - - Reverted Doug's change which defined ACE_MAX_USERID to - L_cuserid on all platforms. It ended up that this - is only valid on Windows when _POSIX_ is defined. - -Thu Oct 26 11:20:43 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/RMCast/RMCast_IO_UDP.cpp: - * ace/RMCast/RMCast_Reassembly.cpp: - * tests/CDR_Array_Test.cpp: - * tests/RMCast/RMCast_Fragment_Test.cpp: - * tests/RMCast/RMCast_Membership_Test.cpp: - * tests/RMCast/RMCast_Reassembly_Test.cpp: - * tests/RMCast/RMCast_Reordering_Test.cpp: - * tests/RMCast/RMCast_Retransmission_Test.cpp: - * tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp: - - The usual additions of ACE_TEXT to make ACE_USES_WCHAR builds - happy. - -Thu Oct 26 12:19:45 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Memory_Pool.cpp (unmap): Fixed a bug that was preventing - the handle from being closed. Thanks to Ivan Murphy and Dieter - Quehl for reporting this. - -Thu Oct 26 10:56:36 2000 Steve Huston <shuston@riverace.com> - - * ace/OS.i (ACE_OS::rename): Added && (ACE_HAS_WINNT4 == 1) to the - defined (ACE_HAS_WINNT4) to avoid this code section on Win95/98. - -Thu Oct 26 07:39:22 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - ace/OS.h: Added a new macro called ACE_MAX_USERID that is 32 on - Win32 and L_cuserid on other platforms. - - * examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp, - examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.cpp, - examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp, - examples/Service_Configurator/IPC-tests/server/Handle_R_Stream: - Fixed the calls to cuserid() so they don't pass in 0, but - instead pass in a buffer of size ACE_MAX_USERID. This fixes a - problem that occurs on WinNT. Thanks to Mike Curtis - <mccurry@my-deja.com> for pointing this out. - - * tests/Reactor_Notify_Test.cpp: Fixed an unused args warning - and also added the use of auto_ptr to ensure that dynamic memory - is deleted no matter what return path is taken. - -Thu Oct 26 04:00:00 2000 Luther J Baker <luther@cs.wustl.edu> - - * ace/OS.h: - * ace/OS.i: - * ace/OS.cpp: - * ace/OS_Dirent.inl: - Fixing more ACE_HAS_PACE over NT. Most fixes just skip the - PACE call. NT doesn't implement much of posix and so - many ACE calls will skip pace until PACE/WINNT emulates - more posix functionality. - -Wed Oct 25 20:38:33 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/SSL/ACE_SSL.dsp: - - Removed the include/lib directories put here. Instead - we rely on the fact that OpenSSL should be in - DevStudio's global include and library directories. - -Wed Oct 25 13:20:24 2000 Irfan Pyarali <irfan@cs.wustl.edu> - - * tests/Purgable_Map_Manager_Test: Removed this deprecated test. - The following files were effected: - - - Makefile.am - - icc.bat - - t.icc - - These files were removed: - - - Purgable_Map_Manager_Test.cpp - - Purgable_Map_Manager_Test.icc - -Wed Oct 25 11:24:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/adapter/README: (removed) - * ace/adapter/ace/ACE.h: (removed) - * ace/adapter/ace/ARGV.h: (removed) - * ace/adapter/ace/ATM_Addr.h: (removed) - * ace/adapter/ace/Arg_Shifter.h: (removed) - * ace/adapter/ace/Capabilities.h: (removed) - * ace/adapter/ace/DEV_Addr.h: (removed) - * ace/adapter/ace/DLL.h: (removed) - * ace/adapter/ace/Dirent.h: (removed) - * ace/adapter/ace/Dynamic_Service.h: (removed) - * ace/adapter/ace/FIFO.h: (removed) - * ace/adapter/ace/FIFO_Recv.h: (removed) - * ace/adapter/ace/FIFO_Recv_Msg.h: (removed) - * ace/adapter/ace/FIFO_Send.h: (removed) - * ace/adapter/ace/FIFO_Send_Msg.h: (removed) - * ace/adapter/ace/FILE_Addr.h: (removed) - * ace/adapter/ace/Functor.h: (removed) - * ace/adapter/ace/High_Res_Timer.h: (removed) - * ace/adapter/ace/INET_Addr.h: (removed) - * ace/adapter/ace/MEM_Addr.h: (removed) - * ace/adapter/ace/Malloc_T.h: (removed) - * ace/adapter/ace/Memory_Pool.h: (removed) - * ace/adapter/ace/OS.h: (removed) - * ace/adapter/ace/OS_Dirent.h: (removed) - * ace/adapter/ace/OS_String.h: (removed) - * ace/adapter/ace/SOCK_Dgram_Bcast.h: (removed) - * ace/adapter/ace/SOCK_Dgram_Mcast.h: (removed) - * ace/adapter/ace/SOCK_Dgram_Mcast_QoS.h: (removed) - * ace/adapter/ace/SPIPE_Addr.h: (removed) - * ace/adapter/ace/Service_Config.h: (removed) - * ace/adapter/ace/Service_Object.h: (removed) - * ace/adapter/ace/Stats.h: (removed) - * ace/adapter/ace/System_Time.h: (removed) - * ace/adapter/ace/Task_T.h: (removed) - * ace/adapter/ace/Trace.h: (removed) - - The adapter classes were removed since they were - not ready for prime time and their main purpose was - invalidated. If need be, they can be brought back in - the future. - -Wed Oct 25 12:26:25 2000 Carlos O'Ryan <coryan@cs.wustl.edu> - - * ace/RMCast/RMCast_UDP_Reliable_Sender.cpp: - Yet another missing #include - -Wed Oct 25 09:50:48 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/RMCast/RMCast_IO_UDP.h: - * ace/RMCast/RMCast_IO_UDP.cpp: - * ace/RMCast/RMCast_UDP_Reliable_Receiver.h: - * ace/RMCast/RMCast_UDP_Reliable_Receiver.i: - * ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp: - * ace/RMCast/RMCast_UDP_Reliable_Sender.h: - * ace/RMCast/RMCast_UDP_Reliable_Sender.i: - * examples/RMCast/Send_File/Makefile: - * examples/RMCast/Send_File/Sender.cpp: - * examples/RMCast/Send_File/Receiver.cpp: - Change several open() methods to init() because the base class - already has a virtual open() method, but with a different - signature, some compilers generate warnings when this happens. - Add #include required in platforms that do not define - ACE_TEMPLATES_REQUIRE_SOURCE - -Wed Oct 25 09:32:10 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/Object_Manager.cpp: - - Changed to only use the CRT_ERROR disabling under - ACE_DISABLE_WIN32_ERROR_WINDOWS when _DEBUG is defined, - since crtdbg.h is only included by ACE when _DEBUG is - defined. - -Wed Oct 25 10:51:26 2000 Steve Huston <shuston@riverace.com> - - * ace/Select_Reactor_Base.cpp (purge_pending_notifications): Added - ACE_UNUSED_ARG (eh) for the non-ACE_HAS_REACTOR_NOTIFICATION_QUEUE - case to quiet g++'s unused argument warning. - -Tue Oct 24 23:14:55 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS_String.cpp: - * ace/config-win32-borland.h: - - Added ACE_LACKS_WCSDUP to do something similar to - ACE_HAS_STRDUP_EMULATION. Added this to Borland's config, - - Also fixed several warnings in OS_String's emulation - functions that show up with g++. - - * ace/Object_Manager.cpp: - - Added code in the Object Manager to disable some of the - error windows that pops up in Win32 apps. If - ACE_DISABLE_WIN32_ERROR_WINDOWS is defined, then - ACE_ASSERT's and Access Violations will not pop up - error box's anymore. This was mainly added for auto - build purposes. - - * ace/Select_Reactor_Base.cpp: - - Changed ACE_TEXT's to ACE_LIB_TEXT. - - * ace/WFMO_Reactor.cpp: - - In ACE_WFMO_Reactor_Notify::purge_pending_notifications - there was an instance of this type of code: - - for (size_t index = 0; index < ....) - ... - for (index = 0; index ....) - - On Borland, the index is scoped within the for loop, so - the second use of it produces an error. I moved the - declaration outside of the loop to fix this. - -Tue Oct 24 23:40:33 2000 Irfan Pyarali <irfan@cs.wustl.edu> - - * tests/SString_Test.cpp (main): Added tests for string - assignments. - -Tue Oct 24 19:30:16 2000 Steve Huston <shuston@riverace.com> - - * ace/Select_Reactor_Base.cpp (purge_pending_notifications): Correct - erroneous use of 'index' as a variable when it's also a function. - -Tue Oct 24 13:54:49 2000 Ossama Othman <ossama@uci.edu> - - * ace/Makefile (TEMPLATE_FILES): - - Added missing Test_and_Set source file to the list. - - * ace/Makefile.am (libACE_Utils_la_SOURCES, HEADER_FILES, - INLINE_FILES, TEMPLATE_FILES): - - Updated these lists of sources with the newly added sources. - -Tue Oct 24 12:30:47 2000 Steve Huston <shuston@riverace.com> - - * ace/Reactor.h (ACE_Reactor): - * ace/Reactor_Impl.h (ACE_Reactor_Notify and ACE_Reactor_Impl): - * ace/Select_Reactor_Base.h (ACE_Select_Reactor_Notify and - ACE_Select_Reactor_Impl): - * ace/WFMO_Reactor.h (ACE_WFMO_Reactor_Notify and ACE_WFMO_Reactor): - Added new function, purge_pending_notifications (ACE_Event_Handler *) - - * ace/Reactor.i (ACE_Reactor): - * ace/Select_Reactor_Base.i (ACE_Select_Reactor_Impl): - Added implementation of purge_pending_notifications that forwards - the call on to the proper implementation/handler object. - - * ace/Select_Reactor_Base.cpp (ACE_Select_Reactor_Notify): Added - implementation of purge_pending_notifications. Works when - ACE_HAS_REACTOR_NOTIFICATION_QUEUE is defined. Else it does - ACE_NOTSUP_RETURN. - - * ace/WFMO_Reactor.cpp (ACE_WFMO_Reactor, ACE_WFMO_Reactor_Notify): - Added implementation of purge_pending_notifications. - - Thanks to Edan Ayal <edana@bandwiz.com> for supplying the code for - this new feature. - - * ace/Reactor.i (notify): Set the event handler's reactor pointer if - it doesn't already have one. Enables the event handler to purge - its notifications upon destruction. - - * ace/Event_Handler.cpp (~ACE_Event_Handler): Call reactor's - purge_pending_notifications function to avoid delivering notifies - to a deleted handler. - - * tests/Reactor_Notify_Test.cpp: Added the run_notify_purge_test - function to exercise the above new purge_pending_notifications. - -Tue Oct 24 12:05:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS_String.inl: - - Removed an extra } after an #endif that was producing - warnings on OSF. - -Tue Oct 24 09:27:04 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/Test_and_Set.cpp: - Removed the repeated inclusion of the header file. - Thanks to Darrell. - -Tue Oct 24 03:24:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/Basic_Types.h: - * ace/config-win32-common.h: - - Moved the code that defines ACE_SIZEOF_WCHAR to the config file, - so it is easier to add it to other platforms. - - * ace/config-linux-common.h: - - Added ACE_SIZEOF_WCHAR, ACE_LACKS_ITOW, ACE_LACKS_WCSICMP, and - ACE_LACKS_WCSNICMP definitions. - - * ace/Synch.h: - - Moved the ACE_LEGACY_MODE includes further down in the file. It - was producing errors the way it was, since Test_and_Set needed - the Guard classes defined before it was included. - -Mon Oct 23 15:31:52 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Malloc_Allocator.cpp: - Yet another calloc() method that was declared but not defined. - -Mon Oct 23 11:37:06 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/Init_ACE.cpp: - Removed the semicolon at the end of ACE_RCSID. - -Mon Oct 23 11:20:53 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Malloc_T.i: - Add missing function, now things actually link. - -Mon Oct 23 10:02:36 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Malloc_T.h: - Add missing prototype, now the code actually compiles. - -Mon Oct 23 10:59:21 2000 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/OS_String.cpp: Fixed a compile error in gcc 2.95.2. - - * ace/Cached_Connect_Strategy_T.h - * ace/Cached_Connect_Strategy_T.cpp: Added fixes provided by Edan - Ayal <edana@bandwiz.com>. - -Mon Oct 23 08:37:49 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Malloc_T.{h,cpp} - * ace/Malloc_Base.h, - * ace/Malloc_Allocator.{h,cpp}: Added a new calloc() method that - has the same (default) signature as the one in the C/C++ - standard library. Thanks to Shourya Sarcar - <Shourya.Sarcar@geind.ge.com> for reporting this. - - * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp (handle_input): - Fixed a mistake where we were calling release() via a NULL - pointer! Thanks to Pedro Brandao <pbrandao@inescn.pt> for - reporting this. - -Sun Oct 22 18:01:34 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS_String.cpp: - - strtok_r_emulation wasn't protected by #if !defined - (ACE_HAS_REENTRANT_FUNCTIONS). - -Sun Oct 22 17:30:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/ACE.i: - - wcslen was used directly here, changed it to - ACE_OS_String::strlen. - - * ace/ace_wchar.inl: - - Moved around some of the inline functions to - remove warnings. - - * ace/config-vxworks5.x.h: - - Added all the ACE_LACKE_WCS* that VxWorks needs. - -Sun Oct 22 17:22:32 2000 Darrell Brunsch <brunsch@uci.edu> - - * tests/OS_Test.cpp: - - Borland complained about memchr (NULL, ...), since - it couldn't figure out whether to use the void * or - const void* verison of ACE_OS_String::memchr. - Added an explicit cast to help out. - -Sun Oct 22 17:09:26 2000 Darrell Brunsch <brunsch@uci.edu> - - * tests/MT_SOCK_Test.cpp: - - Missed an ACE_ALPHABET in a previous checkin. - - And based on this part of the description in the file: - - "Note that most of the connections will fail since - we're overrunning the size of the listen queue for - the acceptor-mode socket." - - I changed the connection_failed ACE_ERROR_RETURN to an - ACE_DEBUG and return. Now it will not show up as an error - via run_test.pl. - -Sun Oct 22 16:32:24 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS_String.cpp: - * ace/OS_String.h: - * ace/OS_String.inl: - * ace/config-linux-common.h: - - Renamed ACE_HAS_SAFE_WCSTOK to ACE_LACKS_WCSTOK to be - consistent with the rest of the ACE_LACKS_WCS* macros. - - Fixed a signature for wcsncmp_emulation, as it was taking - in const wchar_t as the first arg instead of const - wchar_t *. - - Added wcscspn_emulation and an implementation for - wcsncmp_emulation. - -Sun Oct 22 15:35:38 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/Makefile.bor: - - Changed ACE_Sock_Connect.obj to Sock_Connect.obj, since - it appears that it has been renamed. - -Sun Oct 22 15:07:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/ace_dll.dsp: - - While playing with doxygen, I found some old .h files listed - in the project but no longer existed. Removed these. - - * ace/OS_String.cpp: - * ace/OS_String.h: - * ace/OS_String.inl: - - Added quite a few emulation macros for wcs* functions that - often do not exist on platforms. Since these wcs* functions - just play with wchar_t's, they are not difficult to put in. - Some, such as to_upper and strtod/l/ul are more difficult, - so they are not present on platforms without support for - them. - - Also updated the docs to doxygen style. Someday I'll get - around to writing a script to do this... - - * ace/config-win32-borland.h: - * ace/config-win32-msvc.h: - - Added a couple of macros: - - ACE_HAS_STRCASECMP_EQUIVALENT - - ACE_HAS_STRNCASECMP_EQUIVALENT - - ACE_ITOA_EQUIVALENT - - These are used to specify different names for functions - that differ in names across different compilers. - - * tests/OS_Test.cpp: - - Added tests to test OS_String methods so I can make sure - the emulations work. - - * tests/Buffer_Stream_Test.cpp: - * tests/Conn_Test.cpp: - * tests/MM_Shared_Memory_Test.cpp: - * tests/Mem_Map_Test.cpp: - * tests/Priority_Buffer_Test.cpp: - * tests/Priority_Reactor_Test.cpp: - * tests/Reactor_Performance_Test.cpp: - * tests/SOCK_Test.cpp: - * tests/SPIPE_Test.cpp: - * tests/test_config.h: - - In order to get the test_config.h to work when a project - has more than one .cpp file that includes it (and some - compilers give warnings about a static char[]) I moved - ACE_ALPHABET into the tests that need it. Also I changed - it to a static const char[] in places that allowed it. - - So it could be possible to move it back to test_config.h - now that it can be static const char[], but I'm not 100% - sure that will keep all compilers from complaining. - - * tests/run_test.lst: - - Added OS_Test to the list of tests run. - -Sun Oct 22 17:11:16 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Malloc_T.h: Added a default value of sizeof (T) to the - malloc() method of class ACE_Cached_Allocator. Thanks to - Shourya Sarcar <Shourya.Sarcar@geind.ge.com> for reporting this. - -Sun Oct 22 10:08:31 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Makefile.bor: - Update file names for the ACE_ components. - -Sun Oct 22 08:57:33 2000 David L. Levine <levine@cs.wustl.edu> - - * tests/test_config.h: implemented these changes to remove - g++ warnings introduced by: - - Thu Oct 19 13:17:41 2000 Darrell Brunsch <brunsch@uci.edu> - - 1) Moved ace_file_stream typedef to end of file. - 2) Moved inline definition of ACE_Test_Output::output_file () - to before first use. - 3) Removed static qualifier from ACE_ALPHABET. - -Sat Oct 21 12:52:58 2000 Carlos O'Ryan <coryan@uci.edu> - - * Makefile*: - Update dependencies. - -Fri Oct 20 20:46:37 2000 Steve Huston <shuston@riverace.com> - - * ace/OS.i (chdir): Added !defined (AIX) to the !defined (ACE_WIN32) - && defined (<Visual Age C++>) to get it to build clean on AIX. - - * ace/ace-dll.icc: Added Base_Thread_Adapter, Thread_Adapter, - Flag_Manip, Handle_Ops, Init_ACE, Lib_Find, Sock_Connect, - OS_Log_Msg_Attributes, Malloc_Allocator, PI_Malloc, - Thread_Exit, Log_Msg_IPC, OS_Thread_Adapter, Log_Msg_Backend, - Thread_Control (h and cpp). - - * ace/Handle_Ops.cpp: - * ace/PI_Malloc.cpp: Corrected ACE_RCSID args. - -Fri Oct 20 16:38:55 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Update MSVC projects - -Fri Oct 20 16:23:40 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/ACE.h: - Modified to include the renamed files. - -Fri Oct 20 14:13:43 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/Sock_Connect.i: - * ace/Sock_Connect.h: - * ace/Sock_Connect.cpp: - - * ace/Lib_Find.i: - * ace/Lib_Find.h: - * ace/Lib_Find.cpp: - - * ace/Init_ACE.i: - * ace/Init_ACE.h: - * ace/Init_ACE.cpp: - - * ace/Handle_Ops.i: - * ace/Handle_Ops.h: - * ace/Handle_Ops.cpp: - - * ace/Flag_Manip.i: - * ace/Flag_Manip.h: - * ace/Flag_Manip.cpp: - Renamed the recently added ACE_* files as above to follow - the naming convention. - - * ace/IPC_SAP.h: - * ace/IO_SAP.h: - * ace/FILE_Connector.cpp: - * ace/FILE_Addr.h: - Changed the include files to reflect the above change. - - * ace/Makefile: - Added the new files and updated dependencies. - -Fri Oct 20 11:40:31 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/Makefile: - Updated dependencies. - -Fri Oct 20 02:52:17 2000 Marina Spivak <marina@cs.wustl.edu> - - * bin/auto_run_tests.lst: - - Added RTCORBA Server_Declared test. - -Thu Oct 19 18:02:54 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/OS_Log_Msg_Attributes.h : - Modified u_long to 'unsigned long' as the compiler was - complaining. - -Thu Oct 19 13:52:49 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/Malloc_Allocator.cpp: - * ace/Naming_Context.cpp: - * ace/PI_Malloc.cpp: - - Needed to change some ACE_TEXT's to ACE_LIB_TEXT. - - * ace/OS.h: - * ace/OS_Log_Msg_Attributes.h: - - Moved the definition of ACE_OSTREAM_TYPE from OS.h to - OS_Log_Msg_Attributes.h, since some include paths in - ACE_LEGACY_MODE needed it there. - -Thu Oct 19 13:17:41 2000 Darrell Brunsch <brunsch@uci.edu> - - * tests/run_test.pl: - - Changed the method used to detect errors in a log file. Since - the log contains the log message type (such as LM_ERROR), - I changed the detection to look for this. - - * tests/ACE_Init_Test.cpp: - - Added ACE_START_TEST and ACE_END_TEST so the run_test.pl - script won't think ACE_Init_Test failed. - - * tests/test_config.h: - - With the way ACE_ALPHABET and some functions were defined, - they would cause duplicate symbols if test_config.h was - included in more than one object file. Changed them so - the symbols are static to the file. - - * tests/Reactors_Test.cpp: - - When the reactor was shutting down, it was returning a - information message with ACE_ERROR_RETURN. Since it really - wasn't an error condition, changed this to a ACE_DEBUG - and return 0. - - * tests/SOCK_Send_Recv_Test.cpp: - - The test was checking errno without checking a return value. - As a result, it was getting an out-of-date errno and - incorrectly interpreted that as an error. Fixed. - -Thu Oct 19 12:12:00 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/ACE_Lib_Find.h: - - Added missing static specifier for the wchar version of - strrepl. - -Thu Oct 19 12:03:41 2000 Darrell Brunsch <brunsch@uci.edu> - - * apps/JAWS2/HTTPU/HTTPU.DSP: - * apps/JAWS2/JAWS/jaws.dsp: - - These two projects were placing their DLL's in the wrong - directory. - -Thu Oct 19 14:23:52 2000 Steve Huston <shuston@riverace.com> - - * ace/ace-dll.icc: Removed extraneous ',' from Win32 section. - -Thu Oct 19 12:08:45 2000 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/Cached_Connect_Strategy_T.cpp: Fixed compile errors with old - g++. - -Thu Oct 19 09:56:44 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Basic_Types.h: - Must #include stdio.h for platforms that lack 'long long' - -Thu Oct 19 09:50:30 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Log_Msg.cpp: - Fixed problems during TSS cleanup, the ipc_backend_ object was - used after being destroyed. Apparently this only happens on some - platforms, but fortunately David's build detected the bug. - -Thu Oct 19 09:07:47 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/RMCast/RMCast_Copy_On_Write.h: - Fixed problem in 'friend' declaration, most compilers let it go - through, but not the newer gcc snapshots. Thanks to Craig - Rodrigues <crodrigu@bbn.com> for providing this patch. - -Wed Oct 18 15:44:14 2000 Luther J Baker <luther@cs.wustl.edu> - - * OS.h: - * OS.i: - * OS.cpp: - - Modifications to sem_open debugging ACE_HAS_PACE over NT. - -Wed Oct 18 09:45:12 2000 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/Cached_Connect_Strategy_T.h : - * ace/Cached_Connect_Strategy_T.cpp: Added some fixes provided by - Edan Ayal <edana@bandwiz.com>. - -Tue Oct 17 23:35:33 2000 David L. Levine <levine@cs.wustl.edu> - - * Don't use ACE_TSS_EMULATION by default with LynxOS 3.1.0 - because it's not necessary, according to - Jessie Ragsdale <jessie.ragsdale@latuslw.com>, and breaks - split=1. Jessie was able to create upo to 118 natvie TSS keys, - so the 3-key limit of LynxOS 3.0.0 has been removed in 3.1.0. - [Bug 701] - -Tue Oct 17 00:21:41 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h, - examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i, - examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h, - examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i, - examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h, - examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i, - examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h, - examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i, - examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h, - examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i: - Changed *::get_handle(), *::handle_input(), and - *::handle_close() to use ACE_HANDLE and ACE_INVALID_HANDLE - instead of int and -1. Thanks to Mike Curtis - <mccurry@my-deja.com> for pointing this out. - -Mon Oct 16 14:05:13 2000 David L. Levine <levine@cs.wustl.edu> - - * ACE-INSTALL.html: removed spurious 3D characters from - VxWorks section. - -Mon Oct 16 11:17:08 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Makefile.am: - Fixed misnamed file. - -Mon Oct 16 11:07:34 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Log_Msg.cpp: - Fixed memory leak, or rather, make sure that the default Log_Msg - IPC backend is destroyed when the Log_Msg class is closed. - - * ace/Object_Manager.cpp: - Fixed typo in #endif, the final comment was not really a - comment. - -Sun Oct 15 19:14:13 2000 Marina Spivak <marina@cs.wustl.edu> - - * bin/auto_run_tests.lst: - Excluded tests/RTCORBA/Client_Propagated from running in - Exceptions build since it's a linux build. - -Sat Oct 14 15:04:16 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.h: - * ace/Naming_Context.h: - Static services must be exported from the library, so they - require the right export directives. - Added a new ACE_STATIC_SVC_DECLARE_EXPORT() macro for that - purpose and use it for the Naming_Context. - -Sat Oct 14 09:55:43 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Makefile.bor: - Fixed typo in file name. - -Sat Oct 14 03:32:54 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/ACE_Flag_Manip.h: - * ace/Service_Templates.h: - Added a missing header file. - -Fri Oct 13 22:40:27 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Add new files to the project. - - * ace/Log_Msg.cpp: - Fixed typo in management of structured exception handling - callbacks. - -Fri Oct 13 21:49:54 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - Add the new Log_Msg files to the Makefiles. - - * ace/ACE_Lib_Find.cpp: - Add ACE_RCSID macro - - * ace/config-all.h: - * ace/OS_Log_Msg_Attributes.h: - * ace/OS_Log_Msg_Attributes.inl: - * ace/OS_Log_Msg_Attributes.cpp: - * ace/Base_Thread_Adapter.h: - * ace/Base_Thread_Adapter.cpp: - We pre-allocate the Log_Msg attributes in the Thread_Adapter, to - minimize memory allocations during thread creation. - - * ace/Log_Msg_Callback.h: - * ace/Log_Msg_Callback.cpp: - Move the Log_Msg callback interface to its own file. - - * ace/Log_Msg_Backend.h: - * ace/Log_Msg_Backend.cpp: - Define the interface for Log_Msg backend strategies. - - * ace/Log_Msg_IPC.h: - * ace/Log_Msg_IPC.cpp: - Implement a Log_Msg backend based on IPC. - The intention is to decouple Log_Msg from IPC components, thus - Log_Msg only uses the abstract class ACE_Log_Msg_Backend. - In the future we could implement other backends, such as logging - to syslog or the NT event log directly. - We need to use a dynamically loaded factory to complete the - decoupling, but that would take a little more effort. - - * ace/Log_Msg.h: - * ace/Log_Msg.cpp: - Use the attributes directly. - Use the new Log_Msg_Backend classes. - - * tests/Log_Msg_Test.cpp: - * examples/Log_Msg/test_callback.cpp: - #include Log_Msg_Callback.h, the file is not included unless - ACE_LEGACY_MODE is set. - - * tests/Malloc_Test.cpp: - Add missing #include - - * examples/Shared_Malloc/test_position_independent_malloc.h: - * examples/Shared_Malloc/test_position_independent_malloc.cpp: - Reordered #includes to make them more standard. - -Fri Oct 13 22:34:59 2000 Marina Spivak <marina@cs.wustl.edu> - - * bin/auto_run_tests.lst: - - Added new TAO/tests/RTCORBA/Client_Protocol test to the list. - Removed TAO/tests/Endpoint_Per_Priority because - TAO::Client_Priority_Policy is now disabled in builds by - default. Enabled TAO/tests/RTCORBA/Server_Protocol for linux - builds (it was disabled for some reason). - -Fri Oct 13 19:12:31 2000 Steve Huston <shuston@riverace.com> - - * ace/Malloc_T.h: Added #include "ace/Malloc.h" because the definition - of ACE_Control_Block is needed, and it's in Malloc.h. - -Fri Oct 13 18:47:51 2000 Steve Huston <shuston@riverace.com> - - * ace/Caching_Strategies_T.cpp: - * ace/Dynamic_Service.cpp: - * ace/Timer_Hash_T.cpp: - * ace/Timer_Wheel_T.cpp: - * netsvcs/lib/Log_Message_Receiver.cpp: Added #include "ace/Log_Msg.h" - else IBM C++ can't compile the template at instantiation time. - - * tests/Process_Strategy_Test.h: Added #include "ace/File_Lock.h" to - see ACE_File_Lock, so IBM C++ can compile the templates. - -Fri Oct 13 18:43:24 2000 Steve Huston <shuston@riverace.com> - - * tests/MM_Shared_Memory_Test.cpp: Changed SYNCHRONIZER ctor for - ACE_SV_Semaphore_Simple case to specify - ACE_SV_Semaphore_Simple::ACE_CREATE, not ACE_SV_Semaphore_Complex:: - ACE_CREATE. Else it got compile failures on Solaris, Sun CC, - in PACE build (why in just PACE build? Dunno...) - -Fri Oct 13 13:57:40 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/Process_Manager.h : - * ace/Process_Manager.cpp : - - * ace/Service_Config.h : - * ace/Service_Config.cpp: - - Removed dependency of Service_Config on Process_Manager by - registering the Process_Manager singleton with the - Object_Manager when it is instantiated. This way we need not call - ACE_Process_Manager::close_singleton () in Service_Config - implementation. - -Mon Oct 9 10:34:18 2000 Ossama Othman <ossama@uci.edu> - - * configure.in: - - Corrected comments regarding the ACE_HAS_STREAM_PIPES run-time - test. - -Fri Oct 13 11:41:29 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/Makefile.bor (OBJFILES): - * ace/Makefile.am (libACE_Utils_la_SOURCES): - Updated to include the new files. - - * examples/Shared_Malloc/test_position_independent_malloc.cpp: - Included a header file. - -Fri Oct 13 11:43:56 2000 David L. Levine <levine@cs.wustl.edu> - - * ACE-INSTALL.html: updated supported platforms list. - -Fri Oct 13 11:39:54 2000 David L. Levine <levine@cs.wustl.edu> - - * ACE-INSTALL.html: added Jaffar Shaikh's <Jaffar_Shaikh@Mitel.COM> - notes for building for VxWorks target on NT host. - -Fri Oct 13 06:26:18 2000 Balachandran Natarajan <bala@cs.wustl.edu> - - * examples/RMCast/Send_File: - Added makefiles for Send_File multicast example. - - * include/makeinclude/build_dll.bor: - * include/makeinclude/build_exe.bor: - * include/makeinclude/build_lib.bor: - Added support for compilation of C source files. - - * include/makeinclude/ace_flags.bor: - Added IORManip and FaultTolerance libraries for TAO. - - Thanks to Christopher Kohlhoff for providing these fixes. - -Thu Oct 12 23:33:21 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Synch.h: - * ace/Synch_T.h: - * ace/Test_and_Set.cpp: - Fixed order of includes to compile under gcc. - -Thu Oct 12 22:58:13 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/ACE_Lib_Find.h: - * ace/ACE_Lib_Find.cpp: - * ace/ACE.cpp: - Move the wchar version of strrepl and strsplit_r to the - ACE_Lib_Find class, the other versions where there already. - - * ace/FILE_IO.h: - * ace/FILE_Connector.cpp: - Add missing #include in FILE_IO.h that is used in FILE_IO.i - - * ace/Test_and_Set.h: - * ace/Test_and_Set.cpp: - Fixed the guards for the .cpp file. Add the #include for - platforms that requires template source visible, and add the - #pragma implementation for (really) old g++ versions. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Move Test_and_Set.cpp to the "Template Files" folder, and - disable compilation for it. - -Thu Oct 12 23:09:17 2000 Joe Hoffert <joeh@cs.wustl.edu> - - * ace/OS.i: - Added a !defined (__Lynx__) check for ACE_HAS_PACE in the - ACE_OS::mmap function. ACE does some special things for Lynx - for mmap since Lynx's mmap is deficient. Probably should - move this fix from ACE to PACE at some point. - -Thu Oct 12 19:38:00 2000 Ossama Othman <ossama@uci.edu> - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - - Added new files introduced by Priyanka's footprint reduction - effort. - -Thu Oct 12 18:19:46 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/Makefile: - Made the corresponding changes. - - * ace/System_Time.cpp: - * ace/UPIPE_Connector.cpp : - * ace/Timer_Queue_T.h : - * ace/Task.cpp : - * ace/POSIX_Asynch_IO.cpp: - * ace/OS.h: - * ace/Memory_Pool.cpp: - * ace/MEM_SAP.h: - * ace/MEM_Acceptor.cpp: - * ace/Logging_Strategy.cpp: - * ace/FIFO.h: - * ace/DLL.cpp: - * ace/IO_SAP.h: - * ace/Malloc_T.h : - Cosmetic changes. Ex: Change the included header files to the - new header files and similar changes. - - * ace/Naming_Context.h: - * ace/Naming_Context.cpp: - * ace/Object_Manager.cpp: - - Removed the dependency of Object_Manager on Naming_Context. - - * ace/Test_and_Set.h: - * ace/Test_and_Set.cpp: - * ace/Test_and_Set.i: - - Moved the class Test_and_Set from Synch_T to here. This helped - remove the dependency on Event_Handler. - - * ace/Service_Templates.h: - * ace/Service_Templates.cpp: - - Moved the template instantiations from Service_Config.cpp and - Service_Types.cpp since these templates were not needed by the - respective files. - - * ace/Malloc_Allocator.h : - * ace/Malloc_Allocator.cpp: - * ace/Malloc_Allocator.i : - - * ace/PI_Malloc.h : - * ace/PI_Malloc.cpp: - * ace/PI_Malloc.i : - - * ace/Malloc.h : - * ace/Malloc.cpp : - * ace/Malloc.i : - - Moved the ACE_PI_Control_Block, ACE_New_Allocator and - ACE_Static_Allocator_Base classes to new files: PI_Malloc and - Malloc_Allocator. - - This move helps in reduction in size of Malloc.i since the - template instantiations which were included only for - ACE_PI_Control_Block are now moved to the new file: PI_Malloc. - In addition, is the effect of clear and minimized dependencies. - - * ace/ACE.h : - * ace/ACE.cpp : - * ace/ACE.i : - - Moved several functions in ACE to new classes to minimize the - dependencies on and by ACE. Each of the following files - have the listed functions. - - * ace/Malloc_Instantiations.cpp: - Moved the template instantiations to this file. - - * ace/ACE_Sock_Connect.h : - * ace/ACE_Sock_Connect.cpp : - * ace/ACE_Sock_Connect.i : - - Has the socket connection establishment function calls : - bind_port, get_bcast_addr, get_ip_interfaces, count_interfaces - and get_handle. - - Helps remove the dependency on INET_Addr. - - * ace/ACE_Handle_Ops.h: - * ace/ACE_Handle_Ops.cpp: - * ace/ACE_Handle_Ops.i: - - Has the <handle_timed_open> operation on handles. - Helps remove the dependency of FILE_Connector, SPIPE_COnenctor, - UPIPE_Conenctpr and DEV_Connector on ACE. - - * ace/ACE_Lib_Find.h : - * ace/ACE_Lib_Find.cpp : - * ace/ACE_Lib_Find.i : - - Includes all the functions to search and open shared - libraries and realted functions : - ldfind, ldopen, ldname, get_temp_dir, open_temp_file, - strrepl, strsplit_r. - - Removes the dependency of DLL, Logging_Strategy and FILE_Addr on - ACE. Effects few other classes too but doesnt remove the - dependency on ACE for those classes. - - * ace/ACE_Flag_Manip.h : - * ace/ACE_Flag_Manip.cpp: - * ace/ACE_Flag_Manip.i : - - The Flag Manipulation functions: - set_flags (), clr_flags () and get_flags (). - - Removes the dependency of IO_SAP and IPC_SAP on ACE. - - * ace/ACE_Init.h : - * ace/ACE_Init.cpp: - * ace/ACE_Init.i : - - The init () and fini () functions which are used - for the initialization and shutting down of ACE. - - Removes dependency on Object_Manager. - -Thu Oct 12 15:41:46 2000 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/rules.bin.GNU: - List the LDFLAGS before the name of the program, this seems to - work better for some of our sponsors. - -Thu Oct 12 15:40:51 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.cpp (ACE_OS_GUARD): - Use explicit names for the OS guards, otherwise the SGI compiler - (7.30 + several patches) crashes. Thanks to Philip Miller - <pwmiller@sarnoff.com> for reporting the problem and providing - the patch. - -Thu Oct 12 12:15:23 2000 Angelo <corsaro@cs.wustl.edu> - - * ACE version 5.1.10 released. +#---------------------------------------------------------------------------- +# $Id$ +# +# Top-level Makefile for Pluggable testing of AVStreams of TAO. +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO + +SENDER_OBJS = sender.o +DISTRIBUTER_OBJS = distributer.o +RECEIVER_OBJS = receiver.o + +VLDLIBS = $(LDLIBS:%=%$(VAR)) + +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + +FILES = sender distributer receiver +DEFS = $(addsuffix .h,$(FILES)) +LSRC = $(addsuffix .cpp,$(FILES)) + +BIN2 = sender distributer receiver + +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # AV + +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(TAO_ROOT)/rules.tao.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU + +#DCFLAGS = -g +LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \ + -I$(TAO_ROOT) + +#server:$(addprefix $(VDIR),$(SERVER_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i + +.obj/distributer.o .obj/distributer.so .shobj/distributer.o .shobj/distributer.so: distributer.cpp distributer.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h + +.obj/receiver.o .obj/receiver.so .shobj/receiver.o .shobj/receiver.so: receiver.cpp receiver.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ +#---------------------------------------------------------------------------- +# $Id$ +# +# Top-level Makefile for Pluggable testing of AVStreams of TAO. +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO + +SENDER_OBJS = sender.o +DISTRIBUTER_OBJS = distributer.o +RECEIVER_OBJS = receiver.o + +VLDLIBS = $(LDLIBS:%=%$(VAR)) + +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + +FILES = sender distributer receiver +DEFS = $(addsuffix .h,$(FILES)) +LSRC = $(addsuffix .cpp,$(FILES)) + +BIN2 = sender distributer receiver + +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # AV + +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(TAO_ROOT)/rules.tao.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU + +#DCFLAGS = -g +LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \ + -I$(TAO_ROOT) + +#server:$(addprefix $(VDIR),$(SERVER_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl index 587a0f408fe..6e3049dc47f 100755 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl @@ -20,7 +20,7 @@ $makefile = PerlACE::LocalFile ("input"); unlink $nsior; $NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior"); -$SV = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -s sender -r 1"); +$SV = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -s sender"); $RE1 = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior -s distributer -r receiver1 -f output1"); $RE2 = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior -s distributer -r receiver2 -f output2"); $DI = new PerlACE::Process ("distributer", "-ORBInitRef NameService=file://$nsior -s sender -r distributer"); diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile index 89454ca1f06..f1088e62b59 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile @@ -11,10 +11,6 @@ LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO -ifeq ($(rapi),1) - LDLIBS += -lACE_QoS -endif # rapi - SENDER_OBJS = Connection_Manager.o \ sender.o DISTRIBUTER_OBJS = Connection_Manager.o \ diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile index 2ab13d07b5b..3e121304e25 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile @@ -11,10 +11,6 @@ LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO -ifeq ($(rapi),1) - LDLIBS += -lACE_QoS -endif # rapi - SERVER_OBJS = server.o CLIENT_OBJS = ftp.o diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile index 577d236649a..9b0fe0a31d6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile @@ -8,10 +8,6 @@ LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO -ifeq ($(rapi),1) - LDLIBS += -lACE_QoS -endif # rapi - ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile deleted file mode 100644 index ec8add735dd..00000000000 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile +++ /dev/null @@ -1,808 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Top-level Makefile for Pluggable testing of AVStreams of TAO. -# -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO - -ifeq ($(rapi),1) - LDLIBS += -lACE_QoS -endif # rapi - -RECEIVER_OBJS = receiver.o -SENDER_OBJS = sender.o - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -ifndef TAO_ROOT -TAO_ROOT = $(ACE_ROOT)/TAO -endif - -FILES = sender receiver -DEFS = $(addsuffix .h,$(FILES)) -LSRC = $(addsuffix .cpp,$(FILES)) - -BIN2 = receiver sender - -#### If the TAO orbsvcs library wasn't built with sufficient components, -#### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # AV - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(TAO_ROOT)/rules.tao.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#DCFLAGS = -g -LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \ - -I$(TAO_ROOT) - -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ - $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/tao/corba.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/CDR_Base.inl \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/CORBA_macros.h \ - $(TAO_ROOT)/tao/varbase.h \ - $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ - $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Managed_Types.h \ - $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/OctetSeqC.i \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_Dgram.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ - $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(ACE_ROOT)/ace/ATM_Addr.h \ - $(ACE_ROOT)/ace/ATM_Addr.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/Process.i \ - $(ACE_ROOT)/ace/SOCK_CODgram.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_CODgram.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ - $(TAO_ROOT)/tao/debug.h \ - $(ACE_ROOT)/ace/Process_Semaphore.h \ - $(ACE_ROOT)/ace/Process_Semaphore.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/High_Res_Timer.h \ - $(ACE_ROOT)/ace/High_Res_Timer.i - -.obj/receiver.o .obj/receiver.so .shobj/receiver.o .shobj/receiver.so: receiver.cpp receiver.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ - $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/tao/corba.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/CDR_Base.inl \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/CORBA_macros.h \ - $(TAO_ROOT)/tao/varbase.h \ - $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ - $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Managed_Types.h \ - $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/OctetSeqC.i \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_Dgram.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ - $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(ACE_ROOT)/ace/ATM_Addr.h \ - $(ACE_ROOT)/ace/ATM_Addr.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/Process.i \ - $(ACE_ROOT)/ace/SOCK_CODgram.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_CODgram.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ - $(TAO_ROOT)/tao/debug.h \ - $(ACE_ROOT)/ace/Process_Semaphore.h \ - $(ACE_ROOT)/ace/Process_Semaphore.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/README b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/README deleted file mode 100644 index 51ee6670ddf..00000000000 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/README +++ /dev/null @@ -1,52 +0,0 @@ -// $Id$ - -Description ------------ - -This directory contains a simple test in the form of a sender and a -receiver. The test has the following features: - -1. It tests the AVStreams Pluggable Protocol Framework -2. Shows a mechanism to pace data. -3. Shows how we can modify the qos of a flow during run-time. - -To demonstrate the qos modification teh receiver calls the modify_qos -(in this test we are modifying the frame rate of the flow) method after -receiving 20 frames (a number selected for no good reason!!). -This call in turn is propagated to the sender. The sender then re-initializes -the frame rate to the one requested by the receiver. - -Running the test ----------------- - -receiver --------- - -receiver -f <output_filename> - --f <output_filename> -> The name of the file under which the received stream - data has to be stored (defaults to "output") - -sender ------- - -sender [-f <filename>] [-p <protocol>] [-r <frame rate>] [-d] - - --f filename --> The file to be streamed to the receiver (defaults to - "input"). - --p protocol --> The protocol string could be UDP or TCP (defaults to - UDP). But with the multicast address it should be UDP. - --r framerate--> The rate at which tha data frames need to be sent - (defaults to 30 frames per second). - --d --> Increament the TAO_debug_level for debug messages. - - -The test must be run with the naming service. Check the run_test.pl -to see how to configure the test case. - - - diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/input b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/input deleted file mode 100644 index 3a38e42d893..00000000000 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/input +++ /dev/null @@ -1,9047 +0,0 @@ -Wed Apr 11 20:36:36 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * examples/Synch/proc_sema.cpp (main): Fixd an assigning string - literal to char* warning. - -Wed Apr 11 18:04:33 2001 Steve Huston <shuston@riverace.com> - - * include/makeinclude/rules.bin.GNU: Change the Visual Age C++ - incremental build command to use vacbld_r, the thread-enabled - variant of vacbld. - -Wed Apr 11 11:00:50 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ACE-INSTALL.html: Added a section illustrating how to build - ACE+TAO for RTEMS. Thanks to Joel Sherrill <joel@OARcorp.com> - for this build procedure. - -Wed Apr 11 11:38:37 2001 Steve Huston <shuston@riverace.com> - - * ace/IOStream.h: Reverted change from - Tue Apr 10 18:35:22 2001 Steve Huston <shuston@riverace.com> - and replaced it with a section that sets ACE_LACKS_ACE_IOSTREAM - if ACE_HAS_STANDARD_CPP_LIBRARY is set and ACE_USES_OLD_IOSTREAMS - is not. This restriction is noted and tracked in Bugzilla # 857. - - * ace/IOStream.cpp: - * tests/IOStream_Test.cpp: Reverted change from - Tue Apr 10 18:35:22 2001 Steve Huston <shuston@riverace.com> - -Wed Apr 11 09:44:32 2001 Chad Elliott <elliott_c@ociweb.com> - - * examples/Misc/test_trace.cpp: - - Fixed a strange compiler error with Tornado II. - My_Task::recursive was inline which caused an internal compiler - error. - -Wed Apr 11 08:04:21 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * include/makeinclude/platform_linux.GNU: By default, we build - ACE+TAO with exceptions enabled on Linux. Thanks to Craig - Rodrigues <crodrigu@bbn.com> for motivating this change. - - * ace/SString.i (operator+): Fixed an "inlined before use" warning. - Thanks to Bala for reporting this. - -Tue Apr 10 16:58:54 2001 Ossama Othman <ossama@uci.edu> - - * ace/OS.h (ACE_DEFAULT_FILE_PERMS, ACE_DEFAULT_DIR_PERMS): - - Changed the default values on UNIX from 0666 and 0777 to 0644 - and 0755, i.e. removed global write permissions. This addresses - some security issues. Now, only the owner has write permissions - by default. - -Tue Apr 10 18:35:22 2001 Steve Huston <shuston@riverace.com> - - * include/makeinclude/platform_sunos5_sunc++.GNU: Added a new - build option, stdcpplib, which defaults to 1. If set to 1, - Sun Workshop 5 and Forte 6 compilers will use the standard - C++ library, including standard iostreams. Set to 0 to - use the old, classic iostreams. - - * include/makeinclude/platform_hpux_aCC.GNU: Added support for - the stdcpplib build option. It defaults to 1 if using aC++ - x.27, or 0 if not. Thanks very much to Istvan Buki <ibuki@fedex.com> - for these changes. - - * ace/config-aix-4.x.h: For Visual Age C++ 5, turn on - ACE_HAS_STANDARD_CPP_LIBRARY and - ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB. - - * ace/config-sunos5.5.h: For Sun Workshop 5 and Forte 6 compilers, - take the ACE_USES_OLD_IOSTREAMS setting from the platform_macros.GNU - file; don't set it here. - - * ace/config-hpux-11.00.h: - * ace/config-hpux-10.x-hpc++.h: If the stdcpplib=1 option was used, - then turn on ACE_HAS_STANDARD_CPP_LIB and - ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB. Else turn on - ACE_USES_OLD_IOSTREAMS. - - * ace/IOStream.{h cpp}: Only try to build this stuff if - ACE_LACKS_ACE_IOSTREAM is not defined and ACE_USES_OLD_IOSTREAMS - _is_ defined. The check on ACE_USES_OLD_IOSTREAMS can be removed - when ACE_IOStream gets ported to standard iostreams. - - * tests/IOStream_Test.cpp: Only try this if ACE_USES_OLD_IOSTREAMS - is defined. Remove this if/when ACE_IOStream is ported to new - iostreams. - -Tue Apr 10 17:51:25 2001 Pradeep Gore <pradeep@cs.wustl.edu> - - * bin/auto_run_tests.lst: - Added TAO/tests/OctetSeq/run_test1{2}.pl to auto testing. - -Tue Apr 10 16:33:42 2001 Joe Hoffert <joeh@cs.wustl.edu> - - * ace/CDR_Stream.i: - * ace/CDR_Stream.cpp: - Added sanity checks for sizes of strings and arrays. - -Tue Apr 10 15:14:52 2001 Chad Elliott <elliott_c@ociweb.com> - - * include/makeinclude/platform_vxworks5.x_g++.GNU: - - Added missing else/endif from previous support addition. - -Tue Apr 10 11:48:51 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * include/makeinclude/platform_vxworks5.x_g++.GNU: Added support - for the M68k line of CPUs. Thanks to Albert Pariante - <albert@sw.bev.etn.com> for reporting this. - -Tue Apr 10 02:14:55 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * bin/PerlACE/Run_Test.pm (check_n_cleanup_files): Added a new - PerlACE function that checks for unwanted files and spits out a - warning before removing the file. It makes sure that we not - only clean up resource leaks but also notice their existence. - - * tests/run_test.pl (delete_temp_files): Used the new - <check_n_cleanup_files> to remove the temp files for - MEM_Stream_Test, if there are any. - -Tue Apr 10 1:44:02 2001 Yamuna Krishnamurthy <yamuna@ace.cs.wustl.edu> - - * examples/QOS/Change_Sender_TSpec/receiver.cpp: - * examples/QOS/Change_Sender_TSpec/receiver.dsp: - * examples/QOS/Change_Sender_TSpec/sender.cpp: - * examples/QOS/Change_Sender_TSpec/sender.dsp: - * examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h: - * examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp: - * examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h: - * examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp: - * examples/QOS/Change_Sender_TSpec/QoS_Util.h: - * examples/QOS/Change_Sender_TSpec/QoS_Util.cpp: - * examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.h: - * examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.cpp: - * examples/QOS/Change_Sender_TSpec/FlowSpec_Dbase.h: - * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h: - * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp: - * examples/QOS/Change_Sender_TSpec/README: - * examples/QOS/Change_Sender_TSpec/Makefile: - - Added a test to dynamically change the Sender flow spec in - order to continuously change the PATH messages. - - * examples/QOS/Change_Receiver_FlowSpec/receiver.cpp: - * examples/QOS/Change_Receiver_FlowSpec/receiver.dsp: - * examples/QOS/Change_Receiver_FlowSpec/sender.cpp: - * examples/QOS/Change_Receiver_FlowSpec/sender.dsp: - * examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h: - * examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp: - * examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h: - * examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp: - * examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h: - * examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp: - * examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.h: - * examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.cpp: - * examples/QOS/Change_Receiver_FlowSpec/FlowSpec_Dbase.h: - * examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h: - * examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp: - * examples/QOS/Change_Receiver_FlowSpec/README: - * examples/QOS/Change_Receiver_FlowSpec/Makefile: - - Added a test to dynamically change the Receiver flow spec in - order to continuously change the RESV messages. - - * examples/QOS/Simple/receiver.cpp: - * examples/QOS/Simple/receiver.dsp: - * examples/QOS/Simple/sender.cpp: - * examples/QOS/Simple/sender.dsp: - * examples/QOS/Simple/Sender_QoS_Event_Handler.h: - * examples/QOS/Simple/Sender_QoS_Event_Handler.cpp: - * examples/QOS/Simple/Receiver_QoS_Event_Handler.h: - * examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp: - * examples/QOS/Simple/QoS_Util.h: - * examples/QOS/Simple/QoS_Util.cpp: - * examples/QOS/Simple/QoS_Signal_Handler.h: - * examples/QOS/Simple/QoS_Signal_Handler.cpp: - * examples/QOS/Simple/FlowSpec_Dbase.h: - * examples/QOS/Simple/Fill_ACE_QoS.h: - * examples/QOS/Simple/Fill_ACE_QoS.cpp: - * examples/QOS/Simple/README: - * examples/QOS/Simple/Makefile: - - Moved the original QOS example to Simple. - - * examples/QOS/Makefile: - * examples/QOS/QOS.dsw: - - Updated the Makefile to compile the constituent tests. - -Mon Apr 9 18:48:02 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * include/makeinclude/Makefile.rtems: Zapped - - export RTEMS_MAKEFILE_PATH=/opt/rtems/sparc-rtems/erc32/ - - so that the environment variable is obtained from the users - environment. Thanks to Joel Sherrill <joel@OARcorp.com> for - this fix. - - * ace/Log_Msg.h: Only define the ACE_ASSERT macro if it's not - already defined. This make it easy for developers to override - this macro in their config.h file. Thanks to Nathalie D'Amours - <nathalie@stentor.com> for motivating this change. - -Mon Apr 9 15:36:04 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/High_Res_Timer.cpp: - Use the 'cpu MHz' line from /proc/cpuinfo in favor of the - 'bogomips' line, because the latter gives the wrong number on - multi-CPU boxes. - -Mon Apr 9 14:37:30 2001 Chad Elliott <elliott_c@ociweb.com> - - * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp: - - Removed extraneous template instantiations. - -Mon Apr 09 09:19:37 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/SString.cpp: - Fixed Fuzz error - -Mon Apr 9 08:28:47 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/SString.{h,i,cpp}: Added improved support for ACE_WString: - . The magic number 32 has been changed to ACE_DEFAULT_GROWSIZE. - . ACE_WString only allocates memory when it is needed. - . The grow strategy can be modified by setting the ACE_GROW_LINEAR define. - the string does not double the memory then, but increases the memory by - ACE_DEFAULT_GROWSIZE. - Thanks to Eric Zuur <Eric.Zuur@meco.nl> for contributing these - enhancements. - - * ace/High_Res_Timer.cpp (get_cpuinfo): Added support for the Pentium - III and IV. Thanks to Stephane Pion - <PION_Stephane@stna.dgac.fr> for contributing this fix. - -Mon Apr 9 07:50:08 2001 Chad Elliott <elliott_c@ociweb.com> - - * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp: - * examples/IPC_SAP/SOCK_SAP/Makefile: - Fixed a typo in the Makefile and added "CPP-inclient.h" include to - CPP-memclient.cpp. - -Mon Apr 9 07:42:29 2001 Chad Elliott <elliott_c@ociweb.com> - - * ace/Basic_Types.cpp: - Changed format flags from ios::fmtflags to unsigned long. - This typedef is not supported by all platforms. Thanks Carlos - <coryan@uci.edu> for suggesting this change. - -Mon Apr 09 08:08:11 2001 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Timer_Queue_T.h - Declared private copy constructor and assignment operator - for class ACE_Event_Handler_Handle_Timeout_Upcall - -Sun Apr 08 18:55:58 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/DLL_Test.cpp: - Use ACE::ldname() instead of keeping a local function to - decorate the name. - Use the "d" suffix only on MSVC debug builds. - - * tests/Makefile.bor: - * tests/DLL_Test.bor: - New Borland Makefile for the shared library in DLL_Test. Thanks - to Christopher Kohlhoff <chris@kohlhoff.com> for providing the - patches. - - * tests/run_test.pl: - Add ExeSubDir to the path, required in Borland builds to find - the shared libraries created locally. - -Sun Apr 8 13:12:54 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/SString.cpp: Reordered various constructor initializers so - G++ doesn't complain. Thanks to Bala for reporting this. - - * ace/SString.{h,i,cpp}: Added various optimizations to ACE_WString - so it will perform certain operations as efficiently as - ACE_CString. Thanks to Eric Zuur <Eric.Zuur@meco.nl> for - contributing these enhancements. - -Sun Apr 08 12:10:30 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp: - * examples/IPC_SAP/SOCK_SAP/Makefile: Updated obsolete - shared-memory transport functions. - -Sun Apr 8 09:49:26 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * bin: Added a new shell script called "make-components" that enables - each ACE component to be built in a simple manner using the - following change from Arturo. - - * ace/Makefile: Generalized the libACE.a and libACE.$(SOEXT) targets - to simplify subsettings. Thanks to Arturo Montes - <mitosys@colomsat.net.co> for reporting this. - -Sat Apr 7 16:00:48 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * tests: Added a new rtems_init.c file. Thanks to Joel Sherrill - <joel@OARcorp.com> for contributing this port. - - * include/makeinclude: Added the new platform_rtems.x_g++.GNU file. - * ace: Added the new config-rtems.h file. - - * ace/OS.cpp: Added support for RTEMS, which is an open-source - real-time operating system that can be downloaded from - ftp://ftp.oarcorp.com/pub/rtems. Thanks to Joel Sherrill - <joel@OARcorp.com> for contributing this port. - - * ace/OS.cpp: The return type for ACE_OS::readv_emulation() - should have been ssize_t, not int, to be consistent with its - definition in the header file. Thanks to Joel Sherrill - <joel@OARcorp.com> for reporting this. - -Sat Apr 7 21:16:49 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - Add the new Crash_On_Write and MT_Timeout tests to the nightly - builds. - -Fri Apr 6 21:02:05 2001 Carlos O'Ryan <coryan@uci.edu> - - * examples/Synch/proc_sema.cpp: - Add missing #include for "ace/Log_Msg.h", on platforms that - define ACE_TEMPLATES_REQUIRE_SOURCE this include is magically - obtained, but this is not the case for SunCC 4.2, and - True64/CXX. - -Fri Apr 06 16:22:24 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/SString.h (ACE_Tokenizer): Updated documentation and added - some examples. Thanks to Jody Hagins <jody@atdesk.com> for - providing the original example. - -Fri Apr 6 17:11:34 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * bin/auto_run_tests.lst: Added the Single_Read test to the - nightly build list. - -Fri Apr 6 14:45:52 2001 Chad Elliott <elliott_c@ociweb.com> - - * ace/Basic_Types.h: - * ace/Basic_Types.cpp: - Changed the as_string() method to avoid using floor() which - required math.h and ACE_CString which caused unnecessary coupling. - -Fri Apr 6 08:34:15 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/make_pretty.pl: - Do no give out warnings for the 'nocompatwarnings' option in - HP-UX. - -Fri Apr 6 08:23:02 2001 Chad Elliott <elliott_c@ociweb.com> - - * ace/Basic_Types.cpp: - * ace/Basic_Types.h: - * tests/Process_Strategy_Test.cpp: - * examples/Connection/misc/Connection_Handler.cpp: - Remove build warnings for platforms that don't support unsigned - long long types and have unsigned char's. - -Fri Apr 6 02:02:01 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/OS.h: - * ace/OS.i: The implementation for process semaphore on platforms - lacking named POSIX semaphores was broken. On these platforms, - semaphores are allocated in MMAP file so they should never be - deleted. Added a flag <new_sema_> to remember if a semaphore - can be deleted (USYNC_THREAD) or not (USYNC_PROCESS). - - * ace/config-sunos5.6.h: According to the man pages, SunOS started - supporting POSIX semaphores from 5.6. Defined ACE_HAS_POSIX_SEM - and ACE_LACKS_NAMED_POSIX_SEM. - -Thu Apr 5 11:23:05 2001 Carlos O'Ryan <coryan@uci.edu> - - * html/index.html: - Add link to the new QoS library documentation. - -Thu Apr 05 03:26:13 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * examples/Makefile: - * examples/Synch/Makefile: - * examples/Synch/README: - * examples/Synch/Synch.dsw: - * examples/Synch/proc_sema.cpp: - * examples/Synch/proc_sema.dsp: Added a new example to play with - process semaphores. - -Thu Apr 05 02:48:51 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/MEM_IO.cpp (write): My earlier change was causing the test - to crash. - - * ace/MEM_Stream.h: - * ace/MEM_Stream.i: - * ace/MEM_Stream.cpp: Added a new method to inform the stream to - clean up its resources when closing down. - - * tests/MEM_Stream_Test.cpp (handle_close): Handle_close should - only inform it's peer to destroy the mmap file instead of - removing the file itself. - -Wed Apr 4 16:21:13 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/auto_run_tests.lst: - - Added the ImplRepo tests. - -Wed Apr 4 12:13:52 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/MEM_IO.h: Declared ACE_INLINE_FOR_GNUC for - ACE_MT_MEM_IO::Simple_Queue's constructor to eliminate a bogus - warning reported by vxworks' gcc compiler. - -Wed Apr 04 07:47:48 2001 Craig Rodrigues <crodrigu@bbn.com> - - * etc/ace_qos.doxygen: - * bin/generate_doxygen.pl: - Generate doxygen documentation for ACE QoS API - -Tue Apr 03 19:55:26 2001 Steve Huston <shuston@riverace.com> - - * bin/auto_compile: Added a -make_type option - the argument to - the option is the suffix of Makefile to use. Example: - -make_type vac would use Makefile.vac instead of Makefile - when building. - - * bin/make_pretty.pl: Corrected tests for AIX errors/warnings. - - * ace/ace.icp: (new) Visual Age C++ 5 project file for libACE. - - * ace/ace.icc: (new) Visual Age C++ 5 configuration file for - libACE. Replaces ace-dll.icc. It will eventually have the - stuff added to make debug/optimize as well as subsets. - - * ace/ace_vacpp_options.icc: Visual Age C++ file for setting ACE - build options. - - * ace/Makefile.vac: Makefile to build libACE using the Visual - Age C++ 5 incremental compiler. It only has "all" and "realclean" - targets, and uses vacbld_r to do the build. - - * tests/tests.icp: Visual Age C++ 5 Project file for making all the - tests. - - * tests/Makefile.vac: Makefile to drive vacbld_r for Visual Age C++. - - * tests/Config_Test.icc: - * tests/Dirent_Test.icc: - * tests/Logging_Strategy_Test.icc: - * tests/MEM_Stream_Test.icc: - * tests/Message_Queue_Test_Ex.icc: - * tests/OS_Test.icc: - New files for building tests with Visual Age C++. - - * tests/libDLL_Test.icc: Changed to use up-to-date source file. - -Tue Apr 03 13:45:02 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/MEM_IO.cpp: Fixed mismatched ACE_TRACE messages. Thanks to - the all mighty fuzzmasterd for reporting this. - -Tue Apr 3 11:40:42 2001 Priyanka Gontla <pgontla@ece.uci.edu> - - * examples/IPC_SAP/SSL_SAP/dummy.pem: - * examples/IPC_SAP/SSL_SAP/key.pem: - The previous certificates expired. So, generated them - again. - -Tue Apr 03 09:30:10 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/MEM_IO.cpp (write): Fixed a compilation error for Borland - compiler. Thanks to Johnny Willensen for reporting this. - -Mon Apr 02 23:41:34 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/MEM_SAP.cpp: - * ace/MEM_SAP.h: - * ace/MEM_SAP.i: - Generalized the ACE_MEM_SAP class to allocate memory in the new - memory wrapper class ACE_MEM_SAP_Node. - - * ace/MEM_IO.cpp: - * ace/MEM_IO.h: - * ace/MEM_IO.i: - Separated the different signaling mechanisms into a different - class in ACE_MEM_IO so it can determine the "right" signaling - strategy allowed. Currently, we implement the Reactive strategy - (ACE_Reactive_MEM_IO) which uses sockets for signaling and - multithreaded strategy (ACE_MT_MEM_IO) which uses semaphores for - signaling. - - * ace/MEM_Stream.cpp: - Sending an empty buffer over to wake up the "other" end when we - are closing down. - - * ace/MEM_Acceptor.cpp: - * ace/MEM_Acceptor.h: - * ace/MEM_Acceptor.i: - * ace/MEM_Connector.cpp: - * ace/MEM_Connector.h: - * ace/MEM_Connector.i: Added facility to specify the "preferred" - signaling strategy so the acceptor and connector can negociate - and agree on the best signaling mechanism to use. - - * ace/MEM_Stream_Test.h: - * ace/MEM_Stream_Test.cpp: - Added the test for the new MT signaling MEM_Stream transfer. - This part of the test seems to be failing on system that depends - on SysV semaphores (because we need more semaphore than the - system can provide.) - -Mon Apr 2 15:17:13 2001 Chad Elliott <elliott_c@ociweb.com> - - * ace/config-chorus.h: - - Chorus 4.x supports unsigned long long's. - -Mon Apr 2 14:23:31 2001 Craig Rodrigues <crodrigu@bbn.com> - - * ace/Makefile: - only build QoS directory under UNIX if rapi is installed - * ace/QoS/README: - add installation instructions and GQOS/RAPI information - -Mon Apr 2 09:57:31 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/PerlACE/MSProject.pm: - - Made a change to the tao_idl depencency checking. - It was only checking for tao_idl and $(InputName) where - some places we use $(InputPath) instead. - - * ace/config-win32-msvc-5.h: - * ace/config-win32-msvc-6.h: - - Disabled the Inheritance by Dominance informational - warning that MSVC gives. We have cases of this all over - the place, and normally we just disable the warning on - a file by file basis, but now we just do a blanket disable. - -Mon Apr 2 08:45:24 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/nightlybuilds/builds.lst: - Renamed the Debian_Full_WU build, its most important feature is - not that it is at WashU nor that it enables most components. It - is the fact that interceptors are disabled on its configuration. - -Sun Apr 1 17:20:22 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/INET_Addr.h: - - Added /**/ around for the inclusion of inetLib.h, since some - MS compilers pick this up in dependency generation. - - * bin/PerlACE/MSProject.pm: - - Used \Q\E around the library names when matching, otherwise - the backslashes were interpreted as escaping, and weird - unicode errors popped up. - - * bin/pippen.pl: - - Pippen was being case sensitive, so tao.lib was different - than TAO.lib. Changes to store only lowercase. - -Sat Mar 31 10:16:01 2001 Carlos O'Ryan <coryan@uci.edu> - - * ACE-INSTALL.html: - Removed broken link, the web page does not exist anymore. Thanks - to John R. Ashmun <john.ashmun@esca.com> for pointing this out. - This fixes [BUGID:833] - -Fri Mar 30 14:08:18 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * performance-tests/TTCP/C/new-ttcp.cpp: - * performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp: - Zapped the gettimeofday() method since it didn't seem to be - used. Also, #include "ace/Log_Msg.h". Thanks to Thomas Groth - <groth.th@nord-com.net> for reporting this. - - * ace/OS.h: Changed all the ACE_DEFAULT_* default ports of the - various services to start with 200xx rather than 100xx to avoid - conflicts on AIX, which apparently hijacks port 10002 for - various things. Thanks to David Sperry - <sperryd@res.raytheon.com> for reporting this. - -Sat Mar 31 02:06:09 2001 Christopher Kohlhoff <chris@kohlhoff.com> - - * ace/config-win32-borland.h: - * include/makeinclude/ace_flags.bor: - Fixed up use of inline functions in DEBUG build. - - * include/makeinclude/ace_flags.bor: - Added macros for the TAO_BiDirGIOP and TAO_TypeCodeFactory - libraries. - -Fri Mar 30 11:17:39 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/fuzz.pl: - Add a couple of TODO entries - - * html/index.html: - Add the Audio/Video Streaming service to the index file. - -Fri Mar 30 11:12:53 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/*/Makefile: - * apps/*/Makefile: - * docs/*/Makefile: - * examples/*/Makefile: - * netsvcs/*/Makefile: - * performance-tests/*/Makefile: - * tests/*/Makefile: - * websvcs/*/Makefile: - * ASNMP/*/Makefile: - Regenerate dependencies. - -Fri Mar 30 08:15:26 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/QoS/QoS_Session.h: - Add #include for ACE_QoS_Export - -Fri Mar 30 07:31:54 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/QoS/QoS_Session.h: - Fixed export macro - -Thu Mar 29 20:14:00 2001 Craig Rodrigues <crodrigu@bbn.com> - - * ace/SOCK.h: - Remove include of QoS_Session.h, since it is not used here. - -Thu Mar 29 19:48:00 2001 Craig Rodrigues <crodrigu@bbn.com> - - * ace/QoS_Session.h: - * ace/QoS/QoS_Manager.h: - * ace/QoS/QoS_Session_Impl.h: - * ace/QoS/QoS_Session_Factory.h: - * examples/QOS/QoS_Signal_Handler.h: - * examples/QOS/Receiver_QoS_Event_Handler.h: - * examples/QOS/client.cpp: - * examples/QOS/QoS_Util.h: - * examples/QOS/Sender_QoS_Event_Handler.h: - * examples/QOS/server.cpp: - * examples/QOS/Makefile: - - Move QoS_Session.h to the ace/QoS directory. - -Thu Mar 29 19:12:38 2001 Steve Huston <shuston@riverace.com> - - * include/makeinclude/rules.lib.GNU: AIX-specific changes to - build shared libraries by making a shared shr.o file and putting - that into an archive. Seems weird, but that's the way AIX does - things. This makes ACE consistent with other AIX software. - - * include/makeinclude/platform_aix4_cset++.GNU: Made some changes - to attempt to work with the new scheme for shared lib creation on - AIX. Did not test it, and don't plan to. The CSet++ compiler is not - supported by IBM any longer, and Riverace is not supporting ACE - with it. If someone out there sends patches for this, I'll put - them in, but this file is going away after ACE 5.2 is released. - All uses of IBM-supported compilers (IBM C/C++ and Visual Age C++ - in batch mode) should be with the platform_aix_ibm.GNU file. - -Thu Mar 29 16:16:07 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/Token.cpp (renew): A conditional expression used an && rather - and ||, which was causing problems with ACE_Token. Thanks to - Carsten Madsen <com@navicon.dk> for reporting this. - - * ace/Message_Queue_T.cpp: If any of the various ACE_Message_Queue_Ex - enqueue*() methods fail then make sure to release the message - blocks! Thanks to Boris Kolpackov <bosk@ipmce.ru> for reporting - this. - -Wed Mar 28 21:39:26 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/NT_Service.h: - - Changed the ACE_NT_SERVICE macros to use ACE_TEXT_* API - calls for those that can take in unicode strings. - - * examples/NT_Service/main.cpp: - - Fixed use of ACE_NT_SERVICE to work with ACE_USES_WCHAR. - - * examples/OS/Process/process.cpp: - * examples/Reactor/WFMO_Reactor/test_directory_changes.cpp: - - Changed some Win32 API calls to use ACE_TEXT_* equivalents. - - * ace/ace_wchar.h: - - Added all the ACE_TEXT_* API macros needed above. - - Thanks to Nick Pratt <npratt@microstrategy.com> for - reporting the first of these errors. - -Wed Mar 28 22:07:03 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * tests/tests.dsw: Fixed project dependencies between DLL_Test and - DLL_Test_Impl. Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> - for reporting this. - -Wed Mar 28 20:33:28 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/ACE.cpp: Further improved the implementation of - handle_ready() by simply calling poll() with the timeout - pointer. Thanks to Przemyslaw Marciniak <pmarciniak@lucent.com> - for reporting this. - -Wed Mar 28 17:45:22 2001 Steve Huston <shuston@riverace.com> - - * bin/make_pretty.pl: Adjust the error detector for IBM C/C++ 3.6.6. - - * ace/Containers_T.cpp: Add #include "ace/Log_Msg.h" so IBM C/C++ - can see ACE_DEBUG when compiling template instantiations. - -Wed Mar 28 16:40:24 2001 Luther Baker <luther@cs.wustl.edu> - - * ace/config-all.h - - Removed ACE_WIN32 support for ACE_HAS_POSIX_SEM just because - ACE_HAS_PACE. This can be defined for ACE_WIN32 after we - write more WIN32 emulation. - - * ace/OS.h - * ace/OS.i - * ace/OS.cpp - - PACE updates. - -Wed Mar 28 11:37:09 2001 Fuzz Master D <brunsch@uci.edu> - - * bin/fuzz.pl: - - There are several instances where fuzz gives false - positives, and the code is impossible to fix without - creating compiler warnings. Example: - - void function (CORBA::Environment &ACE_TRY_ENV) - { - #if FOO - some_other_function (ACE_TRY_ENV); - ACE_CHECK; - #else - ACE_UNUSED_ARG (ACE_TRY_ENV); - #endif - } - - So normally ACE_UNUSED_ARG errors can be fixed by keeping - the CORBA::ENvironment unnamed and removing the ACE_UNUSED_ARG, - but in this case it isn't possible. So fuzz now accepts - an ignore command for single line use. The above can be fixed - by changing to: - - void function (CORBA::Environment &ACE_TRY_ENV) - { - #if FOO - some_other_function (ACE_TRY_ENV); - ACE_CHECK; - #else - ACE_UNUSED_ARG (ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check - #endif - } - -Tue Mar 28 13:03:07 2001 Chad Elliott <elliott_c@ociweb.com> - - * bin/make_pretty.pl: - Modification to recognize HP's future errors as warnings. - -Wed Mar 28 11:34:54 2001 Frank Hunleth <fhunleth@cs.wustl.edu> - - * ace/CDR_Base.inl: - Removed memset in ACE_CDR::mb_align when ACE_HAS_PURIFY == - 1, since it was causing some TAO unit tests to break (in - particular, the Portable_Interceptors/Service_Context_Manipulation - test). After running Cubit and a few other tests, Purify didn't - notice any more uninitialized memory accesses. Fixes bug #828. - -Wed Mar 28 11:55:39 2001 Steve Huston <shuston@riverace.com> - - * include/makeinclude/platform_aix_ibm.GNU: New file, replaces - platform_aix_vacpp.GNU for Visual Age C++ 5. Also replaces - use of platform_aix4_cset++.GNU for IBM C/C++ Compilers 3.6.6. - So, for the supported, IBM-supplied compilers (IBM C/C++ 3.6.6 - and Visual Age C++ 5) use this file. If you want to try to keep - using CSet++ 3.4 or earlier, you can keep using - platform_aix4_cset++.GNU, but it's not tested any longer and - will disappear at the next ACE version. If you want to use - Visual Age C++ 4, you should reconsider, and upgrade to version 5. - - * include/makeinclude/platform_aix_vacpp.GNU: Deleted. - - * netsvcs/lib/TS_Clerk_Handler.h: Moved #include "ace/Connector.h" - to be after #include "ace/SOCK_Connector.h" to fix compile error - on AIX, Visual Age C++ 5. - - * ace/config-aix-4.x.h: Clarified comments that this file is for - Visual Age C++ also. Added ACE_DLL_SUFFIX ".a" to match what - is now generated from platform_aix_ibm.GNU. - - * bin/auto_compile: - * bin/make_pretty.pl: Add detection of compile/link warnings and - errors for AIX using the IBM compilers' code. Ignores the multiply - defined symbol warnings from ld if it's an ACE symbol. - - * docs/ACE-development-process.html: Changed to link to Bugzilla so - it works from anywhere. - -Wed Mar 28 10:13:16 2001 Steve Huston <shuston@riverace.com> - - * ace/Makefile.bor: Don't try to build the SSL directory if - SSL_ROOT is not set. - -Wed Mar 28 08:39:26 2001 Carlos O'Ryan <coryan@uci.edu> - - * etc/tao_av.doxygen: - New configuration file for the AV streaming service. Many - thanks to Craig Rodrigues <crodrigu@bbn.com> for converting that - directory. - - * bin/generate_doxygen.pl: - Add the new configuration file. - -Tue Mar 27 19:54:11 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - Disable POA/On_Demand_Loading and POA/Loader for Linux/KCC - builds, because that compiler has problems with destructors - after dynamic loading. - Also add the new Hello test to the nightly regression tests. - -Tue Mar 27 19:43:39 2001 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/platform_linux.GNU: - Add support for Insure++ - - * include/makeinclude/rules.local.GNU: - Add new macro to let developers change the default destination - for the dependencies. - - * include/makeinclude/wrapper_macros.GNU: - Let the user override the default VDIR directory, and define the - default values for the IDL generated code extensions. - - Thanks to Jody Hagins <jody@atdesk.com> for all these - improvements. - -Tue Mar 27 19:15:36 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Unbounded_Queue.h: - Add required #include for Chorus builds. - -Tue Mar 27 15:28:56 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * ace/ACE.cpp (handle_ready): Don't try to dereference through - a NULL timeout pointer! Thanks to Przemyslaw Marciniak - <pmarciniak@lucent.com> for reporting this. - -Tue Mar 27 10:08:44 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Select_Reactor_Base.h: - Add missing #include for builds that define - ACE_HAS_REACTOR_NOTIFICATION_QUEUE. - -Tue Mar 27 05:35:38 2001 Christopher Kohlhoff <chris@kohlhoff.com> - - * include/makeinclude/make_flags.bor: - Prevent PASCAL build by default with BCB5 since it is not required. - Since both VCL and non-VCL applications share a common run-time - library you can simply link your VCL code with a non-PASCAL build - of the ACE+TAO libraries. This behaviour can be overridden by - defining the FORCE_PASCAL flag. - - * include/makeinclude/build_core_exe.bor: - * include/makeinclude/build_core_library.bor: - * include/makeinclude/build_dll.bor: - * include/makeinclude/build_exe.bor: - * include/makeinclude/build_lib.bor: - * include/makeinclude/clean.bor: - Build all executables into a directory below the source directory. - Core executables are then copied to the common bin directory. This - is to allow the test scripts to assume all executables can be - found relative to the source directory. - - * include/makeinclude/recurse.bor: - Removed definition of OBJFILES since Borland make doesn't seem to - support recursive macro expansion. - - * ace/config-win32-borland.h: - * include/makeinclude/ace_flags.bor: - Always explicitly define __ACE_INLINE__, with it defaulting to 1. - This change will allow the same compiler flags to be used in user - applications regardless of whether a debug or non-debug build of - ACE is being used. - -Tue Mar 27 09:48:33 2001 Johnny Willemsen <jwillemsen@remedy.nl> - - * include/makeinclude/ace_flags.bor - Corrected the smartproxies_cflags - - * examples/IPC_SAP - Added new BCB makefiles for these examples - - * ace/Timer_Hash_T.cpp - * ace/Timer_Hash_T.h - * ace/Timer_Heap_T.cpp - * ace/Timer_Heap_T.h - * ace/Timer_List_T.cpp - * ace/Timer_List_T.h - * ace/Timer_Wheel_T.cpp - * ace/Timer_Wheel_T.h - Made the isdone method on the iterator classes constant - - * ace/Timer_Queue_T.h - * ace/Timer_Queue_T.i - Several get methods are now const - Argument of set_timer_value and set_interval is now passed by const reference - - * ace/Unbounded_Set.h - * ace/Unbounded_Set.cpp - * tests/Collection_Test.cpp - Added the ACE_Unbounded_Set_Const_Iterator which can be used - to iterate over an const set - -Mon Mar 26 21:02:24 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/Log_Msg_NT_Event_Log.cpp: - - Fixed a compilation problem with RegSetValueEx when - ACE_USES_WCHAR and UNICODE were defined. Thanks to Nick - Pratt <npratt@microstrategy.com> for reporting this. - - * ace/ace_dll.dsp: - - Unchecked the "separate types" option for debug linking. - Thanks to Nick Pratt for this suggestion also. - -Mon Mar 26 13:00:37 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Node.h: - * ace/Node.cpp: - * ace/Array_Base.h: - * ace/Array_Base.inl: - * ace/Array_Base.cpp: - * ace/Unbounded_Queue.h: - * ace/Unbounded_Queue.inl: - * ace/Unbounded_Queue.cpp: - * ace/Unbounded_Set.h: - * ace/Unbounded_Set.inl: - * ace/Unbounded_Set.cpp: - * ace/Containers_T.h: - * ace/Containers_T.i: - * ace/Containers_T.cpp: - Move several containers to their own file. This reduces the - amount of code that needs to be parsed, improving compilation - time (not to mention the fact that the code becomes more - readable.) - For backwards compatibility the Containers file still includes - the new smaller files. - - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - Add new files to the install rules. - Since they are templates they do not need to be compiled on MSVC - so no changes to the project files are required. - - * ace/ARGV.h: - * ace/ARGV.cpp: - * ace/Future.h: - * ace/Handle_Gobbler.h: - * ace/Local_Name_Space.h: - * ace/Malloc_Base.h: - * ace/Memory_Pool.h: - * ace/Name_Space.h: - * ace/Priority_Reactor.h: - * ace/Remote_Name_Space.h: - * ace/Service_Config.h: - * ace/Signal.cpp: - * ace/Signal.h: - * ace/Stats.h: - * ace/Thread_Manager.h: - * ace/Timeprobe_T.h: - * ace/Timer_Heap_T.h: - * ace/Timer_Queue_Adapters.h: - * ace/TkReactor.cpp: - To reduce compilation and recompilation times we only include - the header file that includes the container used in each case, - instead of the full containers class. - -Fri Mar 23 12:40:34 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp: Make sure - to delete the Consumer_Dispatch_Set * that we get back from - unbind(). Thanks to the ever vigilant Mike Winter - <mwinter@sonic.net> for reporting this. - -Thu Mar 22 10:18:24 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/SString.h: Make the various data members protected - rather than private so subclasses can access them. Thanks to - Martin Krumpolec <krumpo@pobox.sk> for this suggestion. - - * tests/README: Clarified some things about the tests. - Thanks to Eric Desamore <Eric.Desamore@idtv.bull.net> for - motivating this. - -Mon Mar 26 11:03:22 2001 Balachandran <bala@cs.wustl.edu> - - * ACE version 5.1.14 released. - -Sat Mar 24 07:02:35 2001 Chris Cleeland <cleeland_c@ociweb.com> - - * ace/INET_Addr.i (get_host_addr): Added a const_cast to the - VxWorks-only arm that casts away const on the this ptr so that - inet_ntoa_b can access and fill in the buffer data member that's - used to hold the result from inet_ntoa_b. Thanks to Erik Johannes - <ejohannes@oresis.com> for point this out. - -Fri Mar 23 18:01:05 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * bin/auto_run_tests.lst: Some of the tests cannot be run in - Single threaded configurations. Prevented such tests from - running in the nightly builds. - -Fri Mar 23 16:25:18 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/New_Fail_Test.cpp: Reverted the change from "Fri Mar 23 - 06:34:33 2001 Balachandran Natarajan <bala@cs.wustl.edu>". The - change fails to comipile when exceptions are on. - -Fri Mar 23 08:47:29 2001 Carlos O'Ryan <coryan@uci.edu> - - * apps/Gateway/Gateway/Options.cpp: - Explicitly #include Log_Msg.h, on platforms that do not define - ACE_TEMPLATES_REQUIRE_SOURCE the header file is not implicitly - included. This should fix compilation problems on Tru64/CXX and - SunCC/4.2 - -Fri Mar 23 06:34:33 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/New_Fail_Test.cpp: Fixed a stupid warning in g++, - No_AMI_Messaging builds. Surprising that it showed up only in - this build. - -Thu Mar 22 21:33:37 2001 Chris Cleeland <cleeland_c@ociweb.com> - - * ace/INET_Addr.h: VxWorks' inet_ntoa doesn't behave like most - others, and our use was causing memory leaks. VxWorks prefers - that you use its own inet_ntoa_b, which takes the buffer to fill - as an argument. Thus, for VxWorks, added a data member char buf - of the appropriate length so that get_host_addr can use - inet_ntoa_b to fill that in. - - * ace/INET_Addr.i (get_host_addr): For VxWorks only, changed this - to use the preferred inet_ntoa_b. This eliminate memory leaks - under VxWorks. Thanks to Erik Johannes <ejohannes@oresis.com> for - the suggested fix. - -Wed Mar 21 19:20:02 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * apps/Gateway/Peer/Peer.cpp (nonblk_put): Fixed a compile error - in g++. - -Wed Mar 21 17:28:26 2001 Steve Huston <shuston@riverace.com> - - * ace/Message_Queue.h: - * ace/Message_Queue_T.h: Moved definition of typedef for - ACE_DEFAULT_MESSAGE_QUEUE_TYPE from Message_Queue.h to - Message_Queue_T.h, just after defining ACE_Message_Queue<>. - Fixes the case where Message_Queue_T.h is included first, - it includes Message_Queue.h before ACE_Message_Queue<> is - defined, and that breaks the compile. IBM C/C++ hit this. - -Wed Mar 21 16:42:19 2001 Steve Huston <shuston@riverace.com> - - * bin/auto_compile: Added an option: -notao to ignore the TAO aspects - of the non-configurable things, like looking at the TAO/ChangeLog. - Also, now looks for auto_run_tests.lst in the $BUILD/bin directory, - not the $MODULE/bin directory - this allows some builds to specify - their own lists. - -Wed Mar 21 16:00:56 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - The followings are contributions from Scott Snyder - <snyder@fnal.gov> to make ACE happy on Digital UNIX with KCC - 3.4d. - - * include/makeinclude/platform_tru64_kcc.GNU: - * include/makeinclude/platform_osf1_4.0_kcc.GNU: Added KCCOPTS and - support for tru64 unix. - - * ace/OS.h: On this platform, we ran into problems with sigwait - being a macro. The fix that had been added for this was keyed - on __DECCXX_VER, so it isn't picked up on this platform. - - * ace/Sock_Connect.cpp: Enum_Interface_Test failed on this - platform. The code in Socket_Connect.cpp that implements this - is conditional on `__unix' being defined. However, with this - compiler, we get `unix' and `__unix__' defined, but not - `__unix'. Fixed by testing for `__unix__' too. - - * ace/ACE.cpp: Cache_Conn_Test was failing. It looks like the - code in ACE::out_of_handles doesn't have a case to handle osf1. - -Wed Mar 21 12:08:35 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - The followings are contributions from Scott Snyder - <snyder@fnal.gov> to make ACE happy on IRIX 6.x with KCC 3.4d. - - * include/makeinclude/platform_irix6.x_kcc.GNU: - Disable the following warings and separate common options into - $(KCCOPTS). - - 280: declaration of a member with the same name as its class Get - this from <netinet/in.h>. - - 608: this pragma must immediately precede a declaration or - statement Get this from <ucontext.h>. - - * ace/OS.h: Changed to only request RTLD_GROUP and RTLD_NODELETE - if they are actually available. - - * ace/config-irix6.x-kcc.h: Undefined - ACE_LACKS_PLACEMENT_OPERATOR_DELETE since KCC actually supports it. - - Config_Test was failing because with the default setup, ace - tries to locate the shared memory pool at 0x04000000. But it - turns out that this is the same address at which irix likes to - load the KCC shared library, libKCC.so. So the memory pool ends - up blowing away all the library code. Fixed by shifting the - default base address to 0x05000000 for this configuration. - - OS_Test was failing because on irix, kcc 4.0d miscompiles - memchr_emulation if +K3 optimization is used. I worked around - this by just using the library version of memchr instead: - - * ace/ACE.cpp: Cached_Conn_Test was failing because the code in - ACE::out_of_handles doesn't have a case to handle irix. - - * tests/DLL_Test.cpp: It died trying to run object dtors. Fixed by - turning off the close-on-destruction flag for this test. - -Wed Mar 21 13:33:58 2001 Ossama Othman <ossama@uci.edu> - - * examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp: - - Patched this file so that the example actually works. It now - correctly interacts with the SSL client in this example. Thanks - to Defang Zhou <dzhou@inktomi.com> for contributing the - patch/changes necessary to make it work. - -Wed Mar 21 07:23:15 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * tests/SOCK_Connector_Test.cpp (find_another_host): Make the - test a bit more resilent against errors with gethostbyname(). - Thanks to Lu Yunhai <luyunhai@huawei.com> for this fix. - -Tue Mar 20 17:31:21 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/run_test.lst: - The Logging_Strategy_Test dynamically loads the Logger service - (from netsvcs), therefore it does not work on static builds. - -Tue Mar 20 18:17:24 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/OS.i: Fixed the USYNC_PROCESS arm of CreateMutex() in - ACE_OS::mutex_init() so that it calls - ACE_OS::set_errno_to_last_error(). Thanks to Ram Ben-Yakir - <Ram@bandwiz.com> for reporting this. - -Tue Mar 20 01:33:24 2001 Ossama Othman <ossama@uci.edu> - - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - * ace/SSL/SSL_SOCK_Connector.cpp (ssl_connect): - * ace/SSL/SSL_SOCK_Stream.i (send, close): - - Wrap the underlying OpenSSL calls in a do-while(SSL_pending()) - loop. I decided to wrap the SSL_write() calls just in case. - This should fix the last of the non-blocking IO issues in ACE's - SSL wrappers. [Bug 393] - -Tue Mar 20 00:40:43 2001 Ossama Othman <ossama@uci.edu> - - * ace/SSL/SSL_SOCK_Stream.i (recv): - - Fixed non-blocking IO support for this method. It was necessary - to ensure that a full SSL record was read before returning - control to the caller. Note that the send() method doesn't need - modification since OpenSSL always writes a full record before - returning. [Bug 393] - -Mon Mar 19 19:53:34 2001 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/ace_flags.bor: - Define macros for the RT Event Service test library - -Mon Mar 19 16:57:43 2001 Irfan Pyarali <irfan@cs.wustl.edu> - - * ace/TP_Reactor.cpp (handle_events): Return value from - handle_events() after the Reactor has been deactivated should be - -1. We just need to remember that as illustrated in - ACE_Reactor::run_reactor_event_loop(), this is not an error: - - if (result == -1 && this->implementation_->deactivated ()) - return 0; - - * tests/Thread_Pool_Reactor_Test.cpp (svr_worker): Changed this - function to call ACE_Reactor::run_reactor_event_loop() instead - of ACE_Reactor::handle_events(). In the previous revision, we - were not handling return values from - ACE_Reactor::handle_events() correctly when - ACE_Reactor::deactivated() had been called. - -Mon Mar 19 09:14:12 2001 Chad Elliott <elliott_c@ociweb.com> - - * include/makeinclude/platform_chorus4.x_g++.GNU: - - Added an output option to the link command. Linking would fail - in cases where the output was specified in another directory. - -Sun Mar 18 22:12:16 2001 Ossama Othman <ossama@uci.edu> - - * ace/SSL/SSL_SOCK_Stream.i (close): - - Commented out debugging output that was inadvertently committed - to the repository. - - Don't bother invalidating the handle. Doing so can potentially - cause some side-effects in the underlying OpenSSL - implementation since setting the handle in the SSL_SOCK_Stream - also causes the OpenSSL SSL_set_fd() function to be called. - - Fixed a socket leak caused by the fact that the handle was - invalidated before the underlying ACE_SOCK_Stream was closed. - -Sun Mar 18 09:46:47 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/New_Fail_Test.cpp: Fixed warnings in g++. - -Sun Mar 18 08:31:34 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * apps/Gateway/Gateway, - * apps/Gateway/Peer: Added a number of fixes to the Gateway and Peer - applications. Thanks to Lu Yunhai <luyunhai@huawei.com> for - contributing these. - -Sun Mar 18 08:31:34 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * examples/IPC_SAP/FILE_SAP/client.cpp (main): Added a couple of - casts so that the arguments passed to printf() will match the - format specifier types. - -Sat Mar 17 18:02:28 2001 Steve Huston <shuston@riverace.com> - - * ace/config-aix-4.x.h: Fixed settings for exceptions and - placement delete to be ok for Visual Age C++ 5. - - * include/makeinclude/platform_aix_vacpp.GNU: Basically new, - works with the Visual Age C++ 5 batch mode build on AIX. - - * include/makeinclude/rules.lib.GNU: Added aix_build piece to - the section for linking a shared library. It uses the linker - to generate a shr.o (shared) file, then inserts that into - the library that's being built. This new section is only - used with platform_aix_vacpp.GNU at this point. - -Fri Mar 16 15:07:23 2001 Ossama Othman <ossama@uci.edu> - - * ace/SSL/SSL_Context.h (set_mode): - - Changed the default mode from SSLv3 to SSLv23, i.e. support - SSLv2 and SSLv3 by default. This fixes interoperability - with applications that use Sun's JSSE, which only supports - SSLv2. Thanks to Max Khon <fjoe@newst.net> for providing the - patch. - -Thu Mar 15 17:47:28 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/Log_Msg_Test.cpp: Changed a ERROR message as a DEBUG - message. If it is an error message the scripts that run the - build gets confused. - -Thu Mar 15 17:42:54 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/Logging_Strategy_Test.cpp: Changed the "-s" option in the - test to write the output in to the output generated in the "log" - directory. This is just a hack to make the scoreboard clean. - -Thu Mar 15 15:55:37 2001 Steve Huston <shuston@riverace.com> - - * ace/Message_Queue_T.h: Add #include "ace/Message_Queue.h" so - IBM Visual Age C++ sees ACE_Message_Queue_Base when instantiating - templates. - - * ace/ace-dll.icc: Fixed after being munged in a previous commit. - Also, corrected libACE.a generation and cleanup, and incorporated - fixes from Steve Ige <steve.ige@reuters.com> and Jerry - Odenwelder <jerryo@atl.fundtech.com>. - - * THANKS: Added Steve Ige to the Hall of Fame. - -Thu Mar 15 11:26:35 2001 Ossama Othman <ossama@uci.edu> - - * ace/SSL/SSL_SOCK_Acceptor.i (ACE_SSL_SOCK_Acceptor): - - Make sure the handle is set for the ACE_SSL_SOCK_Acceptor, after - initializing the underlying ACE_SOCK_Acceptor. This ensures - that OpenSSL has the proper handle. Thanks to Greg McCain - <greg.mccain@veritas.com> for suggesting this fix. - - * THANKS: - Added Greg to the hall of the fame. - -Thu Mar 15 05:46:59 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/FILE_Addr.cpp (ACE_FILE_Addr): Make sure to divide the size of - the filename_ by the sizeof (ACE_TCHAR) to handle unicode - correctly. Thanks to the ever vigilant Ivan Murphy for catching - this! - -Wed Mar 14 01:47:10 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * apps/Gateway/Gateway/Makefile: - * apps/Gateway/Peer/Makefile: - * apps/JAWS/server/Makefile: - * apps/gperf/tests/Makefile: - * examples/ASX/CCM_App/Makefile: - * examples/Service_Configurator/IPC-tests/server/Makefile: - * examples/Service_Configurator/Misc/Makefile: - * examples/Timer_Queue/Makefile: - * netsvcs/clients/Naming/Client/Makefile: - * netsvcs/clients/Naming/Dump_Restore/Makefile: Removed - unnecessary 'LIBS += $(ACELIB)'. They were causing link problem - for the latest KCC. compiner. - -Tue Mar 13 20:56:10 2001 Irfan Pyarali <irfan@cs.wustl.edu> - - * ace/WFMO_Reactor.cpp (remove_to_be_added_handler_i): - * ace/WFMO_Reactor.cpp (remove_suspended_handler_i): - * ace/WFMO_Reactor.cpp (remove_handler_i): - - If a user tried to (a) remove a "to be suspended handle" from - either the current info set or the to be added set, the handle - was correctly removed but the "to be suspended handle" count was - not reduced; (b) remove a "to be resumed handle" from the - suspended set, the handle was correctly removed but the "to be - resumed handle" count was not reduced. Since the "to be resumed - handle" and the "to be suspended handle" were not adjusted - properly, the reactor kept waking up thinking that changes were - required. Thanks to Lu Yunhai <luyunhai@huawei.com> for - reporting this problem. - - * examples/Reactor/WFMO_Reactor/test_suspended_removals.cpp: Added - an extensive example for regression testing the above use cases. - -Tue Mar 13 15:23:04 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/Service_Manager.cpp (list_services): Fixed Unicode bugs. - -Tue Mar 13 15:13:48 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * tests/Logging_Strategy_Test.cpp: Fixed Unicode related bugs. - -Tue Mar 13 10:04:06 2001 Carlos O'Ryan <coryan@uci.edu> - - * performance-tests/TCP/run_test.pl: - Fixed the path to the $ACE_ROOT/bin directory, now the script - runs again. - -Tue Mar 13 06:04:03 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Service_Manager.cpp (list_services): Add an indication of whether - a service is active or paused. Thanks to Mike Curtis for this - improvement. - - * ace/Reactor.h: Clarified that the remove_handler (handle, mask) - method also removes the event handle. Thanks to Pierre Fayolle - <fayolle@enseirb.fr> for reporting this. - - * tests/Logging_Strategy_Test.cpp (get_statistic): Replace struct stat - with ACE_stat. Thanks to Johnny Willemsen for reporting this. - -Tue Mar 13 00:35:35 2001 Irfan Pyarali <irfan@cs.wustl.edu> - - * ace/Select_Reactor_T.i (deactivated): Reverted this change - regarding Select_Reactor_T::deactivated(): - - Thu Feb 22 12:28:15 2001 Irfan Pyarali <irfan@cs.wustl.edu> - - Though my change improved correctness of access and change to - the <deactivated_> variable, it had a negative consequence: the - event loop calls Select_Reactor_T::deactivated() before calling - Select_Reactor_T::handle_events() to make sure that the reactor - is not closed yet. Unfortunately, if - Select_Reactor_T::deactivated() has a guard, it will send a null - event waking up the current leader and thus lead to unnecessary - thrashing. For now, I have removed the guard from the - Select_Reactor_T::deactivated() methods. We should revisit this - issue some time again. This fixes bug 816. - -Mon Mar 12 16:30:32 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/Logging_Strategy_Test.cpp (main): Fixed the rest of the - warnings in VxWorks builds. - -Mon Mar 12 16:21:42 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/Logging_Strategy_Test.cpp (main): Fixed a couple of - warnings in VxWorks build. Couple of more warnings are left. - -Mon Mar 12 14:16:03 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/Local_Name_Space_T.cpp (create_manager_i): Fixed a compile - error on Win32 Unicode platforms. - -Mon Mar 12 12:12:36 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ACE-INSTALL.html: Also mentioned Windows 2000 explicitly in the - document. Thanks to Rahul Shukla <rshukla@ggn.aithent.com> for - raising the question. - -Mon Mar 12 00:49:24 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * tests/tests.dsw: - * tests/Logging_Strategy_Test.dsp: Added a new dsp file. - -Sun Mar 11 21:00:16 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_compile: - Print out the config.h and platform_macros.GNU files, this is - useful when debugging builds. - -Sun Mar 11 18:41:08 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * ace/CDR_Stream.h: Updated a comment to clarify that the buffer() - method just returns a pointer to the first block in the chain. - Thanks to Johnny Willemsen for pointing this out. - -Sun Mar 11 17:46:45 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/Local_Name_Space_T.cpp: Fixed a compiler error on Win32 - Unicode platforms. - -Sun Mar 11 17:28:40 2001 Irfan Pyarali <irfan@cs.wustl.edu> - - * ace/QoS/QoS_Session_Impl.cpp (rsvp_callback): <errflags> was unused. - -Sun Mar 11 08:31:05 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * tests/Makefile.bor (NAMES): Added Logging_Strategy_Test. - -Sun Mar 11 07:32:18 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/Logging_Strategy_Test.cpp (order): Fixed a warning in g++ - builds. - -Sat Mar 10 23:15:10 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - Fixed name of Crashed_Callback test - -Sat Mar 10 19:28:30 PST 2001 Mayur Deshpande <mayur@ics.uci.edu> - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - Fixes to enable debugging on QNX without ACE crashing. - Thanks to Andy Olson for the suggestions. - -Sat Mar 10 19:05:38 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/config-win32.h: - - Include config-win32-common.h even on Windows CE. - - * ace/config-win32-msvc-6.h: - - If ACE_ENDTHREADEX is already defined, don't define it. - - * ace/OS_Dirent.h: - - Changed the use of ACE_WINCE to ACE_HAS_WINCE. - - * ace/Service_Manager.cpp: - - Fixed a couple of ACE_TCHAR/ACE_LIB_TEXT problems. - - * ace/ace_wchar.h: - - On Windows CE, #include wtypes.h. - - * ace/ace_dll.vcp: - * ace/ace_os_dll.vcp: - - Redid the output files and directories. Now intermediate - files go into Release/PLATFORM and Debug/PLATFORM (where - PLATFORM = MIPS/ARM/X86EM/SH3/SH4). The *.lib files go - into ../Lib/PLATFORM and the *.dll into ../bin/PLATFORM. - Also, the DLL's were renamed from ace_dll.dll and - ace_os_dll.dll to ace[d].dll and ace_os[d].dll. - - * bin/pippen.pl: - - Changed the environment variables from DEFAULT_COMPILER and - DEFAULT_CONFIGS to PIPPEN_COMPILER and PIPPEN_CONFIGS. Also - used \Q\E for the configs because some of the Windows CE - configs confused the script because they use parentheses. - -Sat Mar 10 16:59:51 2001 Carlos O'Ryan <coryan@uci.edu> - - * ACE-INSTALL.html: - Remove references to the now obsolete config-linux-lxpthreads.h - and platform_linux_lxpthread.GNU - -Sat Mar 10 16:38:22 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/run_test.lst: - Running the Recursive_Mutex_Test on single-threaded builds makes - very little sense. - -Sat Mar 10 16:35:19 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - Add new tests: Muxing, Crashed_Callback, Client_Leaks and - Server_Leaks to the nightly runs. - -Sat Mar 10 17:55:53 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * include/makeinclude: Zapped the platform_linux_pthread.GNU, - platform_linux_lxpthread.GNU, and platform_linux_lxpthreads.GNU - files since they are confusing and shouldn't not be used in - favor of platform_linux.GNU. - - * ace: Zapped the config-linux.pthread.h and config-linux-lxpthreads.h - file since they are confusing and shouldn't not be used in favor - of config-linux.h. Thanks to Craig Rodrigues for this - suggestion. - -Sat Mar 10 12:39:16 2001 Craig Rodrigues <crodrigu@bbn.com> - - * ace/Reactor.h: - * ace/WFMO_Reactor.h: - * ace/Select_Reactor_T.h: - * ace/Reactor_Impl.h: - Cleaned up comment for schedule_timer() - -Sat Mar 10 07:05:16 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * tests: Added Logging_Strategy_Test.cpp. Thanks to Orlando - Ribeiro <oribeiro@inescporto.pt> for contributing this. - - * tests/Makefile (BIN): Added Logging_Strategy_Test. - - * tests/run_test.lst: Added Log_Msg_Test and - the new Logging_Strategy_Test. - - * tests/Log_Msg_Test.cpp: Added ACE_TEXT macros to all the ACE_DEBUG and - ACE_ERROR calls. - - * ace/Service_Manager.{h,cpp}: Refactored the request processing - code so that it's in a single place. Also, added support to - enable remote reconfiguration. Thanks to Mike Curtis - <mccurry@my-deja.com> for contributing this. - - * ace/Logging_Strategy.cpp (parse_args): Fixed a mistaken - re-initialization of the thread_priority_mask_ and the - process_priority_mask_. Thanks to Martin Krumpolec - <krumpo@pobox.sk> for reporting this. - - * ace/Local_Name_Space_T.cpp (create_manager_i): Fixed this code so that - it doesn't fail if run on a directory that doesn't support locks - (like some NFS mounts). Thanks to scott snyder - <snyder@fnal.gov> for reporting this. - - * tests/SOCK_Connector_Test.cpp: Split up a loop so that the test - doesn't hang on RedHat Linux 7.0. Thanks to Michael Searles - <msearles@base16.com> for this fix. - -Fri Mar 9 22:39:28 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Svc_Conf.h: - * ace/Service_Config.h: - * ace/Service_Config.cpp: - Add new method to the Service Configurator to add static - services into the repository, this factors out common code used - in the ORB and ACE. In general it fixes the hacks done this - past Feb 20th - -Fri Mar 9 16:47:15 2001 Priyanka Gontla <pgontla@ece.uci.edu> - - * bin/nightlybuilds/builds.lst (LIST): - Added HPUX to the scoreboard. - -Fri Mar 9 14:34:34 2001 Chad Elliott <elliott_c@ociweb.com> - - * PACE/Makefile: - * apps/drwho/Makefile: - * bin/PerlACE/Process_Unix.pm: - * include/makeinclude/platform_chorus4.x_g++.GNU: - - Modifications to make things build and run correctly with - Chorus 4.0.1. - -Thu Mar 8 08:38:01 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - The Single_Threaded_POA test cannot run with minimum CORBA or - (isn't this ironic) on single threaded configurations. - -Wed Mar 07 20:25:51 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/nightlybuilds/builds.lst: - Add QNX to the configurations in the scoreboard. - -Wed Mar 7 12:41:05 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * ace/Select_Reactor_T.h, - * ace/Reactor_Impl.h, - * ace/WFMO_Reactor.h, - * ace/Reactor.h: Updated the comments to be more accurate. Thanks - to Craig Rodrigues for reporting this. - -Wed Mar 7 08:57:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/Asynch_IO.h: - Changed use of ACE_UNIMPLEMENTED_FUNC to just defining the - assignment operators outright. The point here is to just - provide any implementation, since the default one is flagged as - causing infinite recursion. - - Thanks to David Levine for pointing out this incorrect usage of - the macro. - - * ace/config-win32-msvc-5.h: - * ace/config-win32-msvc-6.h: - - @file comments were mismatched. - - * ace/config-win32.h: - - Changed config-win32-wince.h to config-WinCE.h. - - * ace/ace_wchar.h: - * ace/Log_Msg_NT_Event_Log.cpp: - - Changed several system calls to ACE_TEXT_* (and needed to - add some to ace_wchar.h) since they need the ACE_TEXT - treatment. - -Wed Mar 7 08:20:01 2001 Chad Elliott <elliott_c@ociweb.com> - - * ace/ARGV.cpp: - - Removed a warning about possible use of uninitialized variable. - - * bin/ace_ld: - - Added new functionality to filter out the harmless symbol size - change warnings for VxWorks 5.4. - - * examples/Shared_Malloc/test_multiple_mallocs.cpp: - * examples/Shared_Malloc/test_persistence.cpp: - * examples/Shared_Malloc/test_position_independent_malloc.cpp: - - Renamed the typedef MALLOC to TEST_MALLOC. A MALLOC macro is - defined by a VxWorks system header. - -Wed Mar 7 06:11:52 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * ace/Asynch_IO.h: Removed the unnecessary/improper ';' at the - end of the line. Thanks to Johnny Willemsen and Chris Kohlhoff - for reporting/fixing this. - - * ace/*_Connector.h: Clarified in the comments that the - ACE_Time_Value *timeout represents the *maximum* amount of time - to wait. If the server is not running, however, connect() can - return much sooner. Thanks to Dipti Jain <dijain@hss.hns.com> - for motivating this. - -Tue Mar 6 14:14:06 2001 Darrell Brunsch <brunsch@uci.edu> - - Here are some fixes for MSVC 7 beta. Note that no project files - are checked in. Right now they will have to be generated from - the MSVC 5/6 files (The devenv.exe will do this automatically). - When MSVC 7 becomes released, we'll probably have to deal with - including their files (even if only for nightly builds). - - * ace/OS.h: - * ace/config-win32-msvc.h: - - Moved the inclusion of the crtdbg.h file to where it is being - used. This is mainly to alleviate some excessive inclusions. - - * ace/config-WinCE.h: - * ace/config-win32.h: - * ace/config-win32-msvc-5.h: (added) - * ace/config-win32-msvc-6.h: (added) - * ace/config-win32-msvc-7.h: (added) - * ace/config-win32-borland.h: - * ace/config-win32-common.h: - * ace/config-win32-ghs.h: - * ace/config-win32-msvc.h: - * ace/config-win32-visualage.h: - - Added a new config-win32-msvc-7.h with some new settings. While - doing this I also rearranged the files a bit. Everything now - goes through config-win32.h (and an error will occur if you - include the others directly). - - * ace/config-hpux-10.x-hpc++.h: - * ace/config-hpux-11.00.h: - * ace/config-win32-msvc-5.h: - * ace/config-win32-msvc-6.h: - * ace/README: - - Removed ACE_HAS_ONE_DEFINITION_RULE. Could not find this - actually used anywhere so I'm assuming it can be safely - removed. - - * ace/Asynch_IO.h: - - Added some dummy assignment operators. It seems that the default - ones produce infinite recursion (at least with MSVC 6 SP5 and - MSVC 7 beta) - - * ace/Future.h: - - Future_Holder needs to be ACE_Export-ed. - -Tue Mar 6 16:58:17 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/ACE.cpp (format_hexdump): The format_hexdump () was missing - a space if the remaining message that needs dumping was less - than 16 bytes. Thansk to Johnny Willemsen" - <johnny.willemsen@meco.nl> for giving this fix. - -Tue Mar 6 11:25:53 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/PerlACE/Process_Unix.pm: - Ignore SIGABRT too, because it is used by abort() and we call - that function to test the ORB under fault conditions. - -Tue Mar 6 12:25:34 2001 Chad Elliott <elliott_c@ociweb.com> - - * configure.in: - - The configure script was broken on major releases (i.e. those with - no beta numbers). A test for an empty string should have double - quotes around the variable. - -Tue Mar 6 10:16:31 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/config-win32-common.h: - Removed old comment about ACE_HAS_WINSOCK2 being related to - ACE_HAS_WINNT4. Thanks to Johnny Willemsen - <jwillemsen@remedy.nl> for pointing this out. - -Tue Mar 6 10:13:03 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/RMCast/RMCast_Fragment_Test.cpp: - * tests/RMCast/RMCast_Membership_Test.cpp: - * tests/RMCast/RMCast_Reassembly_Test.cpp: - * tests/RMCast/RMCast_Reordering_Test.cpp: - * tests/RMCast/RMCast_Retransmission_Test.cpp: - Use ACE_OS::time(0) to initialize the pseudo-random numbers - seed. It is good enough for our purposes, and it works on - platforms without 64-bit integer support. - -Mon Mar 5 13:56:33 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * ace/Synch_T.{h,i}: Further simplified the new ACE_Guard constructor. - Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing - this. - -Mon Mar 5 19:20:45 2001 Fuzz Master D <brunsch@uci.edu> - - * bin/fuzz.pl: - As Ossama pointed out, the ACE_CHECK test was seeing - problems in the tao_idl files since it has uses of ACE_TRY_ENV - inside quotes. Made sure not to detect problems in this case. - -Mon Mar 5 18:58:32 2001 Fuzz Master D <brunsch@uci.edu> - - * bin/fuzz.pl: - Fixed some false positives in the resolve_initial_reference - test and also added an ACE_CHECK test by Carlos's request. - -Mon Mar 5 18:54:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/PerlACE/Process_Unix.pm: - Updated the signal detection to not pay attention to TERM and - KILL. Will print out better output when signals cause a process - to exit during most calls like Kill () or TerminateWaitKill (). - -Mon Mar 5 13:56:33 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * ace/Synch_T.{h,i}: Added a new ACE_Guard constructor that - allows the caller to select whether the guard owns/acquires the - lock or not. Thanks to Chris Kohlhoff <chris@kohlhoff.com> for - contributing this. - - * ace/Synch_T.{h,i}: Added a disown() method that relinquishes - ownership of the lock so that it is not released implicitly in - the destructor. Thanks to Chris Kohlhoff <chris@kohlhoff.com> - for contributing this. - - * ace/Event_Handler.h: Updated the comment on handle_close() so that - it more accurately reflects what is going on. Thanks to Defang - Zhou <dzhou@inktomi.com> for suggesting this. - - * apps/Gateway/Gateway/Concrete_Connection_Handlers.{h,cpp}: Added - handle_close() operations to solve problems with certain - concurrency models. Thanks to Defang Zhou <dzhou@inktomi.com> - for reporting this. - -Mon Mar 5 11:29:36 2001 Carlos O'Ryan <coryan@uci.edu> - - * docs/ACE-categories.html: - Fixed links to the doxygen files. - - * ace/Pipe.cpp: - Fixed what looks like a typo, we want to *disable* the stream - pipes under QNX, not to enable them just on that platform. - -Mon Mar 5 08:20:21 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/RMCast/RMCast_Fragment_Test.cpp: - * tests/RMCast/RMCast_Reassembly_Test.cpp: - Undo Doug's changes. They broke the test. - -Mon Mar 5 07:52:52 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * ace/Log_Record.cpp (priority): Clarified the behavior of the - priority() set/get methods. Thanks to Christian Schuhegger - <Christian.Schuhegger@cern.ch> for reporting this. - - * tests/RMCast/RMCast_Fragment_Test.cpp, - * tests/RMCast/RMCast_Reassembly_Test.cpp, - * tests/Dynamic_Priority_Test.cpp, - * tests/Thread_Pool_Test.cpp: Make sure to write into the - wr_ptr() rather than the rd_ptr(). Thanks to Gonzalo Diethelm - <Gonzalo.Diethelm@sonda.com> for reporting this. - -Mon Mar 5 08:00:23 2001 Chad Elliott <elliott_c@ociweb.com> - - * bin/nightlybuilds/builds.lst: - - Added new VxWorks 5.4 and Chorus 4.0.1 nightly builds. - -Mon Mar 05 00:10:15 2001 Ossama Othman <ossama@uci.edu> - - * bin/fuzz.pl: - - Updated to detect missing ACE_TRY_ENV parameters in - ORB::resolve_initial_references() calls when emulated exceptions - are used. Thanks to Darrell for providing this update. - -Mon Mar 5 07:57:07 2001 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Makefile.bor: - - Added missing Refcounted_Auto_Ptr_Test to the build - -Sun Mar 4 19:31:16 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/auto_run_tests.lst: - - Added the run_test_mt.pl for Leader_Follers. - - * bin/PerlACE/Process_Unix.pm: - * bin/PerlACE/Process_Win32.pm: - - Added a destructor to detect if a process wasn't explicitly - killed before the object went out of scope. Will print out - an error and kill it. - - * bin/PerlACE/Run_Test.pm: - - Turned on autoflush for all scripts. - - * docs/run_test.txt: - - Updated run_test.pl instructions to fit all the changes I - just made. - - * examples/Export/run_test.pl: - * performance-tests/RPC/run_test.pl: - * performance-tests/TCP/run_test.pl: - * performance-tests/UDP/run_test.pl: - - Updated to use PerlACE::Run_Test; - - * tests/Atomic_Op_Test.dsp: - * tests/Auto_IncDec_Test.dsp: - * tests/Barrier_Test.dsp: - * tests/Basic_Types_Test.dsp: - * tests/Buffer_Stream_Test.dsp: - * tests/CDR_Array_Test.dsp: - * tests/CDR_File_Test.dsp: - * tests/CDR_Test.dsp: - * tests/Cache_Map_Manager_Test.dsp: - * tests/Cached_Accept_Conn_Test.dsp: - * tests/Cached_Conn_Test.dsp: - * tests/Capabilities_Test.dsp: - * tests/Collection_Test.dsp: - * tests/Config_Test.dsp: - * tests/Conn_Test.dsp: - * tests/DLL_Test.dsp: - * tests/DLList_Test.dsp: - * tests/Dirent_Test.dsp: - * tests/Dynamic_Priority_Test.dsp: - * tests/Enum_Interfaces_Test.dsp: - * tests/Env_Value_Test.dsp: - * tests/Future_Set_Test.dsp: - * tests/Future_Test.dsp: - * tests/Handle_Set_Test.dsp: - * tests/Hash_Map_Bucket_Iterator_Test.dsp: - * tests/Hash_Map_Manager_Test.dsp: - * tests/High_Res_Timer_Test.dsp: - * tests/IOStream_Test.dsp: - * tests/Lazy_Map_Manager_Test.dsp: - * tests/Log_Msg_Test.dsp: - * tests/MEM_Stream_Test.dsp: - * tests/MM_Shared_Memory_Test.dsp: - * tests/MT_Reactor_Timer_Test.dsp: - * tests/MT_SOCK_Test.dsp: - * tests/Malloc_Test.dsp: - * tests/Map_Manager_Test.dsp: - * tests/Map_Test.dsp: - * tests/Mem_Map_Test.dsp: - * tests/Message_Block_Test.dsp: - * tests/Message_Queue_Notifications_Test.dsp: - * tests/Message_Queue_Test.dsp: - * tests/Message_Queue_Test_Ex.dsp: - * tests/Naming_Test.dsp: - * tests/New_Fail_Test.dsp: - * tests/Notify_Performance_Test.dsp: - * tests/OS_Test.dsp: - * tests/Object_Manager_Test.dsp: - * tests/OrdMultiSet_Test.dsp: - * tests/Pipe_Test.dsp: - * tests/Priority_Buffer_Test.dsp: - * tests/Priority_Reactor_Test.dsp: - * tests/Priority_Task_Test.dsp: - * tests/Process_Manager_Test.dsp: - * tests/Process_Mutex_Test.dsp: - * tests/Process_Strategy_Test.dsp: - * tests/RB_Tree_Test.dsp: - * tests/Reactor_Exceptions_Test.dsp: - * tests/Reactor_Notify_Test.dsp: - * tests/Reactor_Performance_Test.dsp: - * tests/Reactor_Timer_Test.dsp: - * tests/Reactors_Test.dsp: - * tests/Reader_Writer_Test.dsp: - * tests/Recursive_Mutex_Test.dsp: - * tests/Refcounted_Auto_Ptr_Test.dsp: - * tests/Reverse_Lock_Test.dsp: - * tests/SOCK_Connector_Test.dsp: - * tests/SOCK_Send_Recv_Test.dsp: - * tests/SOCK_Test.dsp: - * tests/SPIPE_Test.dsp: - * tests/SString_Test.dsp: - * tests/SV_Shared_Memory_Test.dsp: - * tests/Semaphore_Test.dsp: - * tests/Service_Config_Test.dsp: - * tests/Sigset_Ops_Test.dsp: - * tests/Simple_Message_Block_Test.dsp: - * tests/Svc_Handler_Test.dsp: - * tests/TSS_Test.dsp: - * tests/Task_Test.dsp: - * tests/Thread_Manager_Test.dsp: - * tests/Thread_Mutex_Test.dsp: - * tests/Thread_Pool_Reactor_Test.dsp: - * tests/Thread_Pool_Test.dsp: - * tests/Time_Service_Test.dsp: - * tests/Time_Value_Test.dsp: - * tests/Timeprobe_Test.dsp: - * tests/Timer_Queue_Test.dsp: - * tests/Tokens_Test.dsp: - * tests/UPIPE_SAP_Test.dsp: - * tests/Upgradable_RW_Test.dsp: - * tests/version_tests/Atomic_Op_Test.dsp: (removed) - * tests/version_tests/Auto_IncDec_Test.dsp: (removed) - * tests/version_tests/Barrier_Test.dsp: (removed) - * tests/version_tests/Basic_Types_Test.dsp: (removed) - * tests/version_tests/Buffer_Stream_Test.dsp: (removed) - * tests/version_tests/CDR_Array_Test.dsp: (removed) - * tests/version_tests/CDR_File_Test.dsp: (removed) - * tests/version_tests/CDR_Test.dsp: (removed) - * tests/version_tests/Cache_Map_Manager_Test.dsp: (removed) - * tests/version_tests/Cached_Accept_Conn_Test.dsp: (removed) - * tests/version_tests/Cached_Conn_Test.dsp: (removed) - * tests/version_tests/Capabilities_Test.dsp: (removed) - * tests/version_tests/Collection_Test.dsp: (removed) - * tests/version_tests/Config_Test.dsp: (removed) - * tests/version_tests/Conn_Test.dsp: (removed) - * tests/version_tests/DLL_Test.dsp: (removed) - * tests/version_tests/DLList_Test.dsp: (removed) - * tests/version_tests/Dirent_Test.dsp: (removed) - * tests/version_tests/Dynamic_Priority_Test.dsp: (removed) - * tests/version_tests/Enum_Interfaces_Test.dsp: (removed) - * tests/version_tests/Env_Value_Test.dsp: (removed) - * tests/version_tests/Future_Set_Test.dsp: (removed) - * tests/version_tests/Future_Test.dsp: (removed) - * tests/version_tests/Handle_Set_Test.dsp: (removed) - * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp: (removed) - * tests/version_tests/Hash_Map_Manager_Test.dsp: (removed) - * tests/version_tests/High_Res_Timer_Test.dsp: (removed) - * tests/version_tests/IOStream_Test.dsp: (removed) - * tests/version_tests/Lazy_Map_Manager_Test.dsp: (removed) - * tests/version_tests/Log_Msg_Test.dsp: (removed) - * tests/version_tests/MEM_Stream_Test.dsp: (removed) - * tests/version_tests/MM_Shared_Memory_Test.dsp: (removed) - * tests/version_tests/MT_Reactor_Timer_Test.dsp: (removed) - * tests/version_tests/MT_SOCK_Test.dsp: (removed) - * tests/version_tests/Malloc_Test.dsp: (removed) - * tests/version_tests/Map_Manager_Test.dsp: (removed) - * tests/version_tests/Map_Test.dsp: (removed) - * tests/version_tests/Mem_Map_Test.dsp: (removed) - * tests/version_tests/Message_Block_Test.dsp: (removed) - * tests/version_tests/Message_Queue_Notifications_Test.dsp: (removed) - * tests/version_tests/Message_Queue_Test.dsp: (removed) - * tests/version_tests/Message_Queue_Test_Ex.dsp: (removed) - * tests/version_tests/Naming_Test.dsp: (removed) - * tests/version_tests/New_Fail_Test.dsp: (removed) - * tests/version_tests/Notify_Performance_Test.dsp: (removed) - * tests/version_tests/OS_Test.dsp: (removed) - * tests/version_tests/Object_Manager_Test.dsp: (removed) - * tests/version_tests/OrdMultiSet_Test.dsp: (removed) - * tests/version_tests/Pipe_Test.dsp: (removed) - * tests/version_tests/Priority_Buffer_Test.dsp: (removed) - * tests/version_tests/Priority_Reactor_Test.dsp: (removed) - * tests/version_tests/Priority_Task_Test.dsp: (removed) - * tests/version_tests/Process_Manager_Test.dsp: (removed) - * tests/version_tests/Process_Mutex_Test.dsp: (removed) - * tests/version_tests/Process_Strategy_Test.dsp: (removed) - * tests/version_tests/RB_Tree_Test.dsp: (removed) - * tests/version_tests/Reactor_Exceptions_Test.dsp: (removed) - * tests/version_tests/Reactor_Notify_Test.dsp: (removed) - * tests/version_tests/Reactor_Performance_Test.dsp: (removed) - * tests/version_tests/Reactor_Timer_Test.dsp: (removed) - * tests/version_tests/Reactors_Test.dsp: (removed) - * tests/version_tests/Reader_Writer_Test.dsp: (removed) - * tests/version_tests/Recursive_Mutex_Test.dsp: (removed) - * tests/version_tests/Refcounted_Auto_Ptr_Test.dsp: (removed) - * tests/version_tests/Reverse_Lock_Test.dsp: (removed) - * tests/version_tests/SOCK_Connector_Test.dsp: (removed) - * tests/version_tests/SOCK_Send_Recv_Test.dsp: (removed) - * tests/version_tests/SOCK_Test.dsp: (removed) - * tests/version_tests/SPIPE_Test.dsp: (removed) - * tests/version_tests/SString_Test.dsp: (removed) - * tests/version_tests/SV_Shared_Memory_Test.dsp: (removed) - * tests/version_tests/Semaphore_Test.dsp: (removed) - * tests/version_tests/Service_Config_Test.dsp: (removed) - * tests/version_tests/Sigset_Ops_Test.dsp: (removed) - * tests/version_tests/Simple_Message_Block_Test.dsp: (removed) - * tests/version_tests/Svc_Handler_Test.dsp: (removed) - * tests/version_tests/TSS_Test.dsp: (removed) - * tests/version_tests/Task_Test.dsp: (removed) - * tests/version_tests/Thread_Manager_Test.dsp: (removed) - * tests/version_tests/Thread_Mutex_Test.dsp: (removed) - * tests/version_tests/Thread_Pool_Reactor_Test.dsp: (removed) - * tests/version_tests/Thread_Pool_Test.dsp: (removed) - * tests/version_tests/Time_Service_Test.dsp: (removed) - * tests/version_tests/Time_Value_Test.dsp: (removed) - * tests/version_tests/Timeprobe_Test.dsp: (removed) - * tests/version_tests/Timer_Queue_Test.dsp: (removed) - * tests/version_tests/Tokens_Test.dsp: (removed) - * tests/version_tests/UPIPE_SAP_Test.dsp: (removed) - * tests/version_tests/Upgradable_RW_Test.dsp: (removed) - * tests/version_tests/run_all_tests.bat: (removed) - * tests/version_tests/version_tests.dsw: (removed) - - Moved the version_tests back into the tests/*.dsp files. The - reason they were originally moved is because it was easier to - select all the debug versions during a batch build. But now we - have pippen.pl and msvc_auto_compile.pl, so this is no longer an - issue, while this strange setup would compilicate the nightly - builds. Thus, it was standardized back. - - * bin/create_vt_dsps.pl: (removed) - - No need for this anymore. - -Sun Mar 4 19:27:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/Log_Msg.cpp: - * ace/Log_Msg_NT_Event_Log.h: - * ace/OS.cpp: - - Disabled Log_Msg_NT_Event_Log on Windows CE. - -Sun Mar 04 13:19:35 2001 Carlos O'Ryan <coryan@uci.edu> - - * etc/tao.doxygen: - Add .txt files, so we can add web pages to the basic TAO - documentation. - -Sun Mar 04 10:58:08 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Added Log_Msg_NT_Event_Log.{h,cpp} to NT - project files. - -Sun Mar 4 10:41:57 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * ace/Log_Msg.cpp, - ace/Log_Msg.h, - ace/Logging_Strategy.cpp, - ace/Makefile.bor, - ace/OS.cpp, - ace/OS.h, - ace/OS.i, - ace/ace.rc: Added support for the new NT event logging capability. - Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing this. - - * ace/Log_Msg_NT_Event_Log.cpp - ace/Log_Msg_NT_Event_Log.h - ace/ace_message_table.bin: Added these files to support the new - NT event logging capability. - Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing - this. - -Sun Mar 4 04:46:44 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/nightlybuilds/builds.lst: - - Added new Windows CE nightly build. - -Sun Mar 04 03:12:17 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * bin/generate_export_file.pl: ACE_AS_STATIC_LIBS was incorrectly - typed in as ACE_STATIC_LIBS. - - * ace/svc_export.h: - * ace/RMCast/RMCast_Export.h: - * ace/SSL/SSL_Export.h: - * websvcs/lib/websvcs_export.h: These files didn't check for - ACE_AS_STATIC_LIBS to determine if they should define their - export macros for static build. Thanks to Chris Kohlhoff - <chris@kohlhoff.com> for reporting this. [Bug 813] - -Sat Mar 3 19:07:31 2001 Pradeep Gore <pradeep@cs.wustl.edu> - - * ace/QoS/QoS_Session_Impl.cpp: - * ace/QoS/QoS_Session_Impl.i: - * examples/QOS/Fill_ACE_QoS.cpp: - * examples/QOS/Fill_ACE_QoS.h: - * examples/QOS/Makefile: - * examples/QOS/QoS_Util.cpp: - * examples/QOS/Receiver_QoS_Event_Handler.cpp: - * examples/QOS/Sender_QoS_Event_Handler.cpp: - Fixed various compile warnings when compiling with rapi=1 on - Redhat Linux 6.2 - -Sat Mar 3 16:47:53 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/fuzz.pl: - - Changed the detection pattern a bit to pick up - stuff like: - - void - operator < (...) - - better. - - * ace/Auto_Ptr.i: - * ace/Base_Thread_Adapter.cpp: - * ace/Based_Pointer_T.i: - * ace/Connector.cpp: - * ace/Containers_T.cpp: - * ace/DEV_Addr.i: - * ace/Dynamic.i: - * ace/FILE.cpp: - * ace/Flag_Manip.i: - * ace/Handle_Set.i: - * ace/Hash_Map_Manager_T.cpp: - * ace/Lib_Find.cpp: - * ace/Local_Name_Space_T.cpp: - * ace/Local_Tokens.cpp: - * ace/MEM_Addr.i: - * ace/Malloc.cpp: - * ace/Malloc_Allocator.cpp: - * ace/Malloc_T.cpp: - * ace/Memory_Pool.cpp: - * ace/Message_Block.cpp: - * ace/Message_Block.i: - * ace/Message_Block_T.cpp: - * ace/Message_Queue.i: - * ace/Message_Queue_T.cpp: - * ace/Message_Queue_T.i: - * ace/Naming_Context.cpp: - * ace/OS.cpp: - * ace/OS.i: - * ace/PI_Malloc.cpp: - * ace/POSIX_Asynch_IO.cpp: - * ace/Process_Manager.cpp: - * ace/QtReactor.cpp: - * ace/RB_Tree.i: - * ace/RW_Process_Mutex.cpp: - * ace/Reactor.cpp: - * ace/Remote_Name_Space.cpp: - * ace/Remote_Tokens.cpp: - * ace/SOCK_Dgram.i: - * ace/SString.cpp: - * ace/SUN_Proactor.cpp: - * ace/Select_Reactor_Base.cpp: - * ace/Select_Reactor_T.cpp: - * ace/Service_Object.i: - * ace/Service_Repository.cpp: - * ace/Signal.cpp: - * ace/Signal.i: - * ace/Svc_Handler.cpp: - * ace/Synch.cpp: - * ace/Synch_T.cpp: - * ace/Thread_Adapter.cpp: - * ace/Thread_Manager.cpp: - * ace/Timer_Heap_T.cpp: - * ace/TkReactor.cpp: - * ace/Token.cpp: - * ace/Token_Manager.cpp: - * ace/CLASSIX/CLASSIX_CO_Acceptor.i: - * ace/CLASSIX/CLASSIX_Select_Reactor.cpp: - * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp: - * netsvcs/ACE-netsvcs.html: - * netsvcs/lib/Server_Logging_Handler_T.cpp: - * netsvcs/lib/Token_Handler.cpp: - - Fixed bad ACE_TRACE and ACE_OS_TRACE's. (fuzz errors) - - * docs/ACE-categories.html: - * docs/ACE-porting.html: - * docs/ACE-subsets.html: - * docs/tutorials/new-tutorials.html: - - Changed references to - http://www.cs.wustl.edu/~schmidt/ACE_wrappers/* to - relative paths instead (Fixes the last of the fuzz errors). - -Fri Mar 2 20:08 Angelo Corsaro <corsaro@cs.wustl.edu> - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - Added macros tha expand to multiple libraries - on QNX RTP to fix most of the link problems. - -Fri Mar 2 16:35:58 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/config-win32-borland.h: - - Added /**/ to #include <vcl.h> so it isn't picked up by - MSVC-based dependency generators. - -Fri Mar 02 19:36:22 2001 Steve Huston <shuston@riverace.com> - - * ace/OS.i (ACE_OS::send): (only non-Win32), if call fails and - errno is EAGAIN, change it to EWOULDBLOCK. Improve portability - for platforms where EAGAIN and EWOULDBLOCK are different values - and both used, like HP-UX. Thanks to Michael Grove - <snowymike@aol.com> for reporting this problem. - - * ace/ACE.i (send_i): Call ACE_OS::send, not ACE_OS::write, on HP-UX. - This makes it pick up the EAGAIN->EWOULDBLOCK change. - - * tests/TSS_Test.cpp: Avoid doing ACE_Thread::keyfree on where - ACE_HAS_PTHREADS_DRAFT4 or ACE_HAS_PTHREADS_DRAFT6 (unless - ACE_HAS_TSS_EMULATION is also defined) since ACE_Thread::keyfree - will get ENOTSUP anyway. - -Fri Mar 02 17:50:40 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> - - * ace/QtReactor.cpp: - Thanks to Stefan Scherer <stefan_scherer@sepp.de> for reporting - and fixing the problem - crashing of TAO/tests/QtTests/ client - example after moving the slider. - -Fri Mar 02 15:35:40 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/MEM_Acceptor.cpp: - * ace/MEM_Acceptor.h: - * ace/MEM_Addr.cpp: - * ace/MEM_Addr.h: - * ace/MEM_Connector.cpp: - * ace/MEM_Connector.h: - * ace/MEM_IO.cpp: - * ace/MEM_IO.h: - * ace/MEM_SAP.cpp: - * ace/MEM_SAP.h: - * ace/MEM_Stream.cpp: - * ace/MEM_Stream.h: Disabled MEM_Stream support if one chooses - not to support position independent pointers. - -Fri Mar 02 13:17:36 2001 Steve Huston <shuston@riverace.com> - - * examples/IOStream/server/iostream_server.cpp (main): Removed the - call to register peer_acceptor with the reactor. The - acceptor::open call already registers for ACCEPT_MASK. Prevents - leaving a hanging READ_MASK registered after the acceptor is - destroyed when main() returns. This fixes Bugzilla # 801. Thanks - to Pim Philipse <pph@rogan-medical.com> for reporting this. - - * THANKS: Added Pim Philipse to the Hall of Fame. - -Fri Mar 02 12:24:27 2001 Steve Huston <shuston@riverace.com> - - * ace/config-hpux-10.x-hpc++.h: If compiling without exceptions - (+noeh) then don't set ACE_HAS_EXCEPTIONS (don't set - ACE_NEW_THROWS_EXCEPTIONS either). - - * ace/Thread_Manager.cpp (join_thr): Moved the code for - ACE_HAS_PTHREADS_DRAFT4 that does a pthread_detach from here to - ACE_OS::thr_join (which this function calls) so that - ACE_Thread::join also causes a pthread_detach. This is needed on - Pthreads Draft 4 (HP-UX 10.x) to properly clean up the thread - storage and avoid leaking memory. Thanks to Vladimir Kondratiev - <vladimir.kondratiev@intel.com> for reporting this and providing - excellent test cases to help resolve it quickly. - - * ace/OS.i (ACE_OS::thr_join): Added the code that was removed from - ACE_Thread_Manager::join_thr, above. - - * ace/Event_Handler.cpp (~ACE_Event_Handler): Add an ACE_Errno_Guard - around purge_pending_notifications to prevent against an ENOTSUP - from purge_pending_notifications. - -Thu Mar 1 17:02:10 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/PerlACE/Process_Unix.pm: - * bin/PerlACE/Process_Win32.pm: - - Fixed up the Spawn code to use the Executable () instead of - {EXECUTABLE}, since that's how we get the adjusted name (with - .exe and stuff). And also skipped the file existance with - IgnoreExeSubDir, since IgnoreExeSubDir is often used when you - need to find the program in the path. - -Thu Mar 1 15:48:10 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/fuzz.pl: - - Fuzz was being a bit to eager with the class matching in the - TRACE test. It was having problems with something like: - - char *foo::bar () - - since it thought the class was "char *foo" instead of just - "foo". - - But it is feeling muuuuuuch better now. - -Thu Mar 1 13:18:07 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/fuzz.pl: - - Added two new tests: - - - absolute ACE_wrappers test: - - Check for ~schmidt/ACE_wrappers in html files. These should - be relative links since these html files already exist in - their own ACE_wrappers tree. - - - TRACE test: - - Does a check on whether the ACE_TRACE or ACE_OS_TRACE actually - refers to the function/method it is in. - - And expanded the checks in the bad run_test test (level 6) - - * bin/PerlACE/Process_Unix.pm: - * bin/PerlACE/Process_Win32.pm: - - - Added checks for file existence before running. - - Added IgnoreExeSubDir option. - - Added TerminateWaitKill method. - - * bin/pippen.pl: (added) - * bin/PerlACE/MSProject.pm: (added) - * bin/PerlACE/MSProject/DSP.pm: (added) - * bin/PerlACE/MSProject/VCP.pm: (added) - - There is nothing to see here...please be on your way. - - It isn't like this is a super top secret project to - replace msvc_auto_compile.pl with something that works - better and also has a cool code-name that is shorter - than "msvc_auto_compile.pl". - - But remember, you didn't hear that from me. - -Thu Mar 1 10:54:23 2001 Ossama Othman <ossama@uci.edu> - - * bin/auto_run_tests.lst: - - Added the TAO Codec to the list of tests to run. - - * include/makeinclude/wrapper_macros.GNU: - - Fixed all incorrect uses of CFLAGS and CCFLAGS where - preprocessor macros were defined. Preprocessor macros should be - defined in the CPPFLAGS variable. - - Define ACE_USE_RCSID in non-debug builds (i.e. debug=0). - -Thu Mar 01 07:29:58 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - Fixed typos in the Service_Context_Manipulation test. It was - running in platforms where it shouldn't. - -Thu Mar 01 07:07:03 2001 Christopher Kohlhoff <chris@kohlhoff.com> - - * include/makeinclude/recurse.bor: - Added support for makefiles which contain multiple targets. - - * examples/IPC_SAP/SOCK_SAP/Makefile.bor: - * examples/Log_Msg/Makefile.bor: - * examples/Map_Manager/Makefile.bor: - * examples/Mem_Map/file-reverse/Makefile.bor: - * examples/RMCast/Send_File/Makefile.bor: - * examples/Service_Configurator/IPC-tests/client/Makefile.bor: - * examples/Threads/Makefile.bor: - * netsvcs/clients/Logger/Makefile.bor: - * tests/Makefile.bor: - * tests/RMCast/Makefile.bor: - Updated to work with new multi-target makefile support. - -Wed Feb 28 22:58:50 2001 Carlos O'Ryan <coryan@uci.edu> - - * html/index.html: - Reference */index.html directly, instead of assuming that the - web browser will use index.html as the default file, this also - works better when browsing locally. Thanks to Alain Decamps - <Alain.Decamps@pidpa.be> for pointing this out. - -Wed Feb 28 16:41:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * docs/bugzilla-build-setup.html: - - Updated the section about the scoreboard and added a - placeholder for Win32 nightly build information. - -Wed Feb 28 16:04:14 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * bin/nightlybuilds/builds.lst (TYPE): Added a build with AMI and - Messaging support disabled for the nightly builds. - -Wed Feb 28 15:35:59 2001 Joe Hoffert <joeh@cs.wustl.edu> - - * docs/bugzilla-build-setup.html: - Added html file outlining steps for adding a bugzilla nightly - build. - -Wed Feb 28 00:25:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/auto_run_tests.lst: - - The examples/POA/Adapter_Activator/run_test.pl test was being - run twice. In fairness to all the other tests that only get to - run once, I removed the second instance. - -Tue Feb 27 17:31:48 2001 Steve Huston <shuston@riverace.com> - - * include/makeinclude/platform_hpux_aCC.GNU: Turn on -D_REENTRANT for - the threads=0 build - this enables the reentrant functions which - are present, threads or not. It does not turn on threads, which - are instead enabled by -D_POSIX_C_SOURCE=199506L. - - * ace/config-hpux-11.00.h: Added ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - - * ace/OS.i (rand_r): Added 'defined (HPUX_11)' to the ways to get to - the POSIX.1c-conformant version of rand_r. Allows clean compile - on HP-UX 11 without thread support. Also lined up some - misaligned #if/else/endif lines to make it easier to find one's - way through. - - * ace/OS_Dirent.inl (readdir_r): Added 'defined (HPUX_11)' to the - ways to get the POSIX.1c-conformant version of readdir_r. Allows - clean compile on HP-UX 11 without thread support. - -Tue Feb 27 11:38:38 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * performance-tests/TCP/tcp_test.cpp (main): Zapped the - non-existent '-f' option. Thanks to Mike Curtis for reporting - this. - - * performance-tests/TCP/tcp_test.cpp (main): Check for improper - bufsz. Thanks to Mike Curtis for reporting this. - - * performance-tests/TCP/tcp_test.cpp (main): Documented the '-t' - option, which specifies the number of threads. - - * performance-tests/TCP/README: Fixed a typo. Thanks to - Mike Curtis for reporting this. - -Tue Feb 27 10:51:18 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * bin/auto_run_tests.lst: Added the AMI tests to the daily - builds. - -Tue Feb 27 10:23:20 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * Makefile: Changed the ChangeLog listing in the CONTROLLED_FILES - to ChangeLog*. This should help us to avoid missing ChangeLog - entries in the beta distribution, just about every time we split - and add a ChangeLog. - -Mon Feb 27 07:39:16 2001 Chad Elliott <elliott_c@ociweb.com> - - * include/makeinclude/platform_hpux_aCC.GNU: - - Removed suppression of Future Error 129. - Removed the use of CFLAGS. - - * ace/OS.h: - * ace/config-hpux-11.00.h: - Modification to remove system header macro definition conflicts. - This change does not suppress the conflicts, but does an undef - of the two conflicting macros before includeing tcp.h. Thanks - to Sam Chong <sam@i2i-inc.com> for reporting this problem. - -Mon Feb 26 19:01:16 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * ace/Logging_Strategy.{h,cpp}: Added a new -k option to - set the logging key via the ACE_Logging_Strategy. Thanks to - Chris Kohlhoff <chris@kohlhoff.com> for contributing this. - -Mon Feb 26 18:18:38 2001 Steve Huston <shuston@riverace.com> - - * ace/SString.i - (ACE_CString::find (const char *s, int pos) const): - (ACE_CString::find (char c, int pos) const): - (ACE_SString::find (const char *s, int pos) const): - (ACE_SString::find (char c, int pos) const): - (ACE_WString::find (const ACE_WSTRING_TYPE *s, int pos) const): - If match is found, return index from start of string, not from - 'pos'. Matches the C++ string standard, which was the model for - these classes. Thanks to Glen Osterhout <gosterho@elronsw.com> - for this fix. - - * ace/SString.h: Clarified comments on return value for above - functions. - - * tests/SString_Test.cpp: Changed to look for the correct return - from the npos tests of the functions above. - - * THANKS: Added Glen Osterhout to the Hall of Fame. - -Mon Feb 26 15:01:55 2001 Darrell Brunsch <brunsch@uci.edu> - - * tests/DLL_Test_Impl.dsp: - * tests/version_tests/DLL_Test_Impl.dsp: (removed) - Me thinks that the Release and Static configurations should - also compile, and me thinks that it is now fixed. - -Mon Feb 26 12:29:45 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/ARGV.h: Clarify that the int add (const ACE_TCHAR *next_arg) - method assumes ownership of <next_arg>, rather than copying it. - Thanks to Steve Hespelt <shespelt@bear.com> for reporting this. - Fixes [Bug 807]. - - The generated version_tests dsp didn't work (since DLL_Test_Impl - creates a library). Manually created the configurations in the - tests/DLL_Test_Impl.dsp version instead. - -Mon Feb 26 15:54:33 2001 Phil Mesnier <mesnier_p@ociweb.com> - - Port to Unixware 7 (7.1.1) Using UDK CC (7.1.1.b) - - * docs/tutorials/013/message_queue.cpp: - * tests/Malloc_Test.cpp: - - Fixed errors in #pragma instiate lines including removal of ';', - mispellings - - * ace/config-all.h: - - Added definition of Unixware UDK for definition of ACE_NOTREACHED() - - * ace/config-unixware-7.1.0.udk.h: - * include/makeinclude/platform_unixware_udk.GNU: - - New configuration files for building on Unixware 7 with UDK CC. - -Mon Feb 26 12:29:45 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/ARGV.h: Clarify that the int add (const ACE_TCHAR *next_arg) - method assumes ownership of <next_arg>, rather than copying it. - Thanks to Steve Hespelt <shespelt@bear.com> for reporting this. - Fixes [Bug 807]. - -Mon Feb 26 12:27:46 2001 Jeff Parsons <parsons@cs.wustl.edu> - - * ace/CDR_Stream.h: - * ace/CDR_Stream.i: - Added method to reset the byte order in class OuputCDR. This - will be used by a gateway to set the byte order of a reply to a - reqest it has handled to one different than the gateway's own - byte order, if necessary. It should be called while the stream - is still empty, that is, before any part of the reply, including - the header, has been marshaled. - -Mon Feb 26 12:07:00 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/Memory_Pool.cpp: Moved the copying of MMAP flags up before - setting the MAP_FIXED flag. Thanks to <rhuber@amadeus.net> for - reporting this. [Bug 752] - -Mon Feb 26 09:29:36 2001 Carlos O'Ryan <coryan@cs.wustl.edu> - - * ace/RB_Tree.h: - Fully qualified enum name. This fixes problems on gcc-272 builds. - -Mon Feb 26 00:19:28 2001 Darrell Brunsch <brunsch@uci.edu> - - Time to do some spring cleaning... - - * tests/version_tests/Config_Test.dsp: (added) - * tests/version_tests/DLL_Test_Impl.dsp: (added) - * tests/version_tests/Log_Msg_Test.dsp: (added) - * tests/version_tests/Message_Queue_Test_Ex.dsp: (added) - * tests/version_tests/version_tests.dsw: - - Updated the version_tests dir with create_vt_dsps.pl. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - * netsvcs/lib/netsvcs.dsp: - * netsvcs/servers/servers.dsp: - * tests/ACE_Init_Test.dsp: - * tests/Atomic_Op_Test.dsp: - * tests/Auto_IncDec_Test.dsp: - * tests/Barrier_Test.dsp: - * tests/Basic_Types_Test.dsp: - * tests/Buffer_Stream_Test.dsp: - * tests/CDR_Array_Test.dsp: - * tests/CDR_File_Test.dsp: - * tests/CDR_Test.dsp: - * tests/Cache_Map_Manager_Test.dsp: - * tests/Cached_Accept_Conn_Test.dsp: - * tests/Cached_Conn_Test.dsp: - * tests/Capabilities_Test.dsp: - * tests/Collection_Test.dsp: - * tests/Config_Test.dsp: - * tests/Conn_Test.dsp: - * tests/DLL_Test.dsp: - * tests/DLList_Test.dsp: - * tests/Dirent_Test.dsp: - * tests/Dynamic_Priority_Test.dsp: - * tests/Enum_Interfaces_Test.dsp: - * tests/Env_Value_Test.dsp: - * tests/Future_Set_Test.dsp: - * tests/Future_Test.dsp: - * tests/Handle_Set_Test.dsp: - * tests/Hash_Map_Bucket_Iterator_Test.dsp: - * tests/Hash_Map_Manager_Test.dsp: - * tests/High_Res_Timer_Test.dsp: - * tests/IOStream_Test.dsp: - * tests/Lazy_Map_Manager_Test.dsp: - * tests/Log_Msg_Test.dsp: - * tests/MEM_Stream_Test.dsp: - * tests/MM_Shared_Memory_Test.dsp: - * tests/MT_Reactor_Timer_Test.dsp: - * tests/MT_SOCK_Test.dsp: - * tests/Malloc_Test.dsp: - * tests/Map_Manager_Test.dsp: - * tests/Map_Test.dsp: - * tests/Mem_Map_Test.dsp: - * tests/Message_Block_Test.dsp: - * tests/Message_Queue_Notifications_Test.dsp: - * tests/Message_Queue_Test.dsp: - * tests/Message_Queue_Test_Ex.dsp: - * tests/Naming_Test.dsp: - * tests/New_Fail_Test.dsp: - * tests/Notify_Performance_Test.dsp: - * tests/OS_Test.dsp: - * tests/Object_Manager_Test.dsp: - * tests/OrdMultiSet_Test.dsp: - * tests/Pipe_Test.dsp: - * tests/Priority_Buffer_Test.dsp: - * tests/Priority_Reactor_Test.dsp: - * tests/Priority_Task_Test.dsp: - * tests/Process_Manager_Test.dsp: - * tests/Process_Mutex_Test.dsp: - * tests/Process_Strategy_Test.dsp: - * tests/RB_Tree_Test.dsp: - * tests/Reactor_Exceptions_Test.dsp: - * tests/Reactor_Notify_Test.dsp: - * tests/Reactor_Performance_Test.dsp: - * tests/Reactor_Timer_Test.dsp: - * tests/Reactors_Test.dsp: - * tests/Reader_Writer_Test.dsp: - * tests/Recursive_Mutex_Test.dsp: - * tests/Refcounted_Auto_Ptr_Test.dsp: - * tests/Reverse_Lock_Test.dsp: - * tests/SOCK_Connector_Test.dsp: - * tests/SOCK_Send_Recv_Test.dsp: - * tests/SOCK_Test.dsp: - * tests/SPIPE_Test.dsp: - * tests/SString_Test.dsp: - * tests/SV_Shared_Memory_Test.dsp: - * tests/Semaphore_Test.dsp: - * tests/Service_Config_Test.dsp: - * tests/Sigset_Ops_Test.dsp: - * tests/Simple_Message_Block_Test.dsp: - * tests/Svc_Handler_Test.dsp: - * tests/TSS_Test.dsp: - * tests/Task_Test.dsp: - * tests/Thread_Manager_Test.dsp: - * tests/Thread_Mutex_Test.dsp: - * tests/Thread_Pool_Reactor_Test.dsp: - * tests/Thread_Pool_Test.dsp: - * tests/Time_Service_Test.dsp: - * tests/Time_Value_Test.dsp: - * tests/Timeprobe_Test.dsp: - * tests/Timer_Queue_Test.dsp: - * tests/Tokens_Test.dsp: - * tests/UPIPE_SAP_Test.dsp: - * tests/Upgradable_RW_Test.dsp: - - Removed the Alpha configurations. I don't think we've actually - looked at these for over a year, and they are missing from a lot - of projects. Thankfully, they are easy to recreate if they are - needed. - - * ACE-INSTALL.html: - - Changed the Windows NT Alpha section to mention that we no - longer have configurations out of the box for Win32/Alpha, they - must be recreated if needed. - - * WindozeCE/ACEApp.cpp: (removed) - * WindozeCE/ACEApp.h: (removed) - * WindozeCE/README: (removed) - * WindozeCE/StdAfx.cpp: (removed) - * WindozeCE/StdAfx.h: (removed) - * WindozeCE/WindozeCE.aps: (removed) - * WindozeCE/WindozeCE.clw: (removed) - * WindozeCE/WindozeCE.cpp: (removed) - * WindozeCE/WindozeCE.dsp: (removed) - * WindozeCE/WindozeCE.h: (removed) - * WindozeCE/WindozeCE.rc: (removed) - * WindozeCE/WindozeCEDlg.cpp: (removed) - * WindozeCE/WindozeCEDlg.h: (removed) - * WindozeCE/resource.h: (removed) - * WindozeCE/res/WindozeCE.ico: (removed) - * WindozeCE/res/WindozeCE.rc2: (removed) - - No longer used. - - * Makefile: - - Removed WindozeCE from CONTROLLED_FILES. - - * tests/WinCE/Atomic_Op_Test.dsp: (removed) - * tests/WinCE/Barrier_Test.dsp: (removed) - * tests/WinCE/Basic_Types_Test.dsp: (removed) - * tests/WinCE/Buffer_Stream_Test.dsp: (removed) - * tests/WinCE/Conn_Test.dsp: (removed) - * tests/WinCE/DLL_Test.dsp: (removed) - * tests/WinCE/Enum_Interfaces_Test.dsp: (removed) - * tests/WinCE/Future_Test.dsp: (removed) - * tests/WinCE/Handle_Set_Test.dsp: (removed) - * tests/WinCE/Hash_Map_Manager_Test.dsp: (removed) - * tests/WinCE/MT_Reactor_Timer_Test.dsp: (removed) - * tests/WinCE/MT_SOCK_Test.dsp: (removed) - * tests/WinCE/Map_Manager_Test.dsp: (removed) - * tests/WinCE/Mem_Map_Test.dsp: (removed) - * tests/WinCE/Message_Block_Test.dsp: (removed) - * tests/WinCE/Message_Queue_Notifications_Test.dsp: (removed) - * tests/WinCE/Message_Queue_Test.dsp: (removed) - * tests/WinCE/Notify_Performance_Test.dsp: (removed) - * tests/WinCE/OrdMultiSet_Test.dsp: (removed) - * tests/WinCE/Priority_Buffer_Test.dsp: (removed) - * tests/WinCE/Priority_Task_Test.dsp: (removed) - * tests/WinCE/Reactor_Exceptions_Test.dsp: (removed) - * tests/WinCE/Reactor_Notify_Test.dsp: (removed) - * tests/WinCE/Reactor_Performance_Test.dsp: (removed) - * tests/WinCE/Reactor_Timer_Test.dsp: (removed) - * tests/WinCE/Reactors_Test.dsp: (removed) - * tests/WinCE/Reader_Writer_Test.dsp: (removed) - * tests/WinCE/Recursive_Mutex_Test.dsp: (removed) - * tests/WinCE/SOCK_Connector_Test.dsp: (removed) - * tests/WinCE/SOCK_Test.dsp: (removed) - * tests/WinCE/SString_Test.dsp: (removed) - * tests/WinCE/Semaphore_Test.dsp: (removed) - * tests/WinCE/Sigset_Ops_Test.dsp: (removed) - * tests/WinCE/Simple_Message_Block_Test.dsp: (removed) - * tests/WinCE/TSS_Test.dsp: (removed) - * tests/WinCE/Task_Test.dsp: (removed) - * tests/WinCE/Thread_Manager_Test.dsp: (removed) - * tests/WinCE/Thread_Mutex_Test.dsp: (removed) - * tests/WinCE/Thread_Pool_Test.dsp: (removed) - * tests/WinCE/Time_Value_Test.dsp: (removed) - * tests/WinCE/Timer_Queue_Test.dsp: (removed) - * tests/WinCE/ce_tests.dsw: (removed) - - Removed these Windows CE Toolkit for Visual C++ files. - -Mon Feb 26 00:15:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * tests/DLL_Test_Impl.dsp: - - Made sure the Code Generation settings were correct. - -Sun Feb 25 19:40:11 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/ACEutils.pm (CheckForConfig): - This routine was not removing all the -Config options from the - command-line, causing problems in some of the tests. - -Sun Feb 25 16:33:26 2001 Darrell Brunsch <brunsch@uci.edu> - - * tests/DLL_Test.cpp: - - Left the DLL end with a d in debug mode, but changed - the test to add the d when _DEBUG and ACE_WIN32 is - defined. Test should now work again on Win2000_Debug. - -Sun Feb 25 11:28:06 2001 Darrell Brunsch <brunsch@uci.edu> - - * tests/run_test.pl: - - When there are errors in the log, print out the entire - log. This should make it much easier to understand - problems in the nightly build logs. - -Sun Feb 25 09:04:43 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/DLL_Test.cpp: - Accidentally left the 'd' suffix in the name of the DLL. - -Sat Feb 24 22:58:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/msvc_auto_compile.pl: - * TAO/TAOACE.dsw: - * TAO/TAOACE_Static.dsw: - * Static_Performance.dsw: - - Removed references to gperf_lib.dsp - - * TAO/version_tests.dsw: (removed) - - This was still referring to orbsvcs.dsp, which shows that - it is way out of date (and not used). Zapped. - -Sat Feb 24 20:59:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * apps/gperf/src/gperf.dsp: - * apps/gperf/src/gperf.dsw: - * apps/gperf/src/gperf_lib.dsp: (removed) - - Merged gperf into one project. This will bring the - structure in line with the Makefiles. - -Sat Feb 24 19:28:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS.i: - - Fixed my recent changes to ACE_OS::dlsym () to work on - Windows CE. - -Sat Feb 24 17:50:38 2001 Darrell Brunsch <brunsch@uci.edu> - - * tests/DLL_Test.cpp: - - OBJ_PREFIX was being created by attaching a char string to - a ACE_TCHAR string. Needed to add ACE_TEXT to the first - string for compilation on ACE_USES_WCHAR. - - * tests/DLL_Test_Impl.dsp: - - Changed the internal name to "DLL_Test DLL" to make sure - this gets compiled in the first pass by msvc_auto_compile.pl. - - * tests/run_test.pl: - - Added a check for LM_WARNINGs in log files. Let's see if - there have been any hidden (DLL_Test actually was producing - a warning on Windows, but Carlos's fix already got rid of it, - Yay!). - -Sat Feb 24 15:44:58 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/tests.dsw: - * tests/DLL_Test_Impl.dsp: - Add new project file for the shared library used in the test. - - * tests/DLL_Test.cpp: - * tests/DLL_Test_Impl.cpp: - Change the Win32 version to load a shared library instead of the - exe. - -Sat Feb 24 14:07:11 2001 Darrell Brunsch <brunsch@uci.edu> - - * tests/Thread_Pool_Reactor_Test.cpp: - - Did a careful study of what this test was doing in regards to - sending wide-character strings, and made it consistent. The - most troublesome aspect was the fact that the length is encoded - in the shutdown string ("\011shutdown") which meant that I had - to send the length in characters, not in bytes. This should - really fix [Bug 537]. - -Sat Feb 24 14:37:00 2001 Craig Rodrigues <crodrigu@bbn.com> - - * ace/config-g++-common.h - gcc 2.97 and higher require the use of the std namespace for - iostrams - -Sat Feb 24 10:27:04 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - Disable the interceptor tests when the ORB is compiled without - interceptor support. - - * tests/run_test.lst: - Disable the Reactor_Notify_Test on single threaded builds, it - uses threads. - - * bin/nightlybuilds/scoreboard_update.pl: - Fixed usage message. - -Sat Feb 24 09:45:18 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/run_test.lst: - Disable the DLL_Test on KCC/Linux builds. The test runs - normally, but crashes on shutdown(), it appears as if the - run-time system is invoking the destructors after the library is - unloaded. - - * tests/Makefile: - * tests/Makefile.DLL_Test: - * tests/DLL_Test.h: - * tests/DLL_Test.cpp: - * tests/DLL_Test_Impl.h: - * tests/DLL_Test_Impl.cpp: - Cleanup code, and truly separate the shared library code to a - completely new separate file. - -Sat Feb 24 09:51:45 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_compile: - Pass the -Config options to each script, this helps the - $ACE_ROOT/bin/run_test.pl script that needs to disable some - tests in certain configurations. - -Sat Feb 24 08:21:48 2001 David L. Levine <levine@cs.wustl.edu> - - * include/makeinclude/platform_vxworks5.x_g++.GNU: - added -fno-implicit-templates on Tornado II for Intel 386 - family targets. Thanks to Albert Wijnja <Albert.Wijnja@meco.nl> - for reporting that static template data members weren't really on - VxWorks/386, and to Greg Holtmeyer <greg.holtmeyer@windriver.com> - for confirming that -fno-implicit-templates should work with - the Tornado II g++. [Bug 658] - -Thu Feb 22 15:59:04 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * ace/OS.i: The ACE_TRACE call for ACE_OS::gmtime identified the - function as "localtime". This is now fixed. Thanks to Mason - Deaver <mason.deaver@tripointglobal.com> for reporting this. - -Fri Feb 23 19:44:36 2001 Krishnakumar B <kitty@cs.wustl.edu> - - * ACE version 5.1.13 released. - -Thu Feb 22 12:28:15 2001 Irfan Pyarali <irfan@cs.wustl.edu> - - * ace/TP_Reactor.cpp (handle_events): Here is the description of - how things were working and where the problem was: In the - TP_Reactor there is one leader thread waiting in select() and - the others waiting on the token. During deactivation(), the - <deactivation_> flag is set on the reactor, signal_all_threads() - is called on the token, and an empty notification is send to the - current leader thread. signal_all_threads() sets the - <signal_all_threads_> flag on the Token when there are waiters - on the Token (does nothing if there are no waiters). This - scheme worked fine when there were leader and follower threads - waiting. When a new leader is chosen, it returns the magic - number 2 from token.acquire_read() and hence exits gracefully - from the handle_events(). However, the problem was that when - some (or all) of the TP threads are busy running upcalls, - signal_all_threads() was a no-op and the magic number 2 was not - returned from token.acquire_read() and hence the exit from - handle_events() was flagged as an error. - - The fix is as described below: - - (1) ACE_Token::signal_all_threads() does not make sense. The - token is a mutex, not a condition variable. Therefore, it does - not make sense to have a signal_all_threads() methods. Plus I - believe that the method does not do as advertised. Therefore, I - removed this method from the token class. - - (2) There is no need to signal all the threads in the - TP_Reactor. Marking the Reactor as closed and signaling the - leader thread is enough. The leader thread will wake up to - handle the empty event, the next leader will see that the - Reactor is closed and exit gracefully. This will continue until - all the waiters are drained. - - (3) With the above change, there is no need to check for an - magic returns from token.acquire_read(). When a thread gets the - token, it checks the deactivation flag before proceeding. If - the Reactor is closed, it gracefully exits. Otherwise, it - continues as leader. - - (4) Since there is no need to call token.signal_all_threads(), - ACE_TP_Reactor::wakeup_all_threads() can be removed since it is - now the same as ACE_Select_Reactor_T::wakeup_all_threads(). - - Note that this change should help with making - Thread_Pool_Reactor_Test run without shutdown errors. - - * ace/Select_Reactor_T.i (deactivate): The setting of the - <deactivated_> flag and waking up of all the threads should be - atomic. I am being picky about this one but I think am I right. - Also added the guard to the accessor. - -Thu Feb 22 08:51:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS.i: - - Bleh. Changed an && to || to make sure we get a symbolname - variable for non-Unicode Win32. - - "He who lives without committing any folly is not so - wise as he thinks" - La Rochefoucauld - -Thu Feb 22 08:43:30 2001 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/rules.local.GNU: - Add SunWS_cache and ir.out to the list of files removed by - the realclean pseudo-target. This directory is used by Sun/CC - 5.0 (and Forte), if not removed the information there can become - stale, and break the builds. - This should fix the Sun/CC 5.0 nightly builds. - -Thu Feb 22 07:51:36 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/OS.i: Reverted the change "Thu Feb 22 03:31:06 2001 - Krishnakumar B <kitty@ace.cs.wustl.edu> ". - -Thu Feb 22 03:31:06 2001 Krishnakumar B <kitty@ace.cs.wustl.edu> - - * ace/OS.i (dlsym): - Hopefully fixed the Win32 builds. Removed a extra ! in the - #ifdef. - -Thu Feb 22 02:58:36 2001 Krishnakumar B <kitty@ace.cs.wustl.edu> - - * VERSION: - * PROBLEM-REPORT-FORM: - * ace/Version.h: - Reverted the changes and restored the old versions of - these files as the beta build script was killed. Pain :-( - -Wed Feb 21 20:10:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS.i: - * tests/DLL_Test.cpp: - * tests/Thread_Pool_Reactor_Test.cpp: - - Fixed the remaining problems with the Win2000_Unicode tests. - [Bug 537] - -Tue Feb 20 21:19:39 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Svc_Conf.h: - Add ACE_Export macro for ace_create_service_type() it is used - outside the library now. - -Tue Feb 20 06:34:26 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - - * include/makeinclude/platform_sunos5_g++.GNU: Make sure to explicitly - set ACE_HAS_GNUG_PRE_2_8. Thanks to Christian von Mueffling - <cvm@aiss.de> for reporting this. - - * ace/Thread_Manager.cpp (cancel_grp): Fixed a typo in - the ACE_TRACE macro. Thanks to Mike Curtis for reporting this. - -Mon Feb 19 16:38:08 2001 Krishnakumar B <kitty@cs.wustl.edu> - - * ace/Asynch_Acceptor.{h,cpp}: - Added method void handle (ACE_HANDLE) and made it call the base - class's handle(ACE_HANDLE) method to remove warning about - partial overloading. Fix suggested by Irfan. - -Sun Feb 18 21:55:16 2001 Krishnakumar B <kitty@cs.wustl.edu> - - * ace/OS.h: - Added an extern "C" void ace_mutex_lock_cleanup_adapter before - the definition of ACE_PTHREAD_CLEANUP_PUSH to avoid warnings on - SunCC 5.x. - -Sun Feb 18 17:16:41 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * netsvcs/clients/Tokens/manual/manual.cpp (main), - * tests/Tokens_Test.cpp (main): Reordered the #ifdefs for the - ACE_HAS_TOKENS_LIBRARY stuff. Thanks to Kitty for reporting - this. - -Sun Feb 18 16:28:45 2001 Chris Gill <cdgill@cs.wustl.edu> - - * ace/RB_Tree.h: Changed order of method declarations to (hopefully) - dodge an internal compiler error on VxWorks. - -Sun Feb 18 09:59:18 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * netsvcs/clients/Tokens: - * netsvcs/servers/main.cpp (main): - * netsvcs/servers/svc.conf: - * netsvcs/lib/Token_Handler: Only compile this stuff if the - ACE_HAS_TOKENS_LIBRARY macro is enabled. Thanks to Carlos - for reporting this. - - * ace/Object_Manager.cpp: Added a check for ACE_HAS_TOKENS_LIBRARY - so we can skip initializing certain things if that macro is - undefined. - - * ace/Token_Collection.*: - * ace/Token_Invariants.*: - * ace/Token_Manager.*: - * ace/Local_Tokens.*: - * ace/Remote_Tokens.*: - * ace/Token_Request_Reply.*: - Only compile these files if ACE_HAS_TOKENS_LIBRARY is enabled - since this functionality does not appear to be widely used and - yet it takes up space. - - * tests/Tokens_Test.cpp (main): Only run this test if - ACE_HAS_TOKENS_LIBRARY is defined. - -Sat Feb 17 17:23:46 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/SOCK_Dgram_Mcast.cpp: - - Integrated a fix from Keith Nicewarner <knicewar@erg.sri.com> - In effect, this reverts the multicast code changed on - Fri Jan 26 11:18:15 2001 Douglas C. Schmidt ... - for all platforms except linux. - -Sat Feb 17 15:52:09 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/run_all_list.pm: - * tests/run_tests.pl: - Remove obsolete scripts. - -Sat Feb 17 13:26:17 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/POSIX_Asynch_IO.cpp (thread_function): Make sure to cast - -1 to void * since that's the signature of the method. Thanks - to Bala for reporting this. - - * ace/POSIX_Asynch_IO.cpp (thread_function): Zapped the unused - result local variable and also changed the logic to bailout if - handle_events() returns -1. This fixes a warning reported by - KCC. - -Fri Feb 16 17:39:16 2001 Mayur Deshpande <mayur@ics.uci.edu> - - * ace/config-qnx-rtp.h: Commented out ACE_HAS_NONSTATIC_OBJECT_MANAGER. - Thanks to Andrew Olson <andrew.olson@lmco.com> for the suggestion. - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: Added -fexceptions to - CCFLAGS and 'exceptions=1' at end of file. - Thanks to Andrew Olson <andrew.olson@lmco.com> for the suggestion. - -Fri Feb 16 05:37:47 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Logging_Strategy.h: Updated the documentation to explain what - the various options mean. - - * tests/Log_Msg_Test.cpp (test_log_msg_features): Added - ACE_Log_Msg::PROCESS to a couple of priority_mask() calls to - make the test work correctly. Thanks to Kitty for reporting - this. - -Thu Feb 15 17:53:31 2001 Frank Hunleth <fhunleth@cs.wustl.edu> - - * ace/Thread_Manager.i: Simplified casting in - ACE_Thread_Descriptor::get_next per suggestion from Carlos. - -Thu Feb 15 14:57:59 2001 Frank Hunleth <fhunleth@cs.wustl.edu> - - * ace/Thread_Manager.i: Fixed typo in ACE_Thread_Descriptor::get_next. - -Thu Feb 15 11:33:55 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * tests/Refcounted_Auto_Ptr_Test.cpp (main): Always call ACE_OS::exit(0) - to make sure that this test terminates... - - * ace/Thread_Manager.i (get_next): Added an ACE_const_cast() to - make certain compilers happy. - - * ace/Logging_Strategy.cpp: Fixed some Unicode problems on Win32. - -Thu Feb 15 08:49:44 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/nightlybuilds/builds.lst: - Rename WashU builds so all the Debian builds appear together. - -Thu Feb 15 07:15:39 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Logging_Strategy.{h,cpp}: Added support to generate multiple - log files, rather than just two. Thanks to Orlando Ribeiro - <oribeiro@inescporto.pt> for this fix. - -Thu Feb 15 03:36:46 2001 Krishnakumar B <kitty@cs.wustl.edu> - - * bin/nightlybuilds/builds.lst (WEB): - Added a new build with TAO_MINIMUM linked statically. - -Wed Feb 14 05:28:59 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Thread_Manager.{h,i}: Added const to state(), grp_id(), - task(), get_next(), and self(). Thanks to Johnny Willemsen - <jwillemsen@remedy.nl> for reporting this. - -Tue Feb 13 17:51:47 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * tests/Makefile.bor (TESTS): Added Dirent_Test to list of TESTS. - Thanks to Mike Curtis for reporting this. - - * tests/run_tests.bat: Fixed a typo so that Dirent_Test will run. - Thanks to Mike Curtis for reporting this. - -Wed Feb 14 12:08:10 2001 Frank Hunleth <fhunleth@cs.wustl.edu> - - * ace/Read_Buffer.cpp: Fixed boundary condition in rec_read. - If record was a multiple of BUFSIZ and the record was - terminated with an EOF instead of a "term" character, - rec_read would return 0 instead of the actual data read in. - The problem was that the partial buffer fill size was being - checked instead of the total number of bytes read in. This - issue was noticed when trying to read in an IOR file in TAO - that was exactly 512 bytes (BUFSIZ * 2 on Win2k) long. - -Tue Feb 13 14:44:28 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/ace_wchar.inl: Changed several variable from type <size_t> - to type <int> as on 64-bit whistler, size_t and int are not the - same size which confuses 64-bit compiler. (Per Kitty's - request.) - -Tue Feb 13 10:23:31 2001 Steve Huston <shuston@riverace.com> - - * apps/JAWS/server/IO.{h cpp}: (Side-affect necessitated by addition of - handle () method and handle_ member to ACE_Handler). Moved the - handle_ member to the JAWS_Synch_IO class - it needs it, and - JAWS_Asynch_IO class has it by inheritance from ACE_Handler. Left - the handle () methods in JAWS_IO, but made them pure virtual, - implemented in JAWS_Synch_IO (implementation moved from JAWS_IO) - and in JAWS_Asynch_IO, where they forward up to ACE_Handler's - handle () methods. - -Mon Feb 12 18:18:05 2001 Frank Hunleth <fhunleth@cs.wustl.edu> - - * tests/Thread_Mutex_Test.cpp: - Modified test to use process mutexes for Win32 platforms - so that timed mutexes could be tested. - -Sun Feb 11 15:33:39 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/QoS/ACE_QoS_Export.h: - - Added ACE_AS_STATIC_LIBS support. - - * ace/QoS/ACE_QoS.dsp: - * ace/QoS/ACE_QoS_Lib.dsp: - - Fixed to comply with ACE standards. - -Sun Feb 11 10:50:10 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * include/makeinclude/platform_sunos5_g++.GNU (exceptions): - Only set the -fno-exceptions option if we're *not* using GCC - 2.7.2! Thanks to Pradeep for explaining how to do this. - -Sun Feb 11 10:15:08 2001 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Makefile.bor: - * ace/QoS/Makefile.bor: - * include/makeinclude/ace_flags.bor: - Added build support for QoS library with Borland compiler. - -Sat Feb 10 15:29:08 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Message_Block.h: - Improved documentation for the lenth(), size() and space() - methods. - -Sat Feb 10 07:19:37 2001 Christopher Kohlhoff <chris@kohlhoff.com> - - * include/makeinclude/outputdir.bor: - Removed the now out-of-date comment about pascal/non-pascal - build directories. - - * ace/config-win32-borland.h: - Added support for new ACE_HAS_VCL define to enable inclusion - of VCL header files. - -Fri Feb 9 16:47:44 2001 Pradeep Gore <pradeep@cs.wustl.edu> - - * ace/Makefile.am: - Removed references to the AQoSA files. - -Fri Feb 9 16:42:10 2001 Pradeep Gore <pradeep@cs.wustl.edu> - - * examples/QOS/client.dsp: - * examples/QOS/server.dsp: - Updated the corrected project files. - Thanks to Darrell for pointing this out. - -Thu Feb 8 19:25:03 2001 Carlos O'Ryan <coryan@uci.edu> - - * performance-tests/RPC/run_test.pl: - * performance-tests/TCP/run_test.pl: - * performance-tests/UDP/run_test.pl: - Add driver strings - -Thu Feb 08 19:18:36 2001 Angelo Corsaro <corsaro@cs.wustl.edu> - - * bin/auto_run_tests.lst: - - Removed comment from Exposed Policies test. The test has been fixed. - -Thu Feb 8 14:11:36 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/ws2tcpip.h: [Removed] - - I don't see any reason to have this file in ace; it is a system - header file. And from [Bug 722], our version is out of date anyway. - - * ace/OS.h: - - Changed to include system version of ws2tcpip.h - - * ace/Makefile.am: - * ace/ace-dll.icc: - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - - Removed references to ws2tcpip.h. - - * ace/SOCK_Connect.cpp: - - Changed get_ip_interfaces to remove a memory error. Thanks to - Viatcheslav Batenine <slavikb@infra2000.com> for helping out with - this. - - * ace/SOCK_Dgram_Mcast.cpp: - - It looks like the change made on: - - Fri Jan 26 11:18:15 2001 Douglas C. Schmidt ... - - doesn't work on Win32. Reverted back to the old scheme for Win32 - only. - -Thu Feb 8 00:34:57 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * include/makeinclude/platform_sunos5_g++.GNU: Added support for - -fno-exception when exceptions=0 is given to the Makefile. - Thanks to Christian v. Mueffling <cvm@aiss.de> for reporting - this. - -Wed Feb 7 23:02:46 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/SUN_Proactor.cpp: Fixed the cancel_aiocb() method and added a - new overridden cancel_aio() method. Thanks to Alexander Libman - <Alibman@baltimore.com> for contributing this. - -Thu Feb 8 02:09:05 2001 Pradeep Gore <pradeep@cs.wustl.edu> - - * examples/QOS/Makefile: - * examples/QOS/client.dsp: - * examples/QOS/server.dsp: - Modified to use the ACE_QoS lib. - * Receiver_QoS_Event_Handler.cpp: - * Sender_QoS_Event_Handler.cpp: - Added missing Log_Msg.h for ACE_DEBUG. - Other files were modified to reflect changed directory location - of AQosA imclude files. - -Thu Feb 8 00:17:43 2001 Pradeep Gore <pradeep@cs.wustl.edu> - - * ace/QoS_Decorator.cpp: - * ace/QoS_Session_Factory.cpp: - * ace/SOCK_Dgram_Mcast_QoS.cpp: - * ace/QoS_Decorator.h: - * ace/QoS_Session_Factory.h: - * ace/SOCK_Dgram_Mcast_QoS.h: - * ace/QoS_Manager.cpp: - * ace/QoS_Session_Impl.cpp: - * ace/SOCK_Dgram_Mcast_QoS.i: - * ace/QoS_Manager.h: - * ace/QoS_Session_Impl.h: - * ace/QoS_Session_Impl.i: - Moved the AQoSA classes to ace/QoS directory. - - * ace/Makefile: - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Removed the QoS related files, added QoS directory to build. - - * ace/Qos/Makefile - * ace/QoS/ACE_QoS.dsw: - * ace/QoS/ACE_QoS.dsp: - * ace/QoS/ACE_QoS_Lib.dsp: - * ace/QoS/ACE_QoS_Export.h: - Added Makefile and MSVC project files. - Thanks to Craig Rodrigues <crodrigu@bbn.com> for suggesting this - change and providing the patch. - -Wed Feb 7 11:34:56 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/Message_Queue_Test_Ex.cpp: - Fix build problems for single threaded environments. - -Wed Feb 7 09:03:22 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * apps/Gateway/Gateway/Event_Channel.cpp (initiate_acceptors): Fixed - incorrect if/else branching. Thanks to Lu Yunhai - <luyunhai@huawei.com> for reporting this. - -Tue Feb 6 23:43:49 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * apps/Gateway/Peer/Peer.cpp (await_events): Fixed the use of - %s to be %*s since the string may not be nul terminated! Thanks - to Lu Yunhai <luyunhai@huawei.com> for reporting this. - -Tue Feb 6 20:11:28 2001 Krishnakumar B <kitty@cs.wustl.edu> - - * include/makeinclude/platform_sunos5_sunc++.GNU: - - Remove double inclusion of $(CFLAGS) for Sun CC 5.0. - -Tue Feb 6 19:30:26 2001 Krishnakumar B <kitty@cs.wustl.edu> - - * ace/Malloc_T.cpp (shared_malloc): - Added a #ifdef to remove the warnings from Digital Tru64 cxx. This - is a temporary workaround. TODO: Change ACE_SEH_* macros so that such - hacks are unnecessary. - -Tue Feb 6 19:23:16 2001 Krishnakumar B <kitty@cs.wustl.edu> - - * include/makeinclude/platform_sunos5_sunc++.GNU: - Complete reverting the changes made by Irfan on Sat Jan 27 - 01:06:09 2001. This file was missed in the last revert done by me. - -Tue Feb 06 19:03:35 2001 Steve Huston <shuston@riverace.com> - - * include/makeinclude/platform_sunos5_sunc++.GNU: For C++ 5, make sure - to add CFLAGS into CCFLAGS, even if no other options are added. Else - things get built without -mt. - -Tue Feb 06 18:37:41 2001 Steve Huston <shuston@riverace.com> - - * tests/Thread_Mutex_Test.cpp: Changed wording of the message for - "timed acquire" not supported so as not to trip the error catcher - in run_tests.pl. - -Tue Feb 06 17:55:28 2001 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/post_completions.cpp: Allow this to - run with AIOCB_Proactor. - - * ace/Asynch_IO.{h cpp}: Added ACE_Handler::handle (ACE_HANDLE) - function to set the handle; changed ACE_HANDLE ACE_Handler::handle - to return the actual value. - - * ace/Asynch_Acceptor.cpp (handle_accept): Call ACE_Handler::handle - to set the handle value for the new handler before calling its - open() method. - -Tue Feb 06 17:16:43 2001 Steve Huston <shuston@riverace.com> - - * tests/MEM_Stream_Test.cpp: - * tests/MEM_Stream_Test.h: New file; moved definition of Echo_Handler - from MEM_Stream_Test.cpp to this file to make it visible to AIX - C++ 3.6.6 at template instantiation time. - -Mon Feb 5 16:19:20 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/ACE.cpp: ACE_TRACE ("ACE::basename") should be ACE_TRACE ("ACE::diname"). - Thanks to Lu Yunhai <luyunhai@huawei.com> for reporting this. - - * ace/Basic_Types.h: Changed the ACE_BIG_ENDIAN and ACE_LITTLE_ENDIAN - macros to use the form 0x0123 rather than 0123X. Thanks to - Craig Rodrigues <crodrigu@bbn.com> for helping find this - problem. - -Mon Feb 5 18:20:11 2001 Krishnakumar B <kitty@cs.wustl.edu> - - * ace/config-sunos5.5.h (ACE_USES_OLD_IOSTREAMS): - - Reverted the change to config-sunos5.5.h and turned on - ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION, - ACE_TEMPLLATES_REQUIRE_SOURCE and ACE_USES_OLD_IOSTREAMS for the - SunCC 5.0 compiler. - -Mon Feb 5 16:19:20 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * examples/RMCast/Send_File/Receiver.cpp (init): Replaced - a hard-coded file permission of 0644 with - ACE_DEFAULT_FILE_PERMS. Thanks to Chris Kohlhoff - <chris@kohlhoff.com> for reporting this. - -Mon Feb 5 13:00:17 2001 Krishnakumar B <kitty@cs.wustl.edu> - - * tests/Thread_Mutex_Test.cpp: (reported_notsup) - Removed a warning about defined but not used. - -Sat Feb 3 14:41:17 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS.h: - * ace/config-win32-msvc.h: - - Fixed problems with LLSEEK and ACE_stat on Windows CE. - -Sat Feb 3 14:12:36 2001 Darrell Brunsch <brunsch@uci.edu> - - * tests/Config_Test.cpp: - * tests/Config_Test.h: - * tests/Log_Msg_Test.cpp: - - Fixed ACE_USES_WCHAR problems. - -Fri Feb 02 18:36:42 2001 Steve Huston <shuston@riverace.com> - - * ace/config-linux-common.h: Added #define ACE_POSIX_AIOCB_PROACTOR - unless the user #defines ACE_POSIX_SIG_PROACTOR before including - config-linux.h. (At least prior to 2.4 kernels) queueing signals - across threads does not work - it fails silently, which breaks - basic functionality of the async model - like asynchronously - accepting TCP connections - and pretty much prevents multi-threaded - work with timers and probably other async operations. - - * examples/Reactor/Proactor/test_proactor.cpp: Disabled the ACE_DEBUG - calls that display message buffers - they're often too large and - overrun the ACE_Log_Msg buffers and crash the program. - -Fri Feb 2 08:38:37 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/WFMO_Reactor.cpp (handler): Set the existing_masks variable to 0 - to avoid warnings from static analysis tools. Thanks to Ivan - Murphy for reporting this. - -Thu Feb 01 22:00:17 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> - - * tests/Message_Queue_Test_Ex.cpp - - Fixed the bugs which were giving runtime error on - Win32 - removed "queue_type" from single_thread_performance_test - and performance_test functions. Now these funtions dont - have args. - - * tests/tests.dsw - - Just an update of the workspace. - -Thu Feb 1 21:00:57 2001 Frank Hunleth <fhunleth@cs.wustl.edu> - - * bin/auto_compile_win32.pl: - * bin/run_all_list.pm: - - Added TAO RT Mutex unit tests to auto build and test - lists. - -Thu Feb 01 18:52:27 2001 Angelo Corsaro <corsaro@cs.wustl.edu> - - * RTJava: - Added Directory for RTJava related research. Check the - ChangeLog included in the newly directory for more info. - -Thu Feb 01 18:23:17 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> - - * tests/Log_Msg_Test.dsp: - * tests/Config_Test.dsp: - - Added these files. - * tests/tests.dsw: - - Added the above two projects to the workspace. - -Thu Feb 1 18:01:26 2001 Luther J Baker <luther@cs.wustl.edu> - - * ace/OS.i (mutex_init): - - Removed call into PACE. - -Thu Feb 01 18:21:15 2001 Steve Huston <shuston@riverace.com> - - * tests/Thread_Mutex_Test.cpp: Only report "operation not supported" - once for a failed ACE_Thread_Mutex::acquire (ACE_Time_Value &). - Also, if it reports ENOTSUP while ACE_HAS_MUTEX_TIMEOUT is - defined, warns the user that it's probably the wrong setting. - -Thu Feb 01 17:36:28 2001 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/test_proactor3.cpp: Fixed a non-constant - array dimension and some output formatting. - -Thu Feb 01 17:07:35 2001 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/post_completions.cpp: Removed extraneous - 'd' from the 'count' display. - -Thu Feb 01 15:33:26 2001 Steve Huston <shuston@riverace.com> - - * ace/Reactor.h (purge_pending_notifications): - * ace/WFMO_Reactor.h (purge_pending_notifications): - * ace/Select_Reactor_Base.h (purge_pending_notifications): - Removed the default argument value - callers must now explicitly - specify a 0 ACE_Event_Handler* to remove all handler notifications. - Thanks to Edan Ayal <edana@bandwiz.com> for arguing this point. - -Thu Feb 1 09:57:41 2001 Jeff Parsons <parsons@cs.wustl.edu> - - * ace/SString.i: - - Changed behavior of ACE_WString::rep to be the same - as ACE_CString::rep, that is, to return an empty - (w)string rather than a null (w)string when the length - is 0. Thanks to Johnny Willemsen <johnny.willemsen@meco.nl> - for pointing out this discrepancy. - -Thu Feb 1 09:42:41 2001 Chad Elliott <elliott_c@ociweb.com> - - * include/makeinclude/platform_chorus4.x_g++.GNU: - - Modification to allow building for Chorus 4.x on x86. CPU will be - set to x86, but CLX_TYPE will be set to i486-elf-sysv4. - -Thu Feb 01 10:29:31 2001 Steve Huston <shuston@riverace.com> - - * ace/Synch.i (ACE_Null_Mutex::acquire (ACE_Time_Value&)): Removed - the arg name to fix "unused argument" warning from g++. - -Wed Jan 31 22:01:00 2001 Rick Stille <stille_r@ociweb.com> - * ace/OS.cpp(operator FILETIME): Corrected an error in the Jan 26 GHS - revision. The term "ACE_Time_Value::FILETIME_to_timval_skew" had been - omitted from the calculation. - -Wed Jan 31 18:43:26 2001 Krishnakumar B <kitty@cs.wustl.edu> - - * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test): - Removed the warning about queue_type using ACE_UNUSED_ARG. - -Wed Jan 31 17:27:35 2001 Steve Huston <shuston@riverace.com> - - * ace/Acceptor.cpp (ACE_Oneshot_Acceptor::handle_input): Unregister - the acceptor from the reactor before doing the shared_accept call - to guard against the use-case where the acceptor is destroyed during - the service handler activation sequence. - -Wed Jan 31 15:55:23 2001 Frank Hunleth <fhunleth@cs.wustl.edu> - - * ace/Synch.i: - Added ACE_Null_Mutex::acquire (ACE_Time_Value &tv) - to fix link error. - -Wed Jan 31 15:12:00 2001 Jeff Parsons <parsons@cs.wustl.edu> - - * ace/CDR_Stream.h: - - Made method do_byte_swap() public. If ACE_ENABLE_SWAP_ON_WRITE - is defined, TAO_GIOP_Message_Base::format_message() and - TAO_GIOP_Message_Lite::format_message() both call this method. - Thanks to Paul Rubel <prubel@bbn.com> for reporting this bug. - -Wed Jan 31 12:19:51 2001 Steve Huston <shuston@riverace.com> - - * docs/tutorials/Chap_2/ex03.html, ex04.html: Fixed these example - programs to 1) send the Nul terminators with the strings, - 2) allow enough space on the recv to get it all, 3) return a - value from main. - - * docs/tutorials/Chap_2/Chap_2.zip: Updated the above examples. - -Wed Jan 31 06:43:27 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Message_Queue_T.cpp: Make sure that dequeue_head() returns - the number of items still on the queue. Thanks to Johnny - Willemsen for reporting this. - -Tue Jan 30 21:39:15 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> - - * tests/Log_Msg_Test.cpp: In funtion test_ostream(), removed the - if condition to check if ACE_OS::unlink() succeeds. Also set - the ostream to NULL before calling ACE_ERROR_RETURN(). Thanks - to Mike Curtis <mccurry@my-deja.com> for pointing out problem - caused when ACE_OS::unlink() fails. Thanks to Doug in helping - fix the problem. - -Tue Jan 30 18:04:08 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test): - Zap the Win32 and VxWorks-specific code from this function. - Thanks to Sharath for reporting this. - -Tue Jan 30 11:34:26 2001 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/test_aiosig_ace.cpp: Fixed a bunch - of mis-coded ACE_ERROR_RETURNs; added a explicit queued completion, - and disabled the display of buffers that may overrun ACE_Log_Msg's - internal buffers to prevent spurious crashes. - -Tue Jan 30 11:26:42 2001 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/post_completions.cpp: Added a count - to be sure that all expected completions are delivered, and - print error message if not. - -Tue Jan 30 10:47:52 2001 Steve Huston <shuston@riverace.com> - - * ace/Select_Reactor_Base.cpp - (ACE_Select_Reactor_Notify::purge_pending_notifications): - * ace/WFMO_Reactor.cpp - (ACE_WFMO_Reactor_Notify::purge_pending_notifications): Changed - to not purge notifications destined for the reactor only - (notification buffer with 0 handler value). Thanks to Edan - Ayal <edana@bandwiz.com> for this fix. - -Tue Jan 30 01:05:51 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test): - Add cases for VxWorks and NT. Thanks to Sharath for reporting - this. - - * ace/OS.h: #define _SC_AIO_MAX to 1 if it's not set by default. - Thanks to Jean-Francois Daune <Daune@IBA.be> for reporting this - fix for VxWorks. - -Mon Jan 20 18:36:41 2001 Steve Huston <shuston@riverace.com> - - * ace/Message_Queue_T.h (ACE_Message_Queue_Ex): Use _USE - rather than _DECL to define the ACE_Message_Queue - fixes - compile error. - -Mon Jan 29 17:29:31 2001 Steve Huston <shuston@riverace.com> - - * ace/Message_Queue_T.{h i cpp}: Corrected a bunch of references - to Message_Queue_Ex's queue_ member to use . rather than -> - and removed the ACE_NEW to allocate it (follow-ups from Doug's - Sun Jan 28 08:32:07 2001 change). Fixed other compile - errors to allow tests/Message_Queue_Test_Ex.cpp to build. - FYI... whomever added this, it probably should have been named - Message_Queue_Ex_Test to conform. - -Mon Jan 29 15:30:27 2001 Steve Huston <shuston@riverace.com> - - * ace/POSIX_Proactor.{h cpp} (ACE_POSIX_SIG_Proactor): Don't - mask/block all signals, just the one(s) being used for this - sig proactor instance. Blocking everything can break other - things, such as debuggers and the ability to kill a program. - Also, don't setup a handler for the signals being blocked/waited - as this is a combination whose behavior is undefined. - -Sun Jan 28 08:39:17 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/Thread_Mutex_Test.cpp: - Fixed use of ACE_TEXT and string concatenation. - -Sun Jan 28 08:03:08 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/tests.dsw: - * tests/Message_Queue_Test_Ex.dsp: - Add NT project files for the new test - -Sun Jan 28 08:32:07 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * netsvcs/lib/Client_Logging_Handler.cpp: Fixed the order in which - the iostream messages are logged so that we don't bomb out when - the VERBOSE option is enabled. Thanks to Craig Rodrigues - <crodrigu@bbn.com> for helping find this problem. - - * ace/Message_Queue_T.h: Make sure the lock() forwarding method - forwards to queue_.lock(). - - * ace/Message_Queue_T.{h,i,cpp}: There's no reason to dynamically - allocate the implementation of ACE_Message_Queue_Ex -- instead - it can be simply an instance of ACE_Message_Queue. - - * ace/Message_Queue_T.h: Make sure that the methods on - ACE_Message_Queue_Ex are properly virtual. Thanks to Kitty for - pointing this out. - -Sat Jan 27 19:40:36 2001 Ossama Othman <ossama@uci.edu> - - * bin/auto_run_tests.lst: - - Added TAO's Portable Interceptor "Service_Context_Manipulation" - test to the list of tests to run. - -Sat Jan 27 19:34:20 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * tests/Config_Test.{h,cpp}: Fixed the use of "bool," which is - not supported on older compilers. Thanks to Kitty for reporting - this. - -Sat Jan 27 15:22:03 2001 Ossama Othman <ossama@uci.edu> - - * tests/Thread_Mutex_Test.cpp (test): - - Added code that tests mutex timeout functionality. - -Sat Jan 27 15:16:33 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/POSIX_Proactor.h: Replace ACE_Thread_Mutex with ACE_SYNCH_MUTEX - to avoid the need for conditional compilation. - - * ace/SUN_Proactor.h: Don't use ACE_Condition<ACE_Thread_Mutex> - but instead use the ACE_SYNCH_CONDITION, which also avoids the - need to conditionally compile for threaded platforms. - -Sat Jan 27 13:29:51 2001 Ossama Othman <ossama@uci.edu> - - * ace/config-linux.h: - - Declare the pthread_mutex_timedlock() prototype as an - 'extern "C"' function. This fixes an "unresolved symbol" link - error. - -Sat Jan 27 10:39:28 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/nightlybuilds/builds.lst: - Apparently the blank in 'RedHat 7.0' breaks the scoreboard. - -Sat Jan 27 01:06:09 2001 Irfan Pyarali <irfan@cs.wustl.edu> - - * include/makeinclude/platform_sunos5_sunc++.GNU: SPRO 5.0 - compiler should be able to support automatic template - instantiation. Also, standard C++ library should be ok. -g was - added to DCCFLAGS. - - * ace/config-sunos5.5.h: Turned off - ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION, - ACE_TEMPLATES_REQUIRE_SOURCE and ACE_USES_OLD_IOSTREAMS for the - SPRO 5.0 compiler. - - Thanks to J. Russell Noseworthy <rnosewor@objectsciences.com> - for contributing the above patches. - -Sat Jan 27 00:37:26 2001 Irfan Pyarali <irfan@cs.wustl.edu> - - * ace/OS.i: - - - (mutex_lock): Windows code must use relative time since that - is what WaitForSingleObject() expects. Also, fixed extra - "return" before ACE_NOTSUP_RETURN. - - - (thread_mutex_lock): Made thread_mutex_lock() with timeout - close to the thread_mutex_lock() without timeouts. - -Fri Jan 26 21:53:45 2001 Ossama Othman <ossama@uci.edu> - - * ace/OS.h: - * ace/OS.i (thread_mutex_lock): - - Added an overloaded version of this method that accepts a - timeout argument. It delegates to the standard - ACE_OS::mutex_lock() method on non-Windows platforms. - Otherwise, it returns with an ENOTSUP. - - The addition of this method was necessary to fix a compile - problem related to the ACE_Thread_Mutex class. - - * ace/Synch.i (acquire): - - In ACE_Thread_Mutex::acquire() that accepts a timeout argument, - call the corresponding ACE_OS::thread_mutex_lock() method. This - fixes compile-time error on MS Windows builds due to the fact - that ACE_mutex_t and ACE_thread_mutex_t are different types on - that platform. - -Fri Jan 26 17:31:26 2001 Ossama Othman <ossama@uci.edu> - - * ace/OS.i (mutex_lock): - - Fixed unused argument warnings that occured when compiling for - the single threaded case. - -Fri Jan 26 16:58:03 2001 Ossama Othman <ossama@uci.edu> - - * ace/config-linux.h: - - glibc 2.1.x doesn't have the (very useful) __GLIBC_PREREQ - macro. Use a preprocessor test that doesn't rely on it. - -Fri Jan 26 16:48:06 2001 Ossama Othman <ossama@uci.edu> - - * ace/config-qnx-neutrino.h (ACE_HAS_MUTEX_TIMEOUTS): - * ace/config-qnx-rtp.h (ACE_HAS_MUTEX_TIMEOUTS): - - QNX supports pthread_mutex_timedlock(). Yes! - -Fri Jan 26 17:50:38 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/config-win32-common.h: - ace/config-vxworks-5.x.h: Added ACE_HAS_MUTEX_TIMEOUTS macro. - - * ace/OS.i: Added timed mutex operations for Win32, VxWorks, and - pSoS. - -Fri Jan 26 16:31:15 2001 Ossama Othman <ossama@uci.edu> - - * ace/OS.h (mutex_lock): - - Updated documentation for the version of this method that - accepts a timeout value. - - * ace/OS.i (mutex_lock): - - If the platform does not support timed mutexes, then return with - an ENOTSUP. - - * ace/Process_Mutex.h: - * ace/Process_Mutex.inl (acquire): - - Added version of this method that accepts a timeout value. - -Fri Jan 26 17:50:38 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp (report_stats): - Fixed some unintentional tabs. Thanks to Mike Curtis for - reporting this! - -Fri Jan 26 15:34:01 2001 Ossama Othman <ossama@uci.edu> - - * ace/OS.h: - * ace/OS.i (mutex_timedlock, mutex_lock): - * ace/Synch.i (acquire): - - Renamed the ACE_OS::mutex_timedlock() to the overloaded - ACE_OS::mutex_lock(). - -Fri Jan 26 14:13:32 2001 Ossama Othman <ossama@uci.edu> - - * ace/OS.h: - * ace/OS.i (mutex_timedlock): - - Wrapped the pthread_mutex_timedlock() function. It times out if - a lock hasn't been acquired by the given absolute time. - - * ace/Synch.h: - * ace/Synch.i (acquire): - - Added versions of this method that accept an ACE_Time_Value. - They are used to prevent blocking definitely while waiting for a - given mutex to become available. - - * ace/config-linux.h (ACE_HAS_MUTEX_TIMEOUTS): - - glibc 2.2.x supports the pthread_mutex_timedlock() function. - - * ace/config-linux-common.h: - - Undefine ACE_LACKS_{LLSEEK,LSEEK64}_PROTOTYPE prior to include - the KCC configuration file. Thanks to Jeff Greif - <jgreif@befree.com> for reporting this. - - * ace/README: - - Added ACE_HAS_MUTEX_TIMEOUTS to the list of ACE macros. - -Fri Jan 26 11:18:15 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Log_Msg.cpp (dump): Fixed some unintentional tabs. Thanks - to Mike Curtis for reporting this! - - * ace/SOCK_Dgram_Mcast.cpp (open): Modified the call to - ACE_SOCK_Dgram::shared_open() to just pass in this->mcast_ - rather than making a local copy that just contained the port - number. Thanks to Keith Nicewarner <knicewar@erg.sri.com> for - reporting this. - - * tests/Makefile.bor (TESTS): Added Message_Queue_Test_Ex.cpp. - -Fri Jan 26 13:37:30 2001 Luther J Baker <luther@cs.wustl.edu> - - * ace/OS.h: - - If using PACE, ACE_stat typedefs to pace_stat_s. - -Fri Jan 26 11:18:15 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * tests/Message_Queue_Test_Ex.cpp: Fixed some ASYS_* macros with - ACE_* stuff. Thanks to Darrell for reporting this. - - * ace/Message_Queue_T.h, - * ace/Message_Queue_T.i, - * ace/Message_Queue_T.cpp: - Added the ACE_Message_Queue_Ex, which provides a message queue - abstraction whose type is templatized. Thanks to Michael Vitalo - <mvitalo@sprynet.com> for contributing this. - - * tests/run_tests.lst: - * tests/run_test.lst: - * tests: Added support for the new Message_Queue_Test_Ex.cpp file. - Thanks to Michael Vitalo <mvitalo@sprynet.com> for contributing - this. - -Fri Jan 26 09:33:20 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - Add TAO/tests/Object_Loader to the list - - * include/makeinclude/rules.lib.GNU: - Allow both .cpp and .c files in the LSRC macro. This should - let the PACE guys use the real name for their files, and - generate proper dependencies. - -Fri Jan 26 02:16:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * tests/OS_Test.cpp: - - Changed a use of struct stat to ACE_stat. - -Thu Jan 25 19:16:48 2001 Ossama Othman <ossama@uci.edu> - - * ace/config-linux.h: - - Only define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS and - ACE_LACKS_THREAD_STACK_SIZE for glibc < 2.1. glibc 2.1+ has the - netdb reentrant functions (albeit with funky signatures), and it - has pthread_attr_setstacksize(). - - * ace/OS.h: - - Removed trailing whitespace. - - * ace/OS.i (getprotobyname_r, getprotobynumber_r, gethostbyaddr_r, - gethostbyname_r, getservbyname_r): - - Added glibc-specific calls to these functions. This allows us - to avoid grabbing a lock! Thanks to Ben Strong - <bstrong@bluelark.com> for providing the patch. - - * THANKS: - - Added Ben Strong to list of contributors. - -Thu Jan 25 20:10:24 2001 Irfan Pyarali <irfan@cs.wustl.edu> - - * include/makeinclude/platform_irix6.x_sgic++.GNU: - * include/makeinclude/platform_irix5.3_sgic++.GNU: - - Removed -rpath "$(ACE_ROOT)/ace" from LDFLAGS. - - * ace/Message_Queue_T.{h,i}: Moved code from .i to .h to work - around a compiler bug. The Sun Forte 6 (CC 5.1) compiler is - only happy if this is in the header file. - - * ace/Message_Block_T.cpp: Fixed template parameter name mismatch - between declaration and definition. - - Thanks to J. Russell Noseworthy <rnosewor@objectsciences.com> - for contributing the above patches. - -Thu Jan 25 10:50:35 2001 Steve Huston <shuston@riverace.com> - - * ace/Reactor.h: Add comments to schedule_wakeup/cancel_wakeup that - they don't cause an immediate re-examination of the masks like - register_handler does. Thanks to Oscar Rodriquez - <Oscar.Rodriquez@eln.ericsson.se> for prompting this clarification. - - * ace/WFMO_Reactor.cpp (ACE_WFMO_Reactor_Notify::handle_signal): - The call to ACE_Message_Queue::dequeue_head may change the - ACE_Time_Value passed to it, so don't override ACE_Time_Value::zero's - const-ness, lest ACE_Time_Value::zero take on some strange new value. - Thanks to Edan Ayal <edana@bandwiz.com> for this fix. - -Thu Jan 25 05:34:58 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Connector.cpp (connector): Added an ACE_const_cast() to - get rid of the const for the accessor method! - - * ace/Acceptor.cpp (acceptor): Added an ACE_const_cast() to - get rid of the const for the accessor method! - - * ace/Log_Msg.{h,cpp}, - * ace/Trace.{h,cpp}: The Log_Msg -I flag now uses the current - ACE_Trace nesting level rather than always using 1. Thanks to - Mike Curtis for providing this. - -Wed Jan 24 19:43:24 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/OS.i (lstat,stat): Separated win32 cases out. - -Wed Jan 24 18:15:59 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/OS.i (fstat): Oops, wrong version of this function was - modified. - -Wed Jan 24 14:44:12 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/FILE.cpp: - * ace/Filecache.cpp: - * ace/Filecache.h: - * ace/OS.h: - * ace/OS.i: - * ace/OS.cpp: Changed the signature of <stat>, <fstat>, and - <lstat> to use ACE_stat instead of "struct stat". Also changed - to use _fstat and _stat on win32 instead of <fstat> and <stat> - directly. Also replaced several use of "struct stat" to - ACE_stat. Thanks to Mike Anderson <manderson@sonusnet.com> for - reporting this. [Bug 762] - -Wed Jan 24 16:13:10 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/OS_Dirent.cpp: Fixed a bug in the readdir_emulation() method. - Thanks to Yung Trinh <ytrinh@email.com> for reporting this. - - * ace/Connector.{h,cpp}: Added a new connector() accessor to - return the underlying ACE_PEER_CONNECTOR. Thanks to Pedro - Brandao <pbrandao@inescn.pt> for suggesting this. - -Wed Jan 24 10:17:03 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Makefile: - Add dependencies (again). They were lost is a previous commit. - - * */Makefile: - Update dependencies (yet another time). - -Wed Jan 24 09:41:54 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Configuration.cpp: - Fixed warning under gcc. Also made the for() loop more - ACE-like, not better, but at least consistent. - -Wed Jan 24 08:56:16 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.h: - The changed to document the ACE_SVC_* macros were accidentally - lost, fixed. - - * ace/Service_Config.cpp: - New debug message when processing an explicit directive, useful - to find out when and why TAO invokes - ACE_Service_Config::process_directive() directly. - As with all other debug messages in this file it only shows up - if ACE::debug() returns non-zero. - -Wed Jan 24 01:44:47 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Configuration.cpp (expand_path): Fixed a bug with assignment to - temp in the loop. Thanks to Jonathan Reis for reporting this! - -Tue Jan 23 17:02:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/msvc_auto_compile.pl: - - Removed PACE until we figure out how to handle it in the - DLL builds. - -Tue Jan 23 16:50:35 2001 Darrell Brunsch <brunsch@uci.edu> - - * tests/Dirent_Test.dsp: - - Updated to make consistent with the rest of the dsps in - this directory in regards to output directories and non-use - of ACE_ROOT. - - * tests/Dirent_Test.cpp: - - Updated wide character compatibility and removed the use - of ACE_ROOT (now looks at ../tests", which should give - the same results). - - * tests/run_test.lst: - - Added the Dirent_Test to the list - - * tests/version_tests/Dirent_Test.dsp: (added) - * tests/version_tests/Refcounted_Auto_Ptr_Test.dsp: (added) - * tests/version_tests/version_tests.dsw: - - Used the create_vt_dsps.pl script to update this directory. - -Tue Jan 23 18:03:26 2001 Jeff Parsons <parsons@cs.wustl.edu> - - * ace/CDR_Stream.cpp: - - Added patches to read_8 and write_8 sent in by - Keith Nicewarner <knicewar@erg.sri.com> to deal - with the ARM byte format for doubles - -Tue Jan 23 15:06:18 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/Configuration.cpp: - * ace/OS_Dirent.cpp: - - Updated wide character compatibility. - - * ace/ace_dll.dsp: - - Removed unneeded verbose library option. - -Tue Jan 23 10:54:14 2001 Jeff Parsons <parsons@cs.wustl.edu> - - * ace/config-doxygen.h: - * bin/autoconf_compile: - - Removed all occurrences of 'smart_proxies' and 'interface_repo'. - These are no longer necessary. - - * include/makeinclude/ace_flags.bor: - - Added necessary variables to go along with the Borland - makefiles for the new libraries tao/Domain and - tao/IFR_Client. - -Mon Jan 22 17:01:17 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS_String.cpp: - * ace/OS_String.inl: - * ace/ace_wchar.inl: - * ace/config-qnx-rtp.h: - - ACE_HAS_WCHAR fixes. Support is really bad on QNX RTP - so we just end up emulating most everything. As far as - I could tell, there isn't even a way to convert between - the two types of strings. - - * ace/OS_Dirent.cpp: - - Rewrote a paragraph to remove the use of "/*" in a larger - /*...*/ comment, since gcc complains about it. - - * tests/Message_Queue_Test.cpp: - - Backed out some changes to it on Jan 21, since it had - problems and I couldn't find any ChangeLog entry for the - changes (mistakenly checked in?). - -Mon Jan 22 13:51:11 2001 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/OS_Dirent.cpp (opendir_emulation): Added code to make the - emmulation work properly on Win32. Thanks to Edwin Wrench - <edwin.wrench@itt.com> for finding this. - - * tests/Dirent_Test.cpp: - tests/Makefile: - tests/run_tests.bat: - tests/run_tests.lst: Added test to verify correctness of above - fix. This test attempts to scan $ACE_ROOT/tests and will fail if - the number of entries is 0 or 1. - -Mon Jan 22 10:21:20 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Map_Manager.h: Clarify that find() returns 0, rather than - saying "a non-negative number". Thanks to Albert Wijna - <albert.wijnja@meco.nl> for clarifying this. - -Mon Jan 22 15:38:12 2001 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Containers_T.h: - ace/Containers_T.cpp: - Added operator* to the ACE_Ordered_Multiset_Iterator class - - * tests/Ordmultiset_test.cpp - Expanded test for the new operator* of the ACE_Ordered_Multiset_ - Iterator class - -Sat Jan 20 14:53:07 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Configuration.{h,cpp}: Fixed some problems with const char * - that was busting the compilation. Thanks to Carlos for pointing - this out. - - * ace/Configuration.{h,cpp}: Added several fixes for - mistakes with memory management and other minor problems. - Thanks to Jonathan Reis <reis@stentorsoft.com> for contributing - these fixes! - -Sat Jan 20 10:49:05 2001 Carlos O'Ryan <coryan@uci.edu> - - * docs/ACE-guidelines.html: - Update the guidelines to point people to the Doxygen - documentation, instead of the now abandoned OSE tools. - -Sat Jan 20 10:21:08 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.cpp: - Another pass fixing problems with ACE_BEGINTHREADEX() under - Win32, this time Win32 is working fine. - -Sat Jan 20 10:20:50 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * doc/tutorials: Integrated the new Service Configurator tutorial - into the main tutorials page. - -Fri Jan 19 16:57:43 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Svc_Handler.h: Updated the comments to explain why - operator new is overloaded. Thanks to Kirill Kuolechov - <Kirill.Koulechov@gmx.net> for reporting this. - -Fri Jan 19 15:39:43 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.cpp: - QNX/RTP has the same problem that LynxOS has, after fork() is - invoked trying to destroy the preallocated objects in - ACE_OS_Object_Manager fails. - Factor out this variation in a new macro: - ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK - - * ace/config-lynxos.h: - * ace/config-qnx-rtp.h: - Define the new macro for the two relevant platforms. - - * ace/README: - Document the macro. - -Fri Jan 19 15:08:37 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.cpp: - I disabled too much in the commit at 10:50am... Now it seems to - be OK. - - * ace/Makefile: - Remove extra -v - -Fri Jan 19 13:16:49 2001 Priyanka Gontla <pgontla@ece.uci.edu> - - * include/makeinclude/platform_hpux_aCC.GNU: - Added new options to the CCFLAGS so that the known future errors - arising because of HPUX are suppressed. - -Fri Jan 19 13:01:13 2001 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/SSL/Makefile: - Put a check for defining ACE_SHLIBS to get it compiled on HPUX. - - * ace/RMCast/Makefile: - * ace/Makefile : - Updated dependencies - - * ace/config-all.h - Fix a build problem on HP-UX 11.00 with aCC A.03.25. The macro - used to determine the use of the std namespace changed from - RWSTD_NO_NAMESPACE to _NAMESPACE_STD. NOTE: I did preserve the - check for RWSTD_NO_NAMESPACE with aCC versions less than A.03.25. - - Thanks to Chad Elliott <elliott_c@ociweb.com> for making this fix. - -Fri Jan 19 11:22:42 2001 Priyanka Gontla <pgontla@ece.uci.edu> - - * docs/tutorials/022/client_handler.cpp : - * docs/tutorials/022/client_hander.h : - * docs/tutorials/022/Acceptor_Service.cpp : - * docs/tutorials/022/Acceptor_Service.h : - * docs/tutorials/022/server.cpp : - * docs/tutorials/022/Makefile : - - * docs/tutorials/022/client/Makefile: - * docs/tutorials/022/client/client.cpp: - - * docs/tutorials/022/page01.html: - * docs/tutorials/022/page02.html: - * docs/tutorials/022/page03.html: - * docs/tutorials/022/page04.html: - * docs/tutorials/022/page05.html: - - Developed a new tutorial for the ACE_Service_Configurator. - Based on the ACE tutorial 005. - -Fri Jan 19 10:50:11 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.cpp: - Use the Green Hills specific tricks *only* if we are compiling - under Green Hills, and only for the platform where they make - sense (in this case Win32). - -Thu Jan 18 23:21:53 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.h: - Document the infamous ACE_STATIC_SVC macros. - -Thu Jan 18 23:50:35 2001 Rick Stille <stille_r@ociweb.com> - - The Green Hills(GHS) Native x86 compiler does not provide support - for 64-bit integers, structural exceptions, or DLL's. Thus the - keywords __int64, __try, __dllimport, etc., are not defined. In - addition, exceptions do not work in a multi-threaded environment. - The following changes were made to address these shortcomings. - - * ace/Basic_Types.h: Because the GHS compiler has both - ACE_LACKS_LONGLONG_T and ACE_WIN32 defined, the - ACE_LACKS_LONGLONG_T macro must appear first, so the order of - these two macros has been reversed in the defines of both - ACE_UINT64_LITERAL(n) and ACE_UINT64_DBLCAST_ADAPTER(n). - - * ace/config-win32-common.h: The typedef of ACE_UINT64 as an - unsigned __int64 and the define of ACE_HAS_LLSEEK are blocked - out for ghs. - - * ace/config-win32-ghs.h: This is the new configuration file for - Green Hills/Win32. - - * ace/Configuration.cpp(resolve_key): The "return 0" at the end of - this function has been blocked out for ghs to eliminate an - "unreachable code" warning. - - * ace/Event_Handler_T.h(handle_signal): The type of the "signum" - parameter has been changed to "int" so that it matches the type - in the Event_Handler class. - - * ace/Event_Handler_T.i(handle_signal): The type of the "signum" - parameter has been changed to "int" so that it matches the type - in the Event_Handler class. - - * ace/High_Res_Timer.cpp(global_scale_factor): The Native x86 - compiler defines "QuadPart" in the LARGE_INTEGER union as a - "double," so it cannot be used in the calculation of - "global_scale_factor." Instead, for GHS, the low and high parts - of the LARGE_INTEGER structure are copied into an ACE_UINT64 - structure (which is actually an ACE_U_LongLong) and the - ACE_U_LongLong operators are used. The code segment if - (ACE_High_Res_Timer::global_scale_factor_ == 1u) // Failed to - retrieve CPU speed from system, so calculate it. - ACE_High_Res_Timer::calibrate (); is unreachable hen ACE_WIN32 - is defined, so it has been blocked out for Win32 platforms to - silence the Green Hills "unreachable code" warning. - - * ace/High_Res_Timer.i(hrtime_to_tv): There is no assignment - operator that converts an ACE_U_LongLong to a "long," so an - intermediate ACE_U_LongLong variable "usec64" has been - introduced. The type of "msec" and "usec" have been changed from - "long" to ACE_UINT32, as have been the casts. The conversion is - then carried out by using the lower part of "usec64." - - * ace/Local_Name_Space_T.cpp(remap): The "DWORD" cast has been - removed from both EXCEPTION_CONTINUE_SEARCH and - EXCEPTION_CONTINUE_EXECUTION beause the function return value is - of type "int" and the cast was causing an "integer conversion - resulted in a change of sign" warning. - - * ace/Memory_Pool.cpp(map): Removed references to the "mem_offset" - variable because it was not being used and the compiler was - issuing a warning to this effect. - - * ace/NT_Service.cpp(startup): This function was returning "-1" - when svc_sc_handle() failed, and returning a "0" when - QueryServiceConfig() failed. Since the return type of this - function is "DWORD," the compiler was issuing an "integer - conversion resulted in a change of sign" warning for the "-1" - value. Upon investigation of this issue, it was discovered that - "0" is a valid service type value, and thus the use of "0" to - indicate failure is a bug. The return value for svc_sc_handle() - failure has been changed to "MAXDWORD - 1," which is the DWORD - equivalent of "-2," and the return value for failure of - QueryServiceConfig() has been changed to "MAXDWORD," which is - the DWORD equivalent of -1. - - * ace/OS.cpp: The compiler cannot handle a 64-bit literal, so the - literal passed to FILETIME_to_timval_skew has been created as - ACE_U_LongLong(0xd53e8000, 0x19db1de). - - * ace/OS.cpp(set): The Native x86 compiler defines "QuadPart" in - the LARGE_INTEGER union as a "double," so it cannot be used in - the calculations of tv_sec and tv_usec. Instead, the low and - high parts of the LARGE_INTEGER structure are copied into an - ACE_U_LongLong structure, and the ACE_U_LongLong operators are - used. - - * ace/OS.cpp(operator FILETIME): The Native x86 compiler defines - "QuadPart" in the LARGE_INTEGER union as a "double," so it - cannot be used in the calculation of file_time. Instead, tv_sec - and tv_usec are converted iinto ACE_U_LongLong structures and - the ACE_U_LongLong operators are used. - - * ace/OS.cpp(uname): The Native x86 compiler names both the union - and the structure within the SYSTEM_INFO structure, so the - "wProcessorArchitecture" member within the "s" structure, which - is itself within the "u" union, must be accessed by using - ".u.s." - - * ace/OS.cpp(ACE_BEGINTHREADEX): Green Hills compiler gets - confused when __stdcall is imbedded in parameter list, so the - type ACE_WIN32THRFUNC_T has been defined, then used within the - parameter list of ::_beginthreadex(). - - * ace/OS.h(ACE_Time_Value): The Native x86 compiler defines - "DWORDLONG" as type "double," so FILETIME_to_timval_skew is - instead defined as type ACE_U_LongLong. - - * ace/OS.h: The pragmas "#pragma warning( disable : ... " are - unknown to the Native x86 compiler, so it produces warnings to - this effect. These pragma have been blocked out for ghs. - - * ace/OS.h: Because the Native x86 compiler does not support the - __int64 keyword, the typedef of ACE_hrtime_t has been changed - from "unsigned __int64" to "ACE_UINT64" for ghs. Because no - usage of "ACE_QWORD" could be foound, its definition has been - blocked out for ghs. - - * ace/OS.i(gettimeofday):The code at the end of this function is - not reachable if either ACE_HAS_WINCE or ACE_WIN32 is - defined. In order to quiet the Green Hills compiler warnings - about unreachable code, this code has been blocked out for - ACE_HAS_WINCE and ACE_WIN32. With this code blocked out, - however, the variables "tv" and "result" are not used, and the - compiler warns about about variables defined, but never used. In - order to quiet these warnings, the definitions of these two - variables have been blocked out for ACE_HAS_WINCE and ACE_WIN32. - - * ace/OS.i(gethrtime): The ACE_gethrtime() function is not meant - to be used by a Win32 platform, but because both "ghs" and - "ACE_HAS_PENTIUM" are defined for the Native x86 platform, a - call to ACE_gethrtime() was included in the code. This problem - has been solved by adding "&& !defined(ACE_WIN32)" to the two - "... defined (ghs) && defined (ACE_HAS_PENTIUM)" statements - which block out references to ACE_gethrtime(). - - The Native x86 compiler defines "QuadPart" in the LARGE_INTEGER - union as a "double," so it cannot be used as the return - value. Instead, because the return type is "ACE_hrtime_t," which - is type "ACE_UINT64," the low and high parts of the - LARGE_INTEGER structure are copied into an ACE_UINT64, which is - then returned. - - * ace/Process_Manager.cpp(wait): The "result >= WAIT_OBJECT_0" - test within the ACE_ASSERT statement causes the Native x86 - compiler to produce a ôpointless comparison of unsigned - integer with zeroö warning because "result" is of type - "DWORD," which is defined by the Native x86 compiler as type - "unsigned int." This test has been blocked out for ghs. - - * ace/Profile_Timer.cpp(elapsed_time): Because the "__int64" - keyword is not defined by the Native x86 compiler, it cannot be - used to cast the value of "delta_t" in the calculation of - "real_time." But "delta_t" is of type "ACE_hrtime_t," and - ACE_hrtime_t is typedefed as ACE_U_LongLong, so the division - operator defined for in the ACE_U_LongLong class can be used - directly with a divisor of type "double." Thus the "__int64" - cast has been removed for ghs. - - * ace/Sock_Connect.cpp(get_reg_value): This function is used - within the function get_ip_interfaces() function only when - either ACE_HAS_WINSOCK2 is not defined or when ACE_HAS_WINSOCK2 - is defined as "0." Because ACE_HAS_WINSOCK2 is defined on the - Native x86 platform, the compiler was issuing a ôdefined, but - never usedö warning. This warning has been eliminated by - blocking out the definition of get_reg_value() when - ACE_HAS_WINSOCK2 is defined as a value other than "0." - - * ace/Stats.cpp(accumulate): The comparison "rhs.samples_count () - == 0" was producing a warning because rhs.samples_count() - returns an ACE_UINT32, but is being compared to the signed - literal "0." The "0" has been changed to "0u." - - * ace/WFMO_Reactor.cpp(ok_to_wait): The comparison of the "switch" - statement parameter "result" to "DWORD" values in the case - statements elicited an "integer conversion resulted in a change - of sign" warning from the compiler, so the type of "result" has - been changed to "DWORD." - - * ace/WFMO_Reactor.cpp(dispatch): The comparison of the "switch" - statement parameter "wait_status" to "DWORD" values in the case - statements elicited an "integer conversion resulted in a change - of sign" warning from the compiler, so the type of "wait_status" - has been cast to "DWORD." - - * ace/WFMO_Reactor.cpp(dispatch_handles): The "wait_status >= - WAIT_OBJECT_0" comparison was producing a ôpointless - comparison of unsigned integer with zeroö warning because - "wait_status" is an unsigned integer. This was a known problem - with Borland, so the blocking out of this comparison has been - extende to ghs. - - * tests/Basic_Types_Test.cpp(main): Because both the - ACE_LACKS_LONGLONG_T and ACE_WIN32 macros are defined, the - ACE_LACKS_LONGLONG_T macro must appear first, so the order of - these two macros has been reversed. - - * tests/Cached_Accept_Conn_Test.cpp: The template class - ACE_Node<ACE_HANDLE> must be explicitly instantiated for this - platform. - - * tests/Cached_Conn_Test.cpp: The template class - ACE_Node<ACE_HANDLE> must be explicitly instantiated for this - platform. - - * tests/Handle_Set_Test.cpp: The template class - ACE_Node<ACE_HANDLE> must be explicitly instantiated for this - platform. This was already being done for the _CRAYMPP, so it - has been extended to ghs. - - * tests/Malloc_Test.cpp: Because the Native x86 compiler does not - support structural exceptions, it cannot support the "remap" - function, so the blocking of the ACE_TEST_REMAP_ON_FAULT macro - definition, which was already in effect for linux, has been - extended to ghs. - -Thu Jan 18 12:49:53 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/SUN_Proactor.cpp: Added support for cancel_aiocb(). Thanks - to Alexander Libman <Alibman@baltimore.com> for contributing - this. - - * tests/Makefile.bor (TESTS): Added Config_Test so that this test - runs on Borland. - - * tests: Moved the config_test stuff (which tests ACE_Configuration* - classes) from the examples/Configuration/ directory to the - tests/ directory and made it a one-button test. - - * ace/Future.h: Changed the order of the thread mutex and the condition - variable to avoid confusion in the future regarding "order of - initialization." Thanks to Edan Ayal <edan@bandwiz.com> for - reporting this. - - * examples/Configuration: Updated this example to include the new - test for the ACE_Configuration_Heap methods. Thanks to Michael - Searles <msearles@base16.com> for contributing this. - -Thu Jan 18 18:55:37 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/nightlybuilds/builds.lst: - Add the RedHat_Implicit_Templates build. - -Thu Jan 18 18:48:33 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/Log_Msg.cpp: - Declare sys_nerr as const int under QNX/RTP (and NTO). - - * ace/Pipe.cpp: - Use pipe() under QNX because it lacks both socketpair() and it - cannot open a socket to itself. - - * ace/config-qnx-rtp.h: - Remove ACE_NTRACE hacks. - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - Do not enable the repo by default it breaks QNX. - Instead of removing the definition of DCFLAGS by default we - set debug=0 all the time, that seems like a cleaner way to - disable debugging. - -Thu Jan 18 09:34:35 2001 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/platform_linux.GNU: - The -fno-implicit-templates flag was hardcoded, but this gave - the users no recourse to remove should they want to use - -fimplicit-templates. - The macro IMPLICIT_TEMPLATES_FLAG is used to set the flag now, - unless the user provides a value for the macro the makefiles - continue to work as they did before this change, i.e., adding - -fno-implicit-templates to CCFLAGS. - Notice that this functionality was available in - platform_linux_lxpthreads.GNU, but dissapeared when everything - was rolled into platform_linux.GNU. - -Thu Jan 18 06:26:42 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Configuration.{h,cpp}: Added functionality to read in all - values in a config file without requiring a type prefix on each - value, skips whitespace and allows comments on the end of lines. - Thanks to Michael Searles <msearles@base16.com> for contributing - this. - -Wed Jan 17 11:48:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/msvc_auto_compile.pl: - - Added PACE to the list of ACE directories so PACE is - compiled in full auto builds. - -Wed Jan 17 10:00:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/Handle_Ops.cpp: (handle_timed_open) - - Removed the use of ACE_NONBLOCK on Win32. This use - didn't function as expected, since ACE_NONBLOCK would - be interpreted as O_WRONLY. Also, the CreateFile API - call doesn't support any nonblocking option, so - redefining ACE_NONBLOCK would not seem to fix anything. - - Thanks to Matthias Wittig <m.wittig@com-on.de> for reporting - a problem report form about this. - - * bin/PerlACE/Process_Unix.pm: - - Fixed up the use of the RUNNING state, so wait and kill - work properly. Also made Kill automatically use waitpid - (since I can't think of any time we'd kill without wanting to - clean up the resources). - -Wed Jan 17 07:44:29 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp (send): Set errno to - EWOULDBLOCK if n < len so that the caller will initiate a - handle_output()-driven reply. Thanks to Klaus H. Wolf - <hw@cyland.com> for reporting this. - - * ace/Log_Msg.h (ACE_Log_Msg): Clarified that only the current message - is stored in TSS. Thanks to Pierre Oberson - <oberson@nagra-kudelski.ch> for pointing out the need for this - clarification. - - * examples/Log_Msg/test_log_msg.cpp (main): Fixed the example by - adding ACE_Log_Msg::PROCESS so that the messages do not print - out (which is the correct behavior for this test). Thanks to - Mike Curtis <mccurry@my-deja.com> for reporting this. - * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp (send): Set errno to - EWOULDBLOCK if n < len so that the caller will initiate a - handle_output()-driven reply. Thanks to Klaus H. Wolf - <hw@cyland.com> for reporting this. - - * ace/Log_Msg.h (ACE_Log_Msg): Clarified that only the current message - is stored in TSS. Thanks to Pierre Oberson - <oberson@nagra-kudelski.ch> for pointing out the need for this - clarification. - - * examples/Log_Msg/test_log_msg.cpp (main): Fixed the example by - adding ACE_Log_Msg::PROCESS so that the messages do not print - out (which is the correct behavior for this test). Thanks to - Mike Curtis <mccurry@my-deja.com> for reporting this. - -Tue Jan 16 15:28:22 2001 Carlos O'Ryan <coryan@uci.edu> - - * netsvcs/lib/Server_Logging_Handler_T.cpp: - The formal parameter names must match in the .h and .cpp file - to make Sun/CC 6.0 happy. - -Tue Jan 16 11:25:32 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Log_Msg.cpp (log): Convert strerror() text string to a - TCHAR so that this call will work correctly with Unicode. - Thanks to Matthias Wittig <m.wittig@com-on.de> for reporting - this. - -Tue Jan 16 09:58:20 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/ace_wchar.inl: - - Updated ACE_Ascii_To_Wide and ACE_Wide_To_Ascii to - preserve null pointers. - - Thanks to Matthias Wittig <m.wittig@com-on.de> for - reporting this and suggesting a fix. - -Tue Jan 16 10:47:33 2001 Frank Hunleth <fhunleth@cs.wustl.edu> - - * ace/config-win32-common.h: - * ace/config-win32-msvc.h: - Moved #define ACE_HAS_LLSEEK from config-win32-common.h to - config-win32-msvc.h, since _lseeki64 isn't defined for - Borland. Also implicitly removed ACE_HAS_LLSEEK for the - VisualAge compiler - it might have worked (didn't know, - couldn't test) - -Mon Jan 15 15:22:42 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Asynch_IO.h: Changed the ACE_Asynch_Read_Stream::read() - method's "bytes_to_read" parameter to "num_bytes_to_read" to - workaround a weird problem with some compilers. Thanks to Chris - Kohlhoff <chris@kohlhoff.com> for this fix. - - * examples/Service_Configurator/IPC-tests/README: Updated this - file so that it's now up-to-date and also explains how to - reconfigure a server if SIGHUP isn't supported. Thanks to Mike - Curtis <mccurry@my-deja.com> for reporting this. - -Mon Jan 15 12:13:48 2001 Darrell Brunsch <brunsch@uci.edu> - - * bin/nightlybuilds/builds.lst: [Added] - * bin/nightlybuilds/scoreboard_update.pl: [Added] - - Moved the scoreboard stuff from the internal cvs repos - to this one, so it is easier for people to edit the - list. - -Mon Jan 15 12:29:53 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/config-macosx.h: Fixed typo so that ACE_HAS_CLOCK_GETTIME - is spelled correctly. Thanks to Mike Curtis - <mccurry@my-deja.com> for reporting this. - - * ace/Strategies_T.cpp (open): Replace the ACE_OS::strncpy() functions - with ACE_OS::strcpy() functions. Thanks to Ron Hashimshony - <Ron@bandwiz.com> for reporting this. - -Mon Jan 15 09:44:16 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/RMCast/Makefile: - Fixed Makefile to link the ACE library, otherwise we get - undefined symbols under certain platforms (AIX). Thanks to - Scott Bolin <scott.bolin@pgs.com> for pointing this out. - -Mon Jan 15 09:11:12 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/config-win32-common.h: Added support for ACE_HAS_LLSEEK, though - this should probably be changed to be compiled only on some - Win32 platforms. - - * ace/OS.{h,i}: Added support for ACE_OS::llseek() on Win32. Thanks - to Nick Lin <nicklin@vantech.com.tw> for contributing this. - - * ace/Log_Priority.h: Clarified the fact that we only use 12 bits - for ACE_Log_Priority. Thus, the remaining bits are available - for application use. Thanks to David Singer - <David_P_Singer@res.raytheon.com> for motivating this comment. - -Sun Jan 14 16:53:11 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Configuration.{h,cpp}: Fixed a memory leak that occurred - with transient heaps. Also added a list of current limitations - to import/export routine. Thanks to Chris Hafey - <chafey@stentor.com> for contributing this stuff. - -Fri Jan 12 20:46:05 2001 Angelo Corsaro <corsaro@cs.wustl.edu> - - * include/makeinclude/platform_qnx_rtp_gcc.GNU: - Platform macros needed to run ACE on QNX RTP. - - * ace/config-qnx-rtp.h: - Configuration file needed to run ACE on QNX RTP. - - * ACE-INSTALL.html: - Added documentation on how to install ACE on QNX RTP, - and the issue with the current version of QNX RTP. - - -Fri Jan 12 14:59:15 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/RMCast/RMCast_Fragment_Test.cpp: - Fixed conversion from 64-bit ulong to 32-bit ulong under some - VxWorks compilers where 64 bits are emulated. Thanks to Edwin - McKay <mckayea@betalasermike.com> for pointing this out. - -Fri Jan 12 07:18:16 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/OS.{h,i}: Moved some "using std::*" definitions from OS.i to - OS.h. Thanks to Mike Curtis <mccurry@my-deja.com> for reporting - this and to Christopher Kohlhoff <chris@kohlhoff.com> for - suggesting the fix. - -Fri Jan 12 15:34:28 2001 Steve Huston <shuston@riverace.com> - - * ace/Managed_Object.h: Added <TYPE> to the unimplemented operator= - declaration. Fixes compile w/ IBM C/C++ 3.6 on AIX. - -Fri Jan 12 07:59:19 2001 Joe Hoffert <joeh@cs.wustl.edu> - - * Makefile: - Add the PACE directory back into the build. PACE should - not generate any build failures for the platforms - currently supported. - -Wed Jan 10 23:30:21 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/FILE_Addr.cpp (set): Replace (sizeof this->filename_) - with (sizeof this->filename_ / sizeof (ACE_TCHAR)). Thanks to - Matthias Wittig <m.wittig@com-on.de> for reporting this. - -Tue Jan 9 07:27:19 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Containers_T.h: Clarified that the ACE_Ordered_Multiset class - allows duplicates. Thanks to Albert Wijna - <albert.wijnja@meco.nl> for clarifying this. - -Sat Jan 6 10:20:55 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/File_Lock.{h,inl}: Made the get_handle() method const. - Thanks to Johnny Willemsen <johnny.willemsen@meco.nl> for - reporting this. - - * ace/TP_Reactor.h: - * ace/Get_Opt.h: - * ace/Caching_Utility_T.h: Added "ACE_UNIMPLEMENTED_FUNC" macros - for all copy constructors and assignment operators. Thanks to - Johnny Willemsen <johnny.willemsen@meco.nl> for reporting this. - -Fri Jan 5 01:09:28 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * performance-tests/Misc/context_switch_time.cpp (get_options), - * performance-tests/Misc/preempt.cpp (open), - * examples/Reactor/Misc/pingpong.cpp (run_svc), - * examples/Reactor/Misc/notification.cpp (main), - * examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp (main), - * examples/Shared_Malloc/Options.cpp (print_usage_and_die), - * examples/Service_Configurator/IPC-tests/client/: Updated all - these programs so that don't abort via %a, but instead call - ACE_OS::exit(). Thanks to Mike Curtis <mccurry@my-deja.com> for - suggesting this. - - * apps/Gateway/Peer/Options.cpp (print_usage_and_die): Make sure to - actually *die* when we're done with this function! Thanks to - Mike Curtis <mccurry@my-deja.com> for suggesting this. - -Thu Jan 4 00:10:26 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Select_Reactor_T.i: The cancel_timer() method should return the - number of events canceled, rather than 0 or 1. Thanks to Joe - Guan <jguan@mistwireless.com> for reporting this and providing - the fix. - - * ace/Synch.h: Added an acquire (ACE_Time_Value &) method to ACE_Null_Mutex - so that this will work properly when - ACE_HAS_OPTIMIZED_MESSAGE_QUEUE is enabled. Thanks to Yuriy - Zaporozhets <zaz@internet-zahav.net> for reporting this. - -Wed Jan 3 23:00:52 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Lib_Find.cpp (ldfind), - * ace/Makefile.bor (CFLAGS), - * include/makeinclude/outputdir.bor (OBJDIR), - * ace/config-win32-msvc.h: Added support for the new ACE_LD_DECORATOR_STR - macro which is used to work around the fact that Borland - attaches a so-called "decorator suffix" to all library names. - Thanks to Chris Kohlhoff <chris@kohlhoff.com> for reporting - this. - - * ace/Lib_Find.h: Fixed a typo where ACE_LIB_FIND_H was misspelled. - Thanks to Chris Kohlhoff <chris@kohlhoff.com> for reporting - this. - - * ace/SOCK_Stream.i, - ace/MEM_Stream.i: Updated the calls to ACE_OS::shutdown() to use - the new macros described below! - - * ace/OS.h: Added better support for the ACE_OS::shutdown() second - parmeter in the form of new macros ACE_SHUTDOWN_READ, - ACE_SHUTDOWN_WRITE, and ACE_SHUTDOWN_BOTH. Thanks to Mike - Curtis <mccurry@my-deja.com> for suggesting this. - - * ace/SOCK_Stream.h: Clarified the role of the timeout parameters in - the various methods. Thanks to Allen Broadman - <broadmana@plural.com> for motivating this. - -Thu Jan 11 17:24:30 2001 Carlos O'Ryan <coryan@uci.edu> - - * Makefile: - Add new target 'Core' to quickly compile the basic ACE+TAO - components. - -Thu Jan 11 09:56:43 2001 Frank <fhunleth@cs.wustl.edu> - - * ACE version 5.1.12 released. - -Thu Jan 11 05:38:24 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/TP_Reactor.cpp: Reverted the change that was made for SPRO - 5.1 compilers. The change that was reverted is this - - Thu Jan 4 17:14:33 2001 Balachandran Natarajan - <bala@cs.wustl.edu> - - * ace/Handle_Set.cpp: Changed the macro - - ACE_DIV_BY_WORDSIZE(x) ((x) >> (ACE_Handle_Set::WORDSIZE)) to - - ACE_DIV_BY_WORDSIZE(x) ((x) >> ((int) - ACE_Handle_Set::WORDSIZE)). This seems to be a better - fix. Thanks to David Allen <dallen@storm.com> for suggesting - this. - -Tue Jan 9 09:53:53 2001 Carlos O'Ryan <coryan@uci.edu> - - * tests/MEM_Stream_Test.cpp: - Run the event loop for at most 1 minute. After that we know - that something is amiss with the client threads, and we should - exit. This fixes the deadlock problems we were seeing in the - nightly builds. - The real cause of the problem is something broken with the way - MEM_Addr objects compare local addresses, sometimes they fail to - compare equal. In the test this results in failed connections. - -Mon Jan 8 18:53:39 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> - - * examples/Map_Manager/test_hash_map_manager.cpp: - Removed template instantiations for - ACE_Guard<ACE_SYNCH_RW_MUTEX>, - ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>, and - ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> to fix linker - errors under Lynx_I386. - -Mon Jan 8 10:44:57 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS.h: - - Added some more protection (!VXWORKS) around the cuserid - inline statement since VXWORKS doesn't have cuserid. - -Mon Jan 08 10:04:55 2001 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/Thread_Manager.cpp (terminate): Reordered some statements so - we get the thread descriptor's log_msg pointer before we delete - the thread descriptor. Thanks to Tomer Amiaz - <Tomer@bandwiz.com> for reporting this. - -Sun Jan 7 16:51:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/ace_dll.dsp: - - Removed the PACE libraries from linking. We are going to come - up with a different solution for pace. - - * docs/run_test.txt: - - Changed the instructions a little to use PerlACE::LocalFile - for the server's IOR file. - -Sun Jan 7 08:59:09 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * tests/DLL_Test.cpp: Added a message in a ACE_ERROR statement. - * tests/run_test.lst: Disabled MEM_Stream_Test in Linux. - -Thu Jan 4 17:14:33 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/TP_Reactor.cpp (dispatch_i): Eliminate a portion of the - code from SunCC5 builds. This piece of code was trying to set - things right when it sees all the masks clear and the <size_> - greater than zero. This seems to be creating problems with SunCC - 5 builds alone. Commenting out this piece for SunCC5 helps. This - should also be a work around for the bug #750 in bugzilla. - -Thu Jan 04 17:07:48 2001 Luther Baker <luther@cs.wustl.edu> - - * ace/ace_dll.dsp - - Consistent typography (win32 specific backslash). - -Thu Jan 4 15:34:14 2001 Luther J Baker <luther@cs.wustl.edu> - - * ace/ace_dll.dsp - - Added PACE library to the ACE DLL project file. - (also changed the library search path) - -Wed Jan 3 17:24:11 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS.h: - - Mistakenly changed the ace_timezone () method to use - timezone () instead of timezone. Changed back. - -Wed Jan 3 16:00:22 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/ACE.cpp - - Changed the types of day_of_week_name and month_name in - ACE::timestamp to ACE_TCHAR (since that was the data - being assigned to it and the type that is later expected). - This fixed errors in Win32's Unicode build. - -Wed Jan 3 15:44:31 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS.i: - - Removed ACE_TIMEZONE since we found another workaround for - platforms that define timezone () as a macro. - - * ace/OS.h: - * ace/OS.i: - - Moved much of the code from ACE_OS::timezone and - ACE_OS::difftime into ace_timezone and ace_difftime. Since - some platforms don't have timezone or difftime, we needed - to do something here so those methods aren't used. Instead - of figuring out what larger #if !... should be, it is easier - (and less error prone) to just move the code here. - -Wed Jan 3 13:10:39 2001 Darrell Brunsch <brunsch@uci.edu> - - * apps/JAWS/server/HTTP_Helpers.cpp: - - Added ACE_MT around an ACE_Guard to remove an unused var - warning in the single threaded builds. - -Wed Jan 3 12:56:13 2001 Darrell Brunsch <brunsch@uci.edu> - - * ace/Timer_Wheel_T.cpp: - * ace/Timer_Wheel_T.h: - - Doug noticed some redundant code in expire while making his - change on the 21st. I checked and he was right, it looks like - I was moving around the loop termination conditionals and left - some around. Removed them and also added some better comments - and made it more doxygen complient. - -Wed Jan 3 12:06:20 2001 Darrell Brunsch <brunsch@uci.edu> - - * tests/Refcounted_Auto_Ptr_Test.dsw: - - Projects are listed in tests.dsw, so this is unneeded. - - * tests/tests.dsw: - - Added Refcounted_Auto_Ptr_Test.dsp. - -Tue Jan 3 10:30:42 2001 Darrell Brunsch <brunsch@uci.edu> - - * docs/msvc_notes.txt: - - Added this file explaining some issues or explanations on how - ACE/TAO are set up for use with MSVC. Mainly I'm thinking of - this as a place to put random stuff about ACE and TAO on MSVC. - - Plus I think we need more nifty doxygen documents. ;-) A tip of - the hat goes to Letha Etzkorn <letzkorn@cs.uah.edu> and - Shivakumar Patil <shivakumar.patil@stdc.com> for bringing up - questions that led to the dump of info to this file. - - * ACE-INSTALL.html: - - Added a reference to msvc_notes.txt. - -Wed Jan 3 09:15:24 2001 Jeff Parsons <parsons@cs.wustl.edu> - - * ace/ACE.cpp: - - Replaced these lines - - SYSTEMTIME local; - ::GetLocalTime (&local); - - in the timestamp() method. - They were removed the last time this file was - modified, breaking the Win32 builds. - -Wed Jan 03 05:49:11 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.h: - The ace_cuserid() helper cannot be defined in Win32 - -Wed Jan 03 05:42:20 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.h: - Remove broken #include of unistd.h, it was a debug statement - that sneaked through the commit. - -Tue Jan 2 18:33:03 2001 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.h: - * ace/OS.i: - Workaround platforms that define timezone, difftime or cuserid - as macros. Instead of just dropping support for the ACE_OS::XXX - method we create an inline ace_XXX() function, that uses the - original macro expansion, then we #undef the offending macro, - and use the inline function in the code. - - * ace/config-tru64.h: - Enable cuserid() again, with the new workaround it should work - without problems. - This fix should remove some of the redness in the TRU64_CXX - builds. - -Tue Jan 2 14:22:21 2001 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_run_tests.lst: - Add the DII version of Param_Test to the nightly builds. - -Tue Jan 2 10:25:30 2001 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/Cached_Connect_Strategy_T.cpp: Added the patch provided by - Edan Ayal <edan@bandwiz.com> for - ACE_Bounded_Cached_Connect_Strategy::find_or_create_svc_handler_i (). - -Tue Jan 2 09:03:18 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Asynch_Acceptor.{h,cpp}, - ace/POSIX_Async_IO.{h,cpp}, - ace/POSIX_Proactor.{h,cpp}, - ace/SUN_Proactor.{h,cpp}: Added enhanced versions of ACE_POSIX_Proactor - and ACE_SUN_Proactor to fix various problems uncovered and fixed by - Alexander Libman <Alibman@baltimore.com>. - - * ace/ACE.{h,cpp}: Fixed the timestamp() method so that it works - identically on Win32 and on UNIX. Also provided a new option - that'll make it possible to return a pointer to the beginning of - the time portion of "date and time." Thanks to Michael Searles - <msearles@base16.com> for contributing these fixes. - -Mon Jan 01 16:35:00 2000 Michael Kircher <Micahel.Kircher@mchp.siemens.de> - - * tests/Reader_Writer_Test.cpp: Added a #ifdef to check for native - RW lock support. If the platform supports native RW locks we should - not report a failure on upgrading, because native RW locks do not - support upgrading, only our RW lock emulation does this. - Thanks to Frank and Doug for pointing out this failure. - -Sun Dec 31 14:12:08 2000 Ossama Othman <ossama@uci.edu> - - * bin/auto_run_tests.lst: - - Added TAO's "ForwardRequest" PortableInterceptor test to the - list of tests to run. - -Sun Dec 31 13:59:02 2000 David L. Levine <levine@cs.wustl.edu> - - * tests/Refcounted_Auto_Ptr_Test.cpp: on DIGITAL_UNIX - only, added a call to ACE_OS::exit () at the end of - the test so that it will terminate. [Bug 758] - -Sun Dec 31 10:28:43 2000 David L. Levine <levine@cs.wustl.edu> - - * include/makeinclude/platform_osf1_4.0.GNU (LIBS): - wrapped /usr/lib/cmplrs/cxx/libcxxstd.a with - $(wildcard), so that is ignored on systems on which - it doesn't exist, such as Tru64 5.1. - -Sun Dec 31 09:23:09 2000 David L. Levine <levine@cs.wustl.edu> - - * include/makeinclude/platform_tru64_cxx.GNU: added - support for Tru64 5.1 (DIGITAL_UNIX 0x510). - - * ace/config-tru64.h: added ACE_LACKS_CUSERID with - DIGITAL_UNIX >= 0x510, because cuserid () is a macro - in Tru64 5.1. - - Thanks to Carlos for tracking down this source of compilation - failure. - -Sat Dec 30 16:21:49 2000 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/Hash_Map_Manager_T.h: - * ace/Map_T.i: Fixed errors in g++ that were introduced while - applying the patches. - -Sat Dec 30 15:10:00 2000 Chris Gill <cdgill@cs.wustl.edu> - - * ace/RB_Tree.{cpp, h, i}: - tests/RB_Tree_Test.cpp: Fixed a bug in RB_delete_fixup that - occurs when the pointer to be fixed up is zero - solution is to - pass in a pointer to its parent, and maintain the parent pointer - and fixup pointer in tandem during the fixup function. Also - added a few functions to test the red-black invariant(s) at each - node of the tree, and added an invariant test call after each - bind and unbind in a new stress test in RB_Tree_Test.cpp. - - Thanks to Klaus H. Wolf <hw@cyland.com> for pointing out the - problem and for contributing the stress test (which in a - slightly modified form is now part of the RB_Tree_Test.cpp code) - that reproduced the problem. - -Sat Dec 30 11:12:08 2000 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/Hash_Map_Manager_T.h: - * ace/Map_T.i: - * ace/Message_Block_T.cpp: Added patches provided by J. Russell - Noseworthy <rnosewor@objectsciences.com> for SPRO 5.1. The patch - to config-sunos-5.5.h has not been applied as it breaks builds - on SunCC 5.0. - -Fri Dec 29 17:08:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * bin/auto_compile: - - Added a -sendreport option to enable the sending of email at all. - Now by default it will not. - -Fri Dec 29 16:53:22 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp (main), - * performance-tests/TTCP/C/new-ttcp.cpp (main), - * tests/Conn_Test.cpp: Incorrect use of %r, which caused - problems... Thanks to Mike Curtis <mccurry@my-deja.com> for - pointing this out. - -Fri Dec 29 14:21:01 2000 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/MEM_SAP.cpp: Fixed incorrect ACE_RCSID identifier. Thanks - to Jerry Odenwelder <jerryo@atl.fundtech.com> for noticing this. - -Thu Dec 28 16:02:51 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/sandbox.cpp: - This program executes a child process (and its children), in a - new session and process group. If the process tree does not - finish before a given timeout (the first argument) the whole - tree is terminated. - The program is useful for test scripts and programs, - occasionally they hang the whole auto build. - - * bin/auto_compile: - Add new options '-sandbox' and '-sandbox_timeout' to support the - sandbox program. - -Thu Dec 28 16:10:59 2000 Frank Hunleth <fhunleth@cs.wustl.edu> - - * performance-tests/UDP/udp_test.cpp: - * performance-tests/Server_Concurrency/Latency_Stats.h: - * performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp - * performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp - Fixed compile problems under VxWorks when handling - 64 bit integers. Basically, truncated the 64 bit integers - to 32 bit integers for operations not supported by - ACE_U_LongLong. - -Wed Dec 27 15:32:43 2000 Frank Hunleth <fhunleth@cs.wustl.edu> - - * examples/Reactor/WFMO_Reactor/test_network_events.cpp: - Added missing ; - -Wed Dec 27 11:11:02 2000 Carlos O'Ryan <coryan@uci.edu> - - * examples/Map_Manager/test_hash_map_manager.cpp: - * examples/Misc/test_trace.cpp: - * performance-tests/Misc/test_singleton.h: - * performance-tests/Misc/test_singleton.cpp: - Fixed problems in single threaded builds, basically I use the - ACE_SYNCH_* macros instead of using the class directly. - -Tue Dec 26 18:53:06 2000 Carlos O'Ryan <coryan@uci.edu> - - * performance-tests/Server_Concurrency/Makefile: - The tests make no sense if threads are disabled, so they are not - compiled under that configuration. - -Tue Dec 26 18:31:08 2000 Carlos O'Ryan <coryan@uci.edu> - - * examples/Naming/test_open.cpp: - Fixed compilation problems under Sun/CC 4.2, the Log_Msg.h file - was not #included - -Tue Dec 26 14:45:50 2000 Ossama Othman <ossama@uci.edu> - - * bin/auto_run_tests.lst: - - Added TAO's "Dynamic" and "IORInterceptor" PortableInterceptor - tests to the list of tests to run. - -Tue Dec 26 11:49:49 2000 Nanbor Wang <nanbor@cs.wustl.edu> - - * examples/IPC_SAP/SPIPE_SAP/server.cpp: Fixed a statement not - reachable warning on KCC. - -Sat Dec 23 18:11:02 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/SString.cpp: Enhanced the implementation so that it works - correctly when binary data (i.e., data that may contain NUL - characters) is stored in a string. Thanks to Michael Lindner - <mikel@att.net> for reporting this. - -Fri Dec 22 15:18:49 2000 Steve Huston <shuston@riverace.com> - - * ace/ace-dll.icc: Added Basic_Stats.{h cpp} to build clean. - -Fri Dec 22 14:00:41 2000 Steve Huston <shuston@riverace.com> - - * ace/config-all.h: On HP-UX 11, when figuring ACE_bad_alloc exception - class, account for older compilers that don't define __HP_aCC. - -Fri Dec 22 12:56:06 2000 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/ACE.cpp (process_active): Call CloseHandle before return to - avoid handle leaks on Win32. Thanks to Arnaud Compan - <compan@ipanematech.com> for the fix. - -Fri Dec 22 13:04:58 2000 Balachandran Natarajan <bala@cs.wustl.edu> - - * bin/run_all_list.pm: Added the bidirectional test to the list. - -Fri Dec 22 12:43:54 2000 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/OS.h: Fixed a typo. - -Fri Dec 22 09:12:37 2000 Steve Huston <shuston@riverace.com> - - * ace/OS.h: ACE_DEFAULT_FILE_PERMS - added FILE_SHARE_DELETE to the - bits if building on Win NT4 or greater. Thanks to Nanbor Wang - for calling attention to this. - -Fri Dec 22 08:06:10 2000 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> - - * tests/Refcounted_Auto_Ptr_Test.cpp: Fixed the problem with an - undefined ACE_Auto_Basic_Ptr<Scheduler> by adding an explicit - template instantiation. Thanks to Frank A. Hunleth - <fhunleth@cs.wustl.edu> for reporting this. - -Thu Dec 21 18:12:38 2000 Steve Huston <shuston@riverace.com> - - * ace/ace-dll.icc, ace-lib.icc: Added OS_Errno.(cpp h) to the files - list. Thanks to Jerry Odenwelder for pointing out the need for these. - -Thu Dec 21 16:45:28 2000 Steve Huston <shuston@riverace.com> - - * tests/Capabilities_Test.cpp: Added missing \n to a ACE_ERROR - statement, and added ACE_DEFAULT_FILE_PERMS to the ACE_OS::open - call to create the test file. It used to be 0600, but that was - removed to satisfy Win32 which now pays attention to that arg. - -Thu Dec 21 05:50:51 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Timer_Wheel_T.cpp (expire): Fixed a mistake where - next_earliest_time should have been next_earliest. Thanks to - Keith Brown <kalbrown@ix.netcom.com> for reporting this. - - * examples/IPC_SAP/SOCK_SAP/Makefile.bor: Reenable CPP-inserver-fancy.cpp - now that it compiles! Thanks to Johnny Willemsen - <johnny.willemsen@meco.nl> for confirming this. - - * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp (handle_events): Added - casts for (SOCKET) when using FD_SET to work around problems - with Borland. Thanks to Johnny Willemsen - <johnny.willemsen@meco.nl> for reporting this. - - * ace/Message_Block.h (ACE_Dynamic_Message_Strategy): Fixed a bunch - of non-const accessor methods to be const. Thanks to Johnny - Willemsen <johnny.willemsen@meco.nl> for reporting this. - - * examples/Naming/Makefile (BIN2): Added the test_open.cpp file - to the Makefile. Thanks to Johnny Willemsen - <johnny.willemsen@meco.nl> for reporting this. - - * docs/tutorials/016/page02.html: Clarify that signal() or - broadcast() don't release the mutex. Thanks to Mike Curtis - <mccurry@my-deja.com> for pointing this out. - -Wed Dec 20 19:44:16 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * examples/Reactor/WFMO_Reactor/test_abandoned.cpp, - * examples/Reactor/WFMO_Reactor/test_directory_changes.cpp, - * examples/Reactor/WFMO_Reactor/test_network_events.cpp, - * examples/Reactor/WFMO_Reactor/test_prerun_state_changes.cpp, - * examples/Reactor/WFMO_Reactor/test_registration.cpp, - * examples/Reactor/WFMO_Reactor/test_registry_changes.cpp, - * examples/Reactor/WFMO_Reactor/test_talker.cpp, - * examples/Reactor/WFMO_Reactor/test_window_messages.cpp: - - * ace/Sock_Connect.cpp: The ACE 5.1.11 implementation of - ACE_Sock_Connect::get_ip_interfaces() fails when run on Windows - 2000 when ACE_HAS_WINSOCK2 = 0. This is because - get_ip_interfaces() checks the registry for the available - interfaces and fails when it encounters a new entry in windows - 2000 named "Device\NDisWanIP". The patch is to ignore invalid - devices and continue checking. Thanks to Chris Hafey - <chris@stentorsoft.com> for contributing this fix. - -Wed Dec 20 15:57:32 2000 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/RMCast/RMCast_IO_UDP.cpp - * ace/RMCast?RMCast_IO_UDP.h - * ace/RMCast/RMCast_IO_UDP.i : cleaned up tabs and trailing ws from - last submission... - -Wed Dec 20 16:18:49 2000 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/simple_test_proactor.cpp: Removed unused - 'initial_read_size' variable from file scope. - - * examples/Reactor/Proactor/test_aiosig_ace.cpp (setup_signal_handler): - * examples/Reactor/Proactor/post_completions.cpp: - * examples/Reactor/Proactor/test_end_event_loop.cpp: - * examples/Reactor/Proactor/test_cancel.cpp (Receiver::open): - Fixed unused variable warnings for gcc. - -Wed Dec 20 15:42:36 2000 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/RMCast/RMCast_IO_UDP.cpp - * ace/RMCast?RMCast_IO_UDP.h - * ace/RMCast/RMCast_IO_UDP.i : The g++ cross compiler 2.9-gnupro-98r2 - for target Lynx 3.0.1 host Solaris 2.6 was breaking with an internal - error at the end of handle_input(). Replacing a couple of lines of - code with the private, inline method allocate_and_bind_proxy() gets - around the problem. - -Wed Dec 20 15:32:44 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * examples/Threads/wfmo.cpp: Move the function calls etc. out of - the ACE_ASSERT() macros. Thanks to Mike Curtis - <mccurry@my-deja.com> for pointing this out. - -Tue Dec 19 15:08:40 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Logging_Strategy.cpp: If ACE_LACKS_IOSTREAM_TOTALLY we'll - use a "regular" file. Thanks to Sangwoo Jin for contributing - this fix. - - * ace/Mem_Map.cpp (map_it): In using ACE_Mem_Map, if the - ACE_Mam_Map::map's <offset> parameter is set to non-zero and the - <len> parameter is set to -1 then the right value to map should - be <mapped file size> - offset. Thanks to Sangwoo Jin for - reporting this and suggesting the fix! - - * ace/INET_Addr.{h,i}: Make operator < const. Thanks to - Michael Lindner <mikel@att.net> for reporting this. - -Tue Dec 19 18:39:27 2000 Luther J Baker <luther@cs.wustl.edu> - - * ace/WFMO_Reactor.cpp (simple_dispatch_handler): - - When ACE_HAS_PACE on NT, ACE must use pace_siginfo_t instead - of creating and using its own. The ACE version of siginfo_t - happens to use constructors and so, the code that uses - this ACE siginfor_t instantiates the struct via a constructor. - When ACE_HAS_PACE, the pace_siginfo_t cannot be instantiated - via constructor. - - My edit just chooses the correct method of instantiation - based on ACE_HAS_PACE. - -Tue Dec 19 18:21:52 2000 Luther J Baker <luther@cs.wustl.edu> - - * ace/Thread.h (ACE_Thread): - - Removed the default value on the overriden join (...) - function that took three parameters. - -Tue Dec 19 14:50:38 2000 Steve Huston <shuston@riverace.com> - - * ace/OS.h: If on ACE_WIN32, set ACE_DEFAULT_FILE_PERMS to - (FILE_SHARE_READ | FILE_SHARE_WRITE), not 0666. - -Tue Dec 19 14:40:26 2000 Steve Huston <shuston@riverace.com> - - * ace/Filecache.cpp: Changed definition of R_MASK and W_MASK to - 0 for ACE_WIN32; used to be for __BORLANDC__. This is related - to the change below because the third arg to ACE_OS::open is - not ignored any longer for Win32. - - * tests/Capabilities_Test.cpp: On ACE_OS::open, don't supply a - <perms> arg - let it default. The file gets deleted at the end of - the test and has nothing to be protected. Related to the below - change as well. - - * tests/Mem_Map_Test.cpp: Changed all the 0666 args to ACE_OS::open - to ACE_DEFAULT_FILE_PERMS. - -Tue Dec 19 11:02:41 2000 Steve Huston <shuston@riverace.com> - - * ace/OS.{h cpp} (open(char), open(wchar)): Changed the <perms> - argument to be used in the CreateFile call on Win32. Made the - default value of the argument match the old behavior (defaults - to FILE_SHARE_READ | FILE_SHARE_WRITE (and FILE_SHARE_DELETE on - NT4 and Win2K)). Thanks to Edan Ayal <edana@bandwiz.com> for this - suggestion! - -Mon Dec 18 20:47:40 2000 Ossama Othman <ossama@uci.edu> - - * ace/POSIX_Asynch_IO.h: - - Reverted previous change. It introduced compile-time errors. - -Mon Dec 18 19:07:31 2000 Steve Huston <shuston@riverace.com> - - * ace/Asynch_IO.h, ace/POSIX_Asynch_IO.h: Clarified/corrected some - comments regarding the write() operation getting its data from - the message block's rd_ptr. - -Mon Dec 18 11:44:11 2000 Nanbor Wang <nanbor@cs.wustl.edu> - - * tests/MEM_Stream_Test.cpp (connect_client): Fixed an unused - argument warning on KCC compiler. - -Mon Dec 18 11:00:14 2000 Nanbor Wang <nanbor@cs.wustl.edu> - - * tests/MEM_Stream_Test.cpp: Fixed problems when threads are not - supported and when explicit template instantiation is required. - -Sun Dec 17 20:11:08 2000 Nanbor Wang <nanbor@cs.wustl.edu> - - * tests/MEM_Stream_Test.cpp: - * tests/MEM_Stream_Test.dsp: - * tests/Makefile: - * tests/Makefile.am: - * tests/Makefile.bor: - * tests/run_test.lst: - * tests/run_tests.bat: - * tests/run_tests.lst: - * tests/run_tests.psosim: - * tests/tests.dsw: - * tests/version_tests/MEM_Stream_Test.dsp: - * tests/version_tests/version_tests.dsw: Added a new - MEM_Stream_Test. - -Sun Dec 17 19:32:58 2000 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/Malloc_T.cpp (shared_malloc): After a win32 structural - exception occurs, we need to re-execution the expression that - causes the exception. Thanks to Roger Beck - <roger_beck@royalsun.com.au> for reporting this. - - * ace/MEM_IO.i (fetch_recv_buf, recv): Differentiate the - cases of end of message and errors. - - * ace/Malloc_T.h: - * ace/Malloc_T.i: Added a base_addr method to return the base - address of the ACE_Malloc so we don't have to depend on MMAP's - base_addr method. - - * ace/MEM_SAP.i (set_buf_len,get_buf_len): Changed to computer - buffer location using the base_addr method in ACE_Malloc as the - one in Memory_Pool only indicates the fixed based addr. - - * ace/MEM_Acceptor.i: - * ace/MEM_Acceptor.h: Added a method to set the prefix of MMAP - filename. - - * ace/MEM_Acceptor.cpp (ACE_MEM_Acceptor): - * ace/MEM_Connector.cpp (ACE_MEM_Connector): Changed to MMAP - Options to allow MMAP files to be mapped at any address. - -Sun Dec 17 18:42:13 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Refcounted_Auto_Ptr.h: Need to add "ace/Auto_Ptr.h" here to - get the definition of ACE_Basic_Auto_Ptr. - - * tests: Added the Refcounted_Auto_Ptr_Test.cpp, which tests - the new ACE_Refcounted_Auto_Ptr class. Thanks to Johnny Tucker - <JTucker@infoglide.com> for contributing this. - - * tests/Refcounted_Auto_Ptr_Test.dsp, - tests/Refcounted_Auto_Ptr_Test.dsw - tests/Refcounted_Auto_Ptr_Test.icc: Added the projects to - compile the Refcounted_Auto_Ptr_Test.cpp. - - * tests/Makefile, - * tests/run_test.lst, - * tests/run_tests.lst: Added the Refcounted_Auto_Ptr_Test. - -Sun Dec 17 11:00:47 2000 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/Date_Time.i (update): Fixed a typo. - -Sun Dec 17 08:52:04 2000 Carlos O'Ryan <coryan@uci.edu> - - * etc/tao_smartproxies.doxygen: - This file was left out from a previous commit. - -Sat Dec 16 09:36:56 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Date_Time: Added a new method update() to reset the current - date/time and also added a new constructor that calls update() - to initialize an ACE_Date_Time implicitly, rather than having to - pass all the values into the constructor. Thanks to Jerry - Odenwelder <jerryo@atl.fundtech.com> for contributing this. - -Fri Dec 15 15:27:02 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_compile: - * bin/make_pretty.pl: - The DU/CXX compiler has three levels, 'Error', 'Warning' and - 'Info:', the latter was being ignored. - -Fri Dec 15 14:36:33 2000 Christopher Kohlhoff <chris@kohlhoff.com> - - * include/makeinclude/clean.bor: - * include/makeinclude/recurse.bor: - - Added new 'realclean' target to Borland makefiles for - removing all generated files (both intermediate and final). - Thanks to Johnny Willemsen <johnny.willemsen@meco.nl> for - suggesting this. - -Fri Dec 15 14:32:06 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Log_Msg.h (ACE_Log_Msg): Changed the documentation - to reflect the fact that the %a option causes the program to - abort() rather than exit(). Thanks to Mike Curtis - <mccurry@my-deja.com> for pointing this out. - -Fri Dec 15 14:29:44 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/generate_doxygen.pl: - Generate documentation for the new TAO_SmartProxies library. - -Fri Dec 15 10:22:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * bin/auto_run_tests.pl: - - Included PerlACE::Run_Test instead of ACEUtils and - ConfigList. - -Fri Dec 15 09:22:05 2000 Carlos O'Ryan <coryan@uci.edu> - - * examples/Connection/non_blocking/Makefile: - Fixed dependencies between the binaries and the library - generated in this directory, otherwise parallel builds can - fail. - -Thu Dec 14 10:36:45 2000 Darrell Brunsch <brunsch@uci.edu> - - * bin/auto_run_tests.lst: - * tests/run_test.lst: - - Converted to the new PerlACE::ConfigList style of .lst - files (can now say stuff like "Test: MSVC !Borland") - - * bin/auto_run_tests.pl: - * bin/auto_compile: - * tests/run_test.pl: - - Changed to use PerlACE::ConfigList. - - [Bug 729] - - * bin/ACEutils.pm: - - Made sure it would eat the -Config option so it will not - be a problem if old run_test.pl's don't get updated - immediately. - - * bin/msvc_auto_compile.pl: - - Added -d flag for debugging (just prints out what would be - compiled) - - * bin/fuzz.pl: - - Added a rudimentary run_test.pl out-of-date test. - -Thu Dec 14 10:20:49 2000 Chad Elliott <elliott_c@ociweb.com> - - * include/makeinclude/platform_lynxos.GNU - Allow users to set the debug option without using - 'override debug='. debug=0 now works properly. - -Thu Dec 14 06:00:12 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace: Removed makefile-light since it's no longer needed. - Thanks to Johnny Willemsen <johnny.willemsen@meco.nl> for - reporting this. - -Wed Dec 13 18:33:19 2000 Carlos O'Ryan <coryan@uci.edu> - - * html/README: - Add README file explaining why the directory is empty and why - the index.html URLs don't work unless you download or generate - the Doxygen files. - - * html/index.html: - Add entry for the smart proxies library. - -Wed Dec 13 18:27:29 2000 Carlos O'Ryan <coryan@uci.edu> - - * THANKS: - Add 'Pedro Ferreira' to the hall of fame. - -Thu Dec 13 18:18:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * bin/PerlACE/ConfigList.pm: (added) - * bin/PerlACE/Process.pm: (added) - * bin/PerlACE/Process_Unix.pm: (added) - * bin/PerlACE/Process_Win32.pm: (added) - * bin/PerlACE/Run_Test.pm: (added) - - These are a couple of Perl modules that will be used - to simplify current run_test.pl's and the auto_builds - and to allow us to run tests on Win32 for configurations - that output executables into subdirs (Win32 Release, - Win32 Static *, Borland). The conversion of scripts over - to the new style will occur in separate checkins. - - ConfigList provides a more powerful *.lst format for - specifying test lists. Process is a newer version of - the old bin/Process.pm that has a different interface - and a couple of extra methods for common tasks for - our scripts. And Run_Test.pm will replace the - bin/ACEutils.pm and be the main module for our - run_test.pl scripts. It contains some common subroutines - and automatically parses some arguments via ARGV. - - * docs/run_test.txt: (added) - - A bit of documentation on how new run_test.pl's will - look. - -Wed Dec 13 18:15:03 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/CDR_Stream.h: - Made some of the adjust() methods public, this is used to - optimize TAO's implementations of CORBA::Any. - -Wed Dec 13 12:59:49 2000 Darrell Brunsch <brunsch@uci.edu> - - * bin/PerlACE/Process_Unix.pm: - - Fixed PerlACE::Process on Unix to have the same interface as - the Win32 version. - -Tue Dec 12 09:52:00 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * Well, it looks like we finally have a new president in the - US, yow! - -Tue Dec 12 04:53:17 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Service_Config.{h,i}: Added an inequality operator. - Thanks to Mike Curtis <mccurry@my-deja.com> for pointing this - out. - - * ace/Service_Config.cpp (process_commandline_directives): Changed - a check for error values being -1 to being != 0 since process_directive() - can return - - 1) a positive number of parse errors - 2) and -1 on a certain ACE_NEW_RETURN call - 3) but always zero on success. - - Thanks to Mike Curtis <mccurry@my-deja.com> and - Munagala Ramanath <Munagala.Ramanath@PostX.com> - for pointing this out. - -Tue Dec 12 01:07:39 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/Log_Msg.cpp: - - Changed a comment to remove a false warning by fuzz. - -Mon Dec 11 15:10:00 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Get_Opt.h: - In some platforms 'optind', 'optarg' and 'opterr' are defined as - macros, undefine them because we use the same identifiers as - variable names. - - * ace/OS.h: - If 'timezone' is defined as a macro in the system header files - then define ACE_TIMEZONE and #undef timezone. - The ACE_OS::timezone() method cannot be compiled otherwise, but - unfortunately this forces us to disable support for the method - under that sort of platform. - - * ace/OS.h: - Do not include sys/shm.h if ACE_LACKS_SYSV_SHMEM is defined, - there is no reason to #include the file if we are not using it - anyway. - - * ace/ACE.cpp: - Check the return value from getrlimit() before accepting its - results. - -Mon Dec 11 00:50:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/ace_wchar.h: - - Created an ACE_ANTI_TCHAR and ACE_TEXT_ANTI_TO_TCHAR. - ACE_ANTI_TCHAR has the opposite behavior of ACE_TCHAR. - - * ace/Process.cpp: - * ace/Process.h: - * ace/Process.i: - - Added wchar_t versions of: - - - ACE_Process_Options::working_directory (wd) - - ACE_Process_Options::command_line (format, ...) - - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - - Added wchar_t versions of: - - - ACE_OS::cond_init () - 2 versions - - ACE_OS::mutex_init () - - ACE_OS::thread_mutex_init () - - ACE_OS::event_init () - - ACE_OS::sema_init () - - On Win32, these should be implemented using the *W version - of the APIs. On other platforms, they call the char version - of the same ACE_OS call with a converted string. - - * ace/Log_Msg.h: - * ace/Log_Msg.cpp: - - Changed the first parameter to set and conditional_set from - being ACE_TCHAR to just char. We'll assume filenames are - always ansi strings (since __FILE__ seems to act this way). - There was actually a dangling pointer problem in the - conditional_set when ACE_USES_WCHAR was defined before. - - Added an ANTI_TCHAR version of log (priority, format, ...). - What this means is now we can use either narrow or wide - format strings with Log_Msg, regardless of whether ACE_USES_WCHAR - is defined or not. Hopefully this means we can get rid of a lot - of the ACE_TEXT and ACE_LIB_TEXT's in our code. - - Added a couple of more specifiers, %C and %w. So for characters - and strings we have: - - %c : print out an ansi character - %C : print out an ansi string - %s : print out an ACE_TCHAR * string - %w : print out a wide character - %W : print out a wide string - - An example, which will also function correctly even when - ACE_USES_WCHAR is defined: - - void print (char *a_str, wchar_t *w_str, ACE_TCHAR *t_str) - { - ACE_DEBUG ((LM_DEBUG, - "%C %s %W\n", - a_str, - t_str, - w_str)); - } - - Unfortunately this only really takes care of the string - specifiers. There is still work to be done with the other - implicit string specifiers (%p, %N, etc.). - - * ace/RMCast/RMCast_IO_UDP.cpp: - * ace/RMCast/RMCast_Reassembly.cpp: - * ace/SSL/SSL_Context.cpp: - * ace/SSL/SSL_SOCK_Acceptor.cpp: - * ace/SSL/SSL_SOCK_Connector.cpp: - * ace/SSL/SSL_SOCK_Stream.i: - - Removed unnecessary ACE_TEXT's to see how things go. - - * docs/wchar.txt: - - Updated the documentation. - -Fri Dec 8 13:47:58 2000 Jeff Parsons <parsons@cs.wustl.edu> - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - - Added Refcounted_Auto_Ptr.{h,i} to these projects. - -Fri Dec 8 10:34:32 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Makefile: Added Refcounted_Auto_Ptr to the list of template - files. - - * ace/Auto_Ptr.{h,i}: - * ace/Refcounted_Auto_Ptr.{h,i}: Moved the new - ACE_Refcounted_Auto_Ptr into a separate file to reduce - unnecessarily coupling in ACE. Thanks to Darrell Brunsch for - pointing this out. - -Fri Dec 8 09:27:01 2000 Chad Elliott <elliott_c@ociweb.com> - - * include/makeinclude/platform_chorus4.x_g++.GNU: - - Modified to build only static libraries. Something changed - between the time of the port and now, which caused it to try - to build shared libraries (which Chorus 4.0 doesn't support). - -Fri Dec 8 06:47:12 2000 Christopher Kohlhoff <chris@kohlhoff.com> - - * tests/Makefile.bor: - - Use variable called TARGET_NAME instead of NAME to - prevent clash with nightly build scripts. - -Thu Dec 7 13:16:23 2000 Darrell Brunsch <brunsch@uci.edu> - - * examples/IPC_SAP/SPIPE_SAP/server.cpp: - - Removed PERMS global variable, since it wasn't being - used (which KCC noticed). - - * examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp: - * examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp: - * examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp: - * examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp: - - When calling ACE_OS::cuserid and passing a NULL pointer, it - should be cast to something like char * or wchar_t *. In - this case it should be a char *, so I added a - ACE_static_cast for it. - -Thu Dec 7 02:31:44 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/config-WinCE.h: - - Disabled inlining for SH3 Release configuration. The SH3 compiler - has problems with inlined functions (in this case, ACE_OS::dlerror's - static variable was staying unresolved). Thanks to Ricardo Chan - <ricchan@nortelnetworks.com> for pointing this out to me. - -Thu Dec 7 03:33:49 2000 Marina Spivak <marina@cs.wustl.edu> - - * bin/auto_run_tests.lst: - - Added RTCORBA MT test. - -Wed Dec 6 19:52:42 2000 Darrell Brunsch <brunsch@uci.edu> - - - * ace/Auto_Ptr.i: - - Added a couple of ACE_INLINEs and an include of Synch_T.h. - -Wed Dec 06 20:12:35 2000 Irfan Pyarali <irfan@cs.wustl.edu> - - * ace/Containers_T.cpp (operator=): In case the existing array is - larger than the rhs (right hand side), we don't have to free and - reallocate the existing array. However, we do need to run the - destructor on the array elements that will be replaced. Hence, - I added a call to ACE_DES_ARRAY_NOFREE for the elements being - replaced. - - This fixes bug 704. Thanks to Martin Krumpolec - <krumpo@pobox.sk> for reporting the bug and for providing an - example illustrating the problem. - -Wed Dec 6 14:29:13 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Auto_Ptr.{h,i}: Added a new set of class (ACE_Refcounted_Auto_Ptr_Rep, - ACE_Refcounted_Auto_Ptr) that implements support for a reference - counted auto_ptr. Thanks to Johnny Tucker - <JTucker@infoglide.com> for contributing this. - - * ace/Managed_Object.h: Added ACE_UNIMPLEMENTED_FUNC macros for - copy constructor and assignment operator in class - ACE_Cleanup_Adapter. Thanks to Johnny Willemsen - <johnny.willemsen@meco.nl> for reporting this. - - * tests/run_tests.sh: Prevent null or zero-length string test name from being - passed into the run() function. Thanks to Jon Loeliger - <jloeliger@chiaro.com> for reporting this. - - * tests/Log_Msg_Test.cpp, - * examples/Log_Msg/test_log_msg.cpp (main): - Replaced int with u_long to make compilers happy. Thanks to - Mike Curtis <mccurry@my-deja.com> for pointing this out. - -Tue Dec 5 11:45:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/SSL/SSL_SOCK_Acceptor.cpp: - - Added ACE_TEXT to a debug message. - -Tue Dec 5 10:07:14 2000 Carlos O'Ryan <coryan@uci.edu> - - * performance-tests/Misc/childbirth_time.cpp: - Use &function instead of just function, hopefully that will make - Sun/CC 5.0 happy. - -Tue Dec 5 09:38:22 2000 Ossama Othman <ossama@uci.edu> - - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - - Return "-1" instead of the result of the - ACE_SSL_SOCK_Stream::close() method. The latter may actually, - and most likely will return without error. - -Tue Dec 05 05:39:39 2000 Christopher Kohlhoff <chris@kohlhoff.com> - - * tests/Makefile.bor: - - Implemented 'clean' support in the ACE tests makefile. - -Tue Dec 05 02:02:51 2000 Irfan Pyarali <irfan@cs.wustl.edu> - - * ace/IPC_SAP.cpp (disable): Reverted this change: - - Tue Nov 21 17:42:36 2000 Pradeep Gore <pradeep@cs.wustl.edu> - - The change seemed too low level where it might end up effecting - more code than was intended. However, as I discussed with Chris - Uzdavinis <chris@atdesk.com>, the correct solution is to - specialize the activation of the Svc_Handler rather than its - accepting. - -Mon Dec 04 23:54:10 2000 Irfan Pyarali <irfan@cs.wustl.edu> - - * examples/Reactor/Proactor/test_proactor.cpp: - - - Receiver::open(): Only duplicate the message block when we are - faking the result. Otherwise, initiate_read_stream will create - its own message block. - - - Receiver::open(): Delete the fake result. - - - Receiver::handle_read_stream(): When there is no more data to - read, release the message block and delete the receiver. - - - Sender::transmit_file(): No need to duplicate the trailer. - - * ace/Proactor.cpp (~ACE_Proactor_Timer_Handler): - - The following was changed: - - this->thr_mgr ()->wait (); - - to: - - this->thr_mgr ()->wait_grp (this->grp_id ()); - - since Thread_Manager::wait() if called while the - ACE_Object_Manager is shutting down (as a result of program - shutdown or ACE::fini), it will not wait for any threads to - complete. - - Also, the timer_handler thread was not created detached since - Thread_Manager::wait_grp() does not wait on detached threads. - -Mon Dec 04 16:32:11 2000 Ossama Othman <ossama@uci.edu> - - * ace/SSL/SSL_SOCK_Stream.i (recv): - - Shutdown the SSL connection if SSL_read() returns with an - SSL_ERROR_ZERO_RETURN OpenSSL error condition. - SSL_ERROR_ZERO_RETURN indicates that the peer is shutting down, - and that a "close_notify" message SSL message has been issued by - the peer. A "close_notify" message indicates that no further - data will be sent through the given connection, so there is no - need to keep the connection open. - - Removed SSL_ERROR_WANT_{WRITE,X509_LOOKUP} switch statement - cases. They are apparently not necessary when performing a SSL - read. - - (send): - - Removed SSL_ERROR_WANT_{READ,X509_LOOKUP} switch statement - cases. They are apparently not necessary when performing a SSL - write. - - * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): - - Check that the X.509 verification didn't fail. If the - verification failed then do not continue. - - * ace/SSL/SSL_Context.cpp: - * ace/SSL/SSL_SOCK_Connector.cpp: - * ace/SSL/SSL_SOCK_Stream.cpp: - - Added missing ACE_RCSID macros. - - * ace/SSL/SSL_Context.h: - * ace/SSL/SSL_SOCK.h - * ace/SSL/SSL_SOCK_Acceptor.h: - * ace/SSL/SSL_SOCK_Connector.h: - * ace/SSL/SSL_SOCK_Stream.h: - - Doxygenated these headers. - - * ace/SSL/SSL_Context.i: - * ace/SSL/SSL_SOCK.cpp: - - Cosmetic updates. - -Mon Dec 04 12:45:46 2000 Steve Huston <shuston@riverace.com> - - * ace/High_Res_Timer.cpp: Corrected some problems with Linux on - Pentium that were introduced by this: - Fri Nov 10 10:42:31 2000 Steve Huston <shuston@riverace.com> - - * ace/High_Res_Timer.cpp: Replaced all occurrences of - "defined (ACE_HAS_PENTIUM)" with "defined (ACE_WIN32)" since - there is nothing Pentium-specific any longer in the Win32 - sections. - - Thanks to David Levine and Carlos O'Ryan for weeding this bug out. - -Mon Dec 4 07:39:16 2000 Johnny Willemsen <jwillemsen@remedy.nl> - - * examples/Service_Configurator/IPC-tests/clients: - Added Borland C++ Builder specific makefile. - -Sun Dec 3 20:03:16 2000 Ossama Othman <ossama@uci.edu> - - * examples/Web_Crawler/Command_Processor.cpp: - - Removed duplicate template instantiations. Thanks to Paul Rubel - <prubel@bbn.com> for pointing out this bug, and for providing a - fix. - - * THANKS: - - Added Paul to the Hall-of-Fame. - -Sun Dec 3 15:23:50 2000 Carlos O'Ryan <coryan@uci.edu> - - * performance-tests/Misc/childbirth_time.cpp: - Use 'extern "C"' for the thread entry point, this should make - Sun/CC 5.0 (and other compilers) happy. - -Sun Dec 3 08:50:15 2000 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/OS.i: Fixed a cut and paste error. This was from the BUG# - 734 in bugzilla. Thanks to Martin Krumpolec <krumpolec@pobox.sk> - for reporting this. - -Sat Dec 2 05:58:37 2000 Christopher Kohlhoff <chris@kohlhoff.com> - - * ace/config-win32-borland.h: - - Automatically define WIN32 macro if we are able to - determine that it is the target platform from pre- - defined compiler macros. - - * ace/Makefile.bor: - - Added missing template source file for install target. - -Sat Dec 2 00:19:38 2000 Marina Spivak <marina@cs.wustl.edu> - - * bin/auto_run_tests.lst: - - Added RTCORBA/Explicit_Binding test. - -Fri Dec 01 21:17:35 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Thread_Manager.cpp: - More ACE_LEGACY_MODE fixes. - -Fri Dec 1 13:49:36 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Log_Msg.cpp: - Fixed problems on non-legacy Win32 builds. - -Fri Dec 1 09:46:15 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Log_Msg.h: - * ace/Log_Msg.cpp: - The structured exception handler methods should show up on - ACE_LEGACY_MODE builds. Unfortunately, the change from - ACE_LATEST_AND_GRATEST to LEGACY_MODE didn't work here because - the LATEST_AND_GREATEST macro was misspelled. - -Fri Dec 1 09:30:08 2000 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/platform_linux.GNU: - Add support for wxWindows under linux. - -Fri Dec 1 10:56:42 2000 Jeff Parsons <parsons@cs.wustl.edu> - - * include/makeinclude/ace_flags.bor: - - Added definitions necessary for the new smart proxies - library and its Borland makefile. - -Fri Dec 01 09:21:31 2000 Steve Huston <shuston@riverace.com> - - * ace/Reactor.h: Clarified some comments. - -Thu Nov 30 22:49:10 2000 pradeep@cs.wustl.edu <pradeep@cs.wustl.edu> - - * ACE version 5.1.11 released. - -Wed Nov 29 23:55:37 2000 Pradeep Gore <pradeep@cs.wustl.edu> - - * apps/drwho/server.cpp: - * apps/drwho/BS_Client.cpp: - Used casts to quiet VxWorks/LynxOS. - * bin/auto_run_tests.lst: - Commented out this test - its broken. - -Wed Nov 29 10:35:26 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp (parse_args): - Removed the colon after the "r" in the parse-args list. Thanks - to Mike Curtis <mccurry@my-deja.com> for pointing this out. - - * ace/Method_Request.h: Added ACE_UNIMPLEMENTED_FUNC to the - assignment operator and copy constructor of ACE_Method_Request. - Thanks to Johnny Willemsen <johnny.willemsen@meco.nl> for - pointing this out. - -Wed Nov 29 09:41:51 2000 Johnny Willemsen <jwillemsen@remedy.nl> - - * examples/Reactor/Multicast/*.bor - Added Borland C++ Builder specific makefiles. Thanks to - Albert Wijna <albert.wijnja@meco.nl> for creating these. - -Tue Nov 28 15:39:51 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_compile: - Print out an error message when the script returns a non-zero - code. The errors where reported by email, but they didn't show - up in the make_pretty output. - -Tue Nov 28 15:36:10 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/generate_doxygen.pl: - Don't generate inline code for releases, it bloats the - documentation, and does not make things any clearer. - - * html/index.html: - Fixed URLs - - * etc/ace.doxygen: - * etc/ace_man.doxygen: - * etc/ace_rmcast.doxygen: - * etc/ace_ssl.doxygen: - * etc/tao_dynamicany.doxygen: - * etc/tao_dynamicinterface.doxygen: - * etc/tao_esf.doxygen: - * etc/tao_implrepo.doxygen: - * etc/tao_iormanip.doxygen: - * etc/tao_iortable.doxygen: - * etc/tao_portableserver.doxygen: - * etc/tao_rtevent.doxygen: - * etc/tao_strategies.doxygen: - Make sure that ACE_THROW_SPEC is properly defined. - - * etc/tao.doxygen: - Also fix the relative path to the ace doxygen files. - -Tue Nov 28 13:31:47 2000 David L. Levine <levine@cs.wustl.edu> - - * tests/run_test.pl: prefix exec of run_tests.sh with - $EXEPREFIX, so that it works without . in the user's - PATH. Thanks to Carlos for pointing this out. - -Tue Nov 28 08:09:35 2000 David L. Levine <levine@cs.wustl.edu> - - * tests/run_test.pl: added some more diagnostics to try - to figure out why run_tests.sh can't be exec'd on - UCI machines. - -Mon Nov 27 17:02:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ACE-INSTALL.html: - While following up on Johnny Willemsen's - <johnny.willemsen@meco.nl> suggestion to make sure I removed all - references to .mdp files, I noticed that some of the Win32 - instructions could use some updating. - -Mon Nov 27 17:44:52 2000 David L. Levine <levine@cs.wustl.edu> - - * tests/run_test.pl: if run_tests.sh doesn't exist, print - a diagnostic message and continue with the run_test.pl - version of the tests. For unknown reasons, this change: - Mon Nov 27 11:58:43 2000 David L. Levine <levine@cs.wustl.edu> - doesn't work on the UCI Linux machines, run_tests.sh can't - be exec'd. - -Mon Nov 27 10:17:58 2000 Ossama Othman <ossama@uci.edu> - - * docs/tutorials/005/005.dsp: - - Corrected name of output binary. It should have been - `server.exe' not `client.exe'. Thanks to David Channon - <djc@uq.net.au> for reporting this problem. - -Mon Nov 27 09:56:09 2000 Ossama Othman <ossama@uci.edu> - - The following updates are based on feedback from David Channon - <djc@uq.net.au>. Thanks David! - - * docs/tutorials/003/client.cpp: - * docs/tutorials/003/page01.html: - * docs/tutorials/004/client.cpp: - * docs/tutorials/004/page01.html: - * docs/tutorials/008/broadcast_client.cpp: - * docs/tutorials/008/directed_client.cpp: - * docs/tutorials/008/page02.html: - * docs/tutorials/008/page03.html: - * docs/tutorials/008/page04.html: - * docs/tutorials/008/server.cpp: - * docs/tutorials/009/broadcast_client.cpp: - * docs/tutorials/009/directed_client.cpp: - * docs/tutorials/009/page02.html: - * docs/tutorials/009/page03.html: - * docs/tutorials/009/page04.html: - * docs/tutorials/009/server.cpp: - * docs/tutorials/019/client.cpp: - * docs/tutorials/019/client2.cpp: - * docs/tutorials/019/page02.html: - * docs/tutorials/019/page03.html: - * docs/tutorials/019/page04.html: - * docs/tutorials/019/page05.html: - * docs/tutorials/019/server.cpp: - * docs/tutorials/019/server2.cpp: - * docs/tutorials/019/shmem.cpp: - * docs/tutorials/020/client.cpp: - * docs/tutorials/020/client2.cpp: - * docs/tutorials/020/mmap.cpp: - * docs/tutorials/020/page02.html: - * docs/tutorials/020/page03.html: - * docs/tutorials/020/page04.html: - * docs/tutorials/020/page05.html: - * docs/tutorials/020/server.cpp: - * docs/tutorials/020/server2.cpp: - - Include "ace/Log_Msg.h" to pull in the ACE_{DEBUG,ERROR} - macros. The example code in the HTML files was also updated. - - * docs/tutorials/011/message_queue.cpp: - * docs/tutorials/011/page02.html: - - Removed unnecessary line of code that NULL terminated a string. - It didn't serve any purpose since the string is already - terminated. If it wasn't terminated then that point in the code - would never have been reached since the code prior to it assumes - that the string is NULL terminated. - -Mon Nov 27 11:58:43 2000 David L. Levine <levine@cs.wustl.edu> - - * tests/run_test.pl: on platforms other than Win32, simply - exec run_tests.sh. run_tests.sh properly handles all of - the current ACE tests. [Bug 729] - -Mon Nov 27 14:12:09 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Activation_Queue.h: Added ACE_UNIMPLEMENTED_FUNC to the - assignment operator and copy constructor of - ACE_Activation_Queue. Thanks to Johnny Willemsen - <johnny.willemsen@meco.nl> for pointing this out. - -Sun Nov 26 19:07:48 2000 Pradeep Gore <pradeep@cs.wustl.edu> - - * examples/Map_Manager/test_hash_map_manager.cpp: - * examples/Shared_Malloc/Malloc.cpp: - * examples/Shared_Malloc/test_position_independent_malloc.cpp: - - Removed extraneous explicit template instantiation declarations - causing "multiply defined" errors on VxWorks and LynxOS. - -Sat Nov 25 22:08:46 2000 Pradeep Gore <pradeep@cs.wustl.edu> - - * apps/drwho/Makefile: - Disabled drwho compilation on Vxworks - it doesn't have - protocols/rwhod.h. - -Fri Nov 24 16:58:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/IPC_SAP.cpp: - - WSAEventSelect is not available on Windows CE, so the #ifdefs - were changed so it calls ioctl on Windows CE also. - -Fri Nov 24 15:43:20 2000 Carlos O'Ryan <coryan@uci.edu> - - * docs/ACE-categories.html: - Fixed URLs to Doxygen documents, I used the absolute URL to our - Doxygen site, but in the future we may want to do that - configurable. - - * bin/auto_run_tests.lst: - Disable the Connection_Purging test in TAO, it never worked and - the features are disabled while we continue to improve the - Connection Cache. - -Fri Nov 24 11:42:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ACE-INSTALL.html: - - Updated sections about Windows CE and MSVC. CE stuff - is documented in CE-status.txt, and removed references to old - MSVC 4.2 projects. Thanks to Johnny Willemsen - <johnny.willemsen@meco.nl> for pointing this out. - -Fri Nov 24 05:48:26 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Signal.h: Enhanced the documentation to clarify the role of - sigkey. Thanks to Oscar Rodriquez <Oscar.Rodriquez@eln.ericsson.se> - for motivating this. - - * ace/SOCK_Connector.h: Updated the documentation to clarify the - parameters to the constructors and the connect() method. Thanks - to Pierre Oberson <oberson@nagra-kudelski.ch> for suggesting this. - -Thu Nov 23 21:17:16 2000 David L. Levine <levine@cs.wustl.edu> - - * tests/Reactor_Notify_Test.cpp (main): added - auto_ptr<ACE_Reactor> so that the global Reactor instance - will be destroyed at the termination of main (). The cleans - up memory leaks that we introduced in this change to the test: - Tue Oct 24 12:30:47 2000 Steve Huston <shuston@riverace.com> - -Thu Nov 23 18:38:54 2000 Carlos O'Ryan <coryan@cs.wustl.edu> - - * Makefile: - Add ACE_wrappers/html to the list of files tagged, even though - they are not included in the tar or zip files. - -Thu Nov 23 18:13:32 2000 Carlos O'Ryan <coryan@cs.wustl.edu> - - Don't use 'grep -q' because Solaris' grep does not support it. - -Thu Nov 23 18:27:52 2000 Carlos O'Ryan <coryan@cs.wustl.edu> - - * Makefile: - The ACE-INSTALL file is generated in the staging directory, - there is no need to generate it locally too. - -Thu Nov 23 17:46:56 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Method_Request: Made the priority() method const. Thanks - to Johnny Willemsen <jwillemsen@remedy.nl> - -Thu Nov 23 14:43:40 2000 Carlos O'Ryan <coryan@uci.edu> - - * Makefile: - Do not include the html directory in the release. The doxygen - files are too big for this. - - * ace/config-doxygen.h: - Improve doxygen documentation. - - * bin/generate_doxygen.pl: - Add options to change the path to find dot and perl on the fly. - - * bin/make_release: - Generate the HTML documentation in a separate .tar.gz (or .zip) - file. - -Wed Nov 22 17:35:55 2000 Angelo Corsaro <corsaro@cs.wustl.edu> - - * bin/auto_run_tests.lst: - - Added entry for Collocation test. Moved entry for Client - Exposed Policy test from the old list file to this one. - -Wed Nov 22 09:29:32 2000 Darrell Brunsch <brunsch@uci.edu> - - * etc/ace.doxygen: - - Added the docs directory and *.txt files to be looked - at by doxygen. - - * docs/CE-status.txt: - * docs/wchar.txt: - - Fixed up these files, so they show up correctly in the - doxygen html pages. - -Tue Nov 21 19:55:49 200 0 Pradeep Gore <pradeep@cs.wustl.edu> - - * ace/IPC_SAP.cpp: - Casting param1 to SOCKET did the trick. Thanks Doug! - -Tue Nov 21 19:21:10 2000 Pradeep Gore <pradeep@cs.wustl.edu> - - * ace/IPC_SAP.cpp: - - Reverted previous change applied to ACE_IPC_SAP::disable because - of compile error. - -Tue Nov 21 18:54:14 2000 Pradeep Gore <pradeep@cs.wustl.edu> - - * apps/drwho/CM_Client.cpp: - - Explicitly cast Comm_Manager::sokfd_ to int in calls to - ACE_OS::recvfrom and ACE_OS::closesocket to quiet LynxOS. - -Tue Nov 21 17:42:36 2000 Pradeep Gore <pradeep@cs.wustl.edu> - - * ace/IPC_SAP.cpp: - - Modified ACE_IPC_SAP::disable to call ::WSAEventSelect on Win32. - Thanks to Chris Uzdavinis <chris@atdesk.com> for contributing - these changes. - -Tue Nov 21 11:00:14 2000 Darrell Brunsch <brunsch@uci.edu> - - * tests/run_test.lst: - - Borland shouldn't be running ACE_Init_Test. - -Tue Nov 21 10:15:15 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS_String.inl: - - Changed ::towlower to towlower since it can be a macro. - -Tue Nov 21 09:57:53 2000 Darrell Brunsch <brunsch@uci.edu> - - * tests/Reactor_Exceptions_Test.cpp: - - Code style fix. - - * tests/run_test.lst: - - New_Fail_Test just eats up memory when run, and it only tests - the behavior of new. Not really something we need to run - everynight (and as David Levine reports, using up all the - memory can cause problems in other processes on the nightly - build machines). Commented out the New_Fail_Test. - - * tests/run_test.pl: - - Fixed to clean up some of the backing_store_* files in the - tests directory after running the tests. - - * bin/ACEutils.pm: - - Added the ability to pick -ExeSubDir <dir> from the command - line to alter $EXEPREFIX. This should allow us to start - running tests with different configurations (ie. Win32 Release) - and on Borland. - -Tue Nov 21 07:24:54 2000 Chris Kohlhoff <chris@kohlhoff.com> - - * ace/SSL/Makefile.bor: - * include/makeinclude/build_dll.bor: - * include/makeinclude/build_exe.bor: - * include/makeinclude/build_lib.bor: - - Prevent SSL libraries from being built unless SSL_ROOT is defined. - - * include/makeinclude/build_example.bor: - - Add missing libraries required for statically linking TAO examples. - -Mon Nov 20 21:52:57 2000 Ossama Othman <ossama@uci.edu> - - * ace/Makefile.am: - - Added more missing files to the source lists. - -Mon Nov 20 19:16:12 2000 Ossama Othman <ossama@uci.edu> - - * ace/OS.i (mutex_init): - - Fixed an unused argument warning that was showing up in - ACE+Autoconf builds. - - * ace/Makefile.am (libACE_Utils_la_SOURCES): - - Updated "Init.cpp" to "Init_ACE.cpp." For some reason this - file wasn't updated when the name change was made. - - (libACE_Utils_la_SOURCES): - - Moved `Sock_Connect.cpp' to this list of sources. Similar to - the above change, this files wasn't updated when the - corresponding to changes was made to the classical Makefile. - -Mon Nov 20 15:00:26 2000 Marina Spivak <marina@cs.wustl.edu> - - * bin/auto_run_tests.lst: - - Added RTCORBA/Private_Connection, updated options for other - RTCORBA tests. - -Sun Nov 19 15:26:56 2000 Ossama Othman <ossama@uci.edu> - - * ace/SSL/sslconf.h - (ACE_DEFAULT_SSL_CERT_FILE, ACE_DEFAULT_SSL_CERT_DIR): - - On Win32, do not use UNIX-specific directories in certificate - paths. - -Sun Nov 19 10:37:48 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Add the new files to the MSVC projects. - - * ace/Dynamic_Service_Base.h: - Add missing file. - - * ace/Dynamic_Service_Base.cpp: - Removed template-like protections, this is a regular class. - - * ace/Dynamic_Service.i: - * ace/Dynamic_Service.cpp: - Cosmetic fixes. - -Sun Nov 19 08:05:08 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/Makefile: - Updated. - - * ace/Dynamic_Service.cpp: - * ace/Dynamic_Service.h: - * ace/Dynamic_Service_Base.cpp: - * ace/Dynamic_Service_Base.h: - Not all methods in Dynamic_Service were based on the SERVICE - types. Moved those to the base class 'Dynamic_Service_Base' and - the Dynamic_Service inherits from the base class. - -Sat Nov 18 15:39:49 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp: - Fixed a mistake in the "usage" string. Thanks to Mike Curtis - <mccurry@my-deja.com> for pointing this out. - -Sat Nov 18 11:35:53 2000 Darrell Brunsch <brunsch@uci.edu> - - * tests/OS_Test.cpp: - - Changed the signature of main to use ACE_TCHAR. Although - I don't consider this the "right" way of doing this, it - will make the builds happy with ACE_USES_WCHAR until we - implement something better. - -Sat Nov 18 09:58:17 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Basic_Types.h: - * ace/OS_Log_Msg_Attributes.h: - * ace/config-all.h: - Under LynxOS we must #include stdarg.h before stdio.h. - Thanks to David for letting us know about this. - -Fri Nov 17 14:24:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * include/makeinclude/clean.bor: - - Added the removal of *Cli.cpp, *Ser.cpp, etc. files which - is the output style of the TAO Param_Test. - - * tests/Reactor_Exceptions_Test.cpp: - - Put the handler in its own scope so it must be cleaned up - before the reactor. For whatever reason, it wasn't happening - in the right order on MSVC before. - - Also changed the exception error to a debug message, since - it really doesn't seem an error (we explicitly cause one). - -Fri Nov 17 11:22:08 2000 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/platform_sunos5_kcc.GNU: - Same fix as for platform_linux_kcc.GNU. - A little more detail has surfaced: apparently under this - compiler we attempted to link the static run-time and system - libraries if static_libs_only=1 was set. Not only this would be - unique (in that we don't do this for other compilers), but it - fails when only one directory is compiled with - static_libs_only=1, hile only the dynamic version of ACE (or any - other of our libraries) is compiled. - IMHO it is better to make it consistent with all the other - platforms, and leave the extra optimization of using static - system libraries for a future makefile option. - - * include/makeinclude/platform_linux_kcc.GNU: - Remove obsolete comment - -Fri Nov 17 03:37:37 2000 Marina Spivak <marina@cs.wustl.edu> - - * bin/auto_run_tests.lst: - - Added RTCORBA/Banded_Connections test. - -Fri Nov 17 01:16:25 2000 Ossama Othman <ossama@uci.edu> - - * include/makeinclude/wrapper_macros.GNU (ssl): - - Removed definition of the ACE_HAS_SSL macro. It is no longer - used. - -Thu Nov 16 16:14:03 2000 Carlos O'Ryan <coryan@uci.edu> - - * Makefile: - * html/doxygen.css: - * html/index.html: - New html directory. People normally don't expect html documents - to show up under the man directory. - - * configure.in: - * bin/bootstrap: - * man/Makefile.am: - * man/html/Makefile.am: - Remove the man/html directory. - - * bin/make_release: - Insert code to generate the man pages index. - - * docs/ACE-categories.html: - Change references to man/html so they point to the new doxygen - generated files. - - * bin/README.html: - * bin/class2hxxcxx: - * bin/class2hxxcxxsingle: - * bin/class2info: - * bin/class2info.awk: - * bin/class2man: - * bin/class2mml: - * bin/class2src: - * bin/classinfo.ps: - * bin/generate_html_windex: - * bin/generate_man_pages: - * bin/hiding.fmt: - * bin/html-windex: - * bin/info2doc.awk: - * bin/info2doc.fmt: - * bin/info2head: - * bin/info2head.fmt: - * bin/info2headsrc: - * bin/info2man: - * bin/info2mml: - * bin/info2src: - * bin/info2src.awk: - * bin/man2html: - * bin/man2html1.awk: - * bin/man2html2.awk: - * bin/vendor.fmt: - Remove old scripts used in man page and html document - generation. We do everything with doxygen now. - -Thu Nov 16 17:55:18 2000 Pradeep Gore <pradeep@cs.wustl.edu> - - * apps/JAWS/clients/Blobby/Blob.{h,cpp}: - * apps/JAWS/clients/Blobby/Blob_handler.{h,cpp}: - * apps/drwho/Rwho_DB_Manager.h: - * apps/drwho/Multicast_Manager.{.h,cpp}: - * apps/drwho/Options.{h,cpp}: - Follow const correctness to make suncc5 happy. - - * examples/IOStream/server/iostream_server.h - Use ACE_HAS_TEMPLATE_TYPEDEFS rather than ACE_HAS_TYPENAME_KEYWORD - Thanks to Steve Huston <shuston@riverace.com> for the fix. - -Thu Nov 16 15:31:20 2000 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/platform_linux_kcc.GNU: - Builds with static libraries under Linux/KCC were failing due to - some magical -Bstatic options in the configuration file. When - the options are removed the problem went away. - -Thu Nov 16 15:31:20 2000 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/platform_linux_kcc.GNU: - Builds with static libraries under Linux/KCC were failing due to - some magical -Bstatic options in the configuration file. When - the options are removed the problem went away. - -Thu Nov 16 15:09:25 2000 Carlos O'Ryan <coryan@uci.edu> - - * tests/TkReactor_Test.cpp: - Fixed 'char*' vs. 'const char *' conflict. - -Wed Nov 15 14:23:54 2000 Ossama Othman <ossama@uci.edu> - - * configure.in: - - Fixed bug in the auto_ptr / C++ std namespace test where the - template argument for the auto_ptr being instantiated was - a non-existent type. - Reported by Kevin Marhsall <KCMarshall@att.net> - - * THANKS: - - Added Kevin to the hall of fame list. - -Wed Nov 15 10:19:45 2000 Carlos O'Ryan <coryan@uci.edu> - - * examples/Threads/thread_specific.cpp: - Fixed warning under linux - -Wed Nov 15 08:32:58 2000 Carlos O'Ryan <coryan@uci.edu> - - * apps/JAWS/server/Makefile: - * performance-tests/Misc/Makefile: - Change dependencies to ensure that the libraries are created - before we attempt to link the binaries, otherwise the - compilation fails with parallel builds. - -Tue Nov 14 17:55:52 2000 Carlos O'Ryan <coryan@uci.edu> - - * Makefile: - PACE is disabled by default, unless pace=1 is set in the command - line or the platform_macros.GNU file. - -Tue Nov 14 19:36:47 2000 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/test_siosig_ace.cpp: Don't log - the read/written file using ACE_DEBUG - it will usually overflow - the ACE_Log_Record max message length and do bad things. - -Tue Nov 14 19:19:16 2000 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/simple_test_proactor.cpp: Don't log - the read/written file using ACE_DEBUG - it will usually overflow - the ACE_Log_Record max message length and do bad things. - Thanks to John Buckman <john@lyris.com> for reporting this. - -Tue Nov 14 18:43:51 2000 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/test_proactor3.cpp: Replace use of - list<Sender *> with Sender * [] so it builds without inifintely - complicated explicit instantiations on gcc. KISS ;-) - -Tue Nov 14 17:43:26 2000 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/test_aiocb_ace.cpp: Fixed to work - correctly if one of the aio ops completes, but not the other, - during a pass through the Test_Aio::do_aio loop. Thanks to - John Buckman <john@lyris.com> for reporting this. - -Tue Nov 14 14:19:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/Log_Record.cpp: - - In ACE_Log_Record::print, changed the call to ACE_OS::fprintf - to use ACE_TEXT("%s") as the second argument instead of just - "%s". This should make logging under ACE_USES_UNICODE readable. - Thanks to James Buck <jim@nowsol.com> and Nick Pratt - <npratt@microstrategy.com> for both reporting this problem and - submitting patches. - -Tue Nov 14 09:19:16 2000 Carlos O'Ryan <coryan@uci.edu> - - * examples/Threads/thread_specific.cpp: - Simply use %u to print an ACE_hthread_t. This is what we seem - to be doing in other places in the code. However, this seems to - be non-portable, the code in ACE_Log_Msg to print the thread ID - is a lot more complicated. - -Mon Nov 13 15:13:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/Object_Manager.cpp: - - Protected the assert dialog box disable with _MSC_VER - since it is only for MSVC. - -Mon Nov 13 03:46:21 2000 Darrell Brunsch <brunsch@uci.edu> - - * docs/CE-status.txt: - * docs/wchar.txt: (added) - - Updated documentation == good thing. - -Mon Nov 13 03:39:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/config-win32-borland.h: - - It looks like Borland also uses _wcsdup, so added the - ACE_WCSDUP_EQUIVALENT here. - -Mon Nov 13 01:07:36 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS_String.cpp: - * ace/config-win32-borland.h: - * ace/config-win32-msvc.h: - - Christopher Kohlhoff <chris@kohlhoff.com> mentioned to me - that Borland did have a wcsdup, but it was named differently - than the _wcsdup in MSVC. I took his suggestion and added - a ACE_WCSDUP_EQUIVALENT for MSVC's version and enabled - wcsdup for Borland's config. - -Mon Nov 13 00:36:29 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/Obstack.cpp: - * ace/Obstack.h: - - Nanbor mentioned to me the other day that the interfaces to - this class probably should remain as char *. After looking - at it, I agreed and changed it to that. But since Svc_Conf - uses this class in such a way that it is passing wchar_t - strings to it when ACE_USES_WCHAR is defined, I also added - a wchar_t version of copy to make things happy. - -Sun Nov 12 17:00:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/ace_ce.dsw: (removed) - * ace/ace_dll_ce.dsp: (removed) - * ace/ace.vcw: (added) - * ace/ace_dll.vcp: (added) - * ace/ace_os_dll.vcp: (added) - - Removed the old Windows CE project files, and replaced - them with ones created by the eMbedded Visual C++ from - MS. - - * ace/OS_Errno.cpp: (added) - * ace/OS_Errno.h: (added) - * ace/OS_Errno.inl: (added) - * ace/config-all.h: - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - - Moved the Errno stuff from ACE_OS to a separate class, - since it needed to be in its own layer for Windows CE. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - - Added OS_Errno.* files. - - * ace/ACE.cpp: - * ace/Sock_Connect.cpp: - - Moved get_reg_value () to Sock_Connect since that is where - it is being used. - - * ace/ARGV.cpp: - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - - Added ACE_LACKS_ENV for platforms (like Windows CE) which - doesn't have an environment. Maybe in the future this can - be emulated, for now, we do nothing. - - * ace/Base_Thread_Adapter.h: - * ace/OS.h: - - Replace ACE_Export with ACE_OS_Export. - - * ace/Base_Thread_Adapter.inl: - * ace/Thread_Adapter.inl: - - Moved some of the ACE_OS_Thread_Descriptor methods to - Base_Thread_Adapter, since they were declared in - Base_Thread_Adapter.h. - - * ace/SUN_Proactor.cpp: - - Removed ACE_BUILD_DLL from this file, since it should only - be defined in the project file. - - * ace/OS_Dirent.h: - - Added ACE_WINCE to the #if block around some of the includes. - - * ace/OS_Memory.h: - * ace/OS_Dirent.inl: - * ace/OS_String.inl: - * ace/OS.h: - - Added /**/ to the #includes of pace, since they seem to - totally confuse EVC's automatic dependency generation. - - * ace/OS_String.cpp: - * ace/OS_String.h: - * ace/OS_String.inl: - - Added strerror. On machines without it, just returns - "Unknown Error" all the time. - - Added strspn_emulation, strpbrk_emulation, strtol_emulation, - and strtoul_emulation. - - New compile time defines: - - ACE_LACKS_STERROR - - ACE_LACKS_STRPBRK - - ACE_LACKS_STRSPN - - ACE_LACKS_STRTOL - - ACE_LACKS_STRTOUL - - ACE_LACKS_STRTOD - - * ace/Log_Msg.cpp: - - Since there is now strerror in ACE, removed the !ACE_HAS_WINCE - blocks and replaced them with direct calls to ACE_OS_String's - version. - - * ace/config-win32.h: - - Changed check for #include-ing config-wince.h to be based on - _WIN32_WCE because this definition has been automatically added - to the default projects by the misc WinCE editors. - - * ace/Service_Config.i: - - The char versions of the following fuctions (which are defined - only under WinCE) were recursive and would fail miserably if - ever used. I added ACE_CHAR_TO_TCHAR to resolve the infinate - recursion. - - ACE_Service_Config::initialize () - - ACE_Service_Config::resume () - - ACE_Service_Config::suspend () - - ACE_Service_Config::remove () - - * ace/config-win32-msvc.h: - - We were defining ACE_HAS_GNU_CSTRING_H. I doubt that MSVC has - GNU's cstring.h, so I removed it. - - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - - Added ACE_LACKS_CUSERID and ACE_LACKS_CHDIR. - - Added writev and readv emulation methods to ACE_OS, since they - were just being defined as global functions. This is more - consistent with what we are doing elsewhere. - - Added ACE_LACKS_SYS_NERR emulation. - - * ace/config-WinCE.h: - - Added all the necessary defined to get ACE compiling for Windows - CE 3.0. As for previous versions, they do not currently compile, - although that could change in the future - -Sun Nov 12 12:29:31 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/Cache_Map_Manager_T.h: - * ace/Codeset_IBM1047.h: - * ace/Date_Time.h: - * ace/Dump_T.h: - * ace/Flag_Manip.h: - * ace/Hash_Cache_Map_Manager_T.h: - * ace/LSOCK_Acceptor.h: - * ace/Memory_Pool.h: - * ace/QoS_Decorator.h: - * ace/SV_Semaphore_Complex.h: - * ace/Strategies_T.h: - * ace/Synch_Options.h: - * ace/Time_Request_Reply.h: - * ace/Timer_Wheel_T.h: - * ace/WIN32_Proactor.h: - * ace/ace_wchar.h: - - Fixed @file comments. - -Sat Nov 11 18:55:04 2000 Pradeep Gore <pradeep@cs.wustl.edu> - - * ace/Profile_Timer.cpp: - Included Log_Msg.h to fix compile error. - -Fri Nov 10 19:41:38 2000 Darrell Brunsch <brunsch@uci.edu> - - * bin/fuzz.pl: - - Added a check for the @file comments used by doxygen. - They must be the same as the actual filename, or doxygen will - not pick up the comments for that file. - -Fri Nov 10 20:26:01 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Profile_Timer.cpp: Replaced ACE_OS::perror() with - ACE_ERROR macros so that the output can be redirected to the - same place that the ACE logging output is configured to go. - Thanks to Jeff Greif <jgreif@befree.com> for reporting this. - -Fri Nov 10 17:15:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * bin/fuzz.pl: - - Made the output look a little closer to MSVC's. - -Fri Nov 10 17:08:52 2000 Carlos O'Ryan <coryan@uci.edu> - - * etc/tao_strategies.doxygen: - New doxygen configuration file for the TAO_Strategies library. - - * bin/generate_doxygen.pl: - Add tao_strategies.doxygen to the list. - - * etc/ace_man.doxygen: - Generate man pages in the man directory instead of doxygen_man. - -Fri Nov 10 12:58:53 2000 Darrell Brunsch <brunsch@uci.edu> - - * bin/generate_doxygen.pl: - * etc/tao_implrepo.doxygen: - - New Implementation Repository documentation. - -Fri Nov 10 12:53:28 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_compile: - Format test output so make_pretty.pl can recognize where each - test starts. - - * etc/ace_rmcast.doxygen: - * etc/ace_ssl.doxygen: - * etc/tao.doxygen: - * etc/tao_dynamicany.doxygen: - * etc/tao_dynamicinterface.doxygen: - * etc/tao_esf.doxygen: - * etc/tao_iormanip.doxygen: - * etc/tao_iortable.doxygen: - * etc/tao_portableserver.doxygen: - * etc/tao_rtevent.doxygen: - Don't define the macros explicitly, use the config-doxygen.h - file. - Must define ACE_RCSID and ACE_UNDEFINED_FUNC properly, so - doxygen does not get confused. - -Fri Nov 10 14:26:41 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/config-sunos5.6.h: The AIO definitions were missing the #if - !defined guards that are present in the solaris 2.7 config - header. Thanks to Alex Hornby <alex@anvil.co.uk> for reporting - this. - -Fri Nov 10 11:44:15 2000 Carlos O'Ryan <coryan@uci.edu> - - * examples/RMCast/Send_File/Receiver.cpp: - Fixed errors in Tru64/DUCXX builds. - -Fri Nov 10 10:42:31 2000 Steve Huston <shuston@riverace.com> - - * ace/OS.i (ACE_OS::gethrtime): Removed the ACE_HAS_PENTIUM check - from the #if defined (ACE_WIN32) line surrounding the use of - QueryPerformanceCounter - it works fine on 486 also, per - Bernd Annamaier <bernd.annamaier@de.adtranz.com>. Thanks to - Bernd for testing this out. - - * ace/High_Res_Timer.cpp: Replaced all occurrences of - "defined (ACE_HAS_PENTIUM)" with "defined (ACE_WIN32)" since there - is nothing Pentium-specific any longer in the Win32 sections. - - * THANKS: Added Bernd Annamier to the Hall of Fame. - -Fri Nov 10 12:28:42 2000 Johnny Willemsen <jwillemsen@remedy.nl> - - * examples/log_msg/makefile.bor: - * examples/map_manager/makefile.bor: - * examples/makefile.bor: - * performance-tests/makefile.bor: - * performance-tests/Server_Concurrency/makefile.bor: - New Borland makefiles for ACE - -Thu Nov 9 18:39:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/config-sunos5.5.h: - - Added ACE_LACKS_MEMORY_H for SunCC 5, since it seems there is - a bad interaction between memory.h and string.h on that config. - -Thu Nov 9 17:47:37 2000 Carlos O'Ryan <coryan@uci.edu> - - * examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp: - Antoher missing Log_Msg.h - - * examples/Threads/thread_specific.cpp: - Tru64 does not like the convertion from ACE_hthread_t to - unsigned long. I'm trying with a reinterpret_cast, but I don't - have much hope for it. - - * examples/Service_Configurator/IPC-tests/server/Makefile: - * examples/Service_Configurator/Misc/Makefile: - * examples/Timer_Queue/Makefile: - * apps/Gateway/Gateway/Makefile: - * apps/Gateway/Peer/Makefile: - Avoid problems where the library is linked twice, once for the - required dependency in parallel builds an another for the LDLIBS - flag. - - * etc/ace.doxygen: - * etc/ace_man.doxygen: - Use a separate file to generate man pages. We don't want to - document .cpp files or include code in man pages, but that looks - great in HTML documents. - - * etc/tao.doxygen: - * etc/tao_dynamicany.doxygen: - * etc/tao_dynamicinterface.doxygen: - * etc/tao_esf.doxygen: - * etc/tao_iormanip.doxygen: - * etc/tao_iortable.doxygen: - * etc/tao_portableserver.doxygen: - * etc/tao_rtevent.doxygen: - Update the replacement path to some of the tag files, the - generated documents did not get the right cross references. - - * bin/make_pretty.pl: - Add yet another linker error. - - * bin/generate_doxygen.pl: - Parse the man page generation code to create its output path too. - -Thu Nov 9 15:10:28 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/make_pretty.pl: - In the HTML we replace < with < and > with > otherwise the - output for templates makes no sense. - -Thu Nov 9 12:11:52 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/Makefile (UTILS_FILES): - Modified the Makefile to help when building subsetted shared - libraries. Specifically, moved Addr, INET_Addr, and Sock_Connect - into the Sockets component. That removes the dependancy of the - Utilities and Sockets components on the non-socket IPC component. - - Committing on behalf of Phil Mesnier <mesnier_p@ociweb.com> - -Thu Nov 9 10:38:33 2000 Carlos O'Ryan <coryan@uci.edu> - - * examples/Makefile: - ACE_HAS_GNUG_PRE_2_8 should be used only after - wrapper_macros.GNU is included. - -Thu Nov 9 10:26:01 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/make_pretty.pl: - Add yet another link error message. - -Thu Nov 9 08:51:04 2000 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/rules.local.GNU: - It seems like I cannot get the rules to create the .obj and - .shobj directories right. This last iteration seems to be - happier, it works fine with parallel builds, it works fine for - static and shared libraries, it does not recompile everything - just because the .obj or .shobj directories changed, it creates - the Templates.DB file when needed. - The only problem that I'm aware off is that it can potentially - produce a warning on parallel builds: two separate rules can try - to create the .obj directory simultaneously, adding a dependency - to have only one rule do it results in full-recompilations when - a .obj directory is modified for whatever reason. - I'm using ACE_NUL_STDERR to avoid such warnings, and it seems to - work correctly. - -Thu Nov 9 10:14:06 2000 Jeff Parsons <parsons@cs.wustl.edu> - - * include/makeinclude/ace_flags.bor: - - Added the line - - TAO_DYNAMICINTERFACE_LIB = - $(CORE_BINDIR)\TAO_DynamicInterface$(LIB_DECORATOR).lib - - that I had overlooked when doing the BCB makefile changes - related to the DynamicInterface library. Thanks to - Johnny Willemsen <Johnny.Willemsen@meco.nl> for sending - in the patch. - - -Wed Nov 8 16:11:11 2000 Carlos O'Ryan <coryan@uci.edu> - - * tests/RMCast/RMCast_Membership_Test.cpp: - Remove unused variables - - * bin/make_pretty.pl: - Add regular expression to detect more linker errors. - -Wed Nov 8 14:10:20 2000 Carlos O'Ryan <coryan@uci.edu> - - * examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp: - * examples/IPC_SAP/SPIPE_SAP/client.cpp: - * examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp: - * examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp: - * examples/IPC_SAP/SPIPE_SAP/server.cpp: - * examples/RMCast/Send_File/Sender.cpp: - * examples/Reactor/Misc/test_event_handler_t.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h: - We must explicitly #include "ace/Log_Msg.h", unfortunately the - errors were only detected on platforms that do not define - ACE_TEMPLATES_REQUIRE_SOURCE. - - * include/makeinclude/rules.local.GNU: - More fine tuning, the Templates.DB directory must be created by - the Makefile because SunCC 4.2 generates a warning if it is not - present. - -Wed Nov 8 14:40:25 2000 Chad Elliott <elliott_c@ociweb.com> - - * ace/config-all.h - - Fix a build problem on HP-UX 11.00 with aCC A.03.25. The macro - used to determine the use of the std namespace changed from - RWSTD_NO_NAMESPACE to _NAMESPACE_STD. NOTE: I did preserve the - check for RWSTD_NO_NAMESPACE with aCC versions less than A.03.25. - -Wed Nov 8 10:27:00 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/generate_doxygen.pl: - Automates the invocation of doxygen. It modifies the doxygen - templates in $ACE_ROOT/etc and creates the right directory - hierarchy to receive the files. - - * ace/config-doxygen.h: - Configuration file used to generate the doxygen files. - Notice that this is not a valid configuration for any platform, - for example, it enables both the Win32 and the POSIX AIO calls. - - * etc/ace.doxygen: - * etc/ace_rmcast.doxygen: - * etc/ace_ssl.doxygen: - * etc/tao.doxygen: - * etc/tao_dynamicany.doxygen: - * etc/tao_dynamicinterface.doxygen: - * etc/tao_esf.doxygen: - * etc/tao_iormanip.doxygen: - * etc/tao_iortable.doxygen: - * etc/tao_portableserver.doxygen: - * etc/tao_rtevent.doxygen: - Minor mods to make the generate_doxygen.pl job easier. - -Wed Nov 8 09:02:10 2000 Carlos O'Ryan <coryan@uci.edu> - - * apps/Gateway/Gateway/Makefile: - * apps/Gateway/Peer/Makefile: - * examples/Timer_Queue/Makefile: - * examples/Service_Configurator/IPC-tests/server/Makefile: - * examples/Service_Configurator/Misc/Makefile: - When generating a library and a binary that uses it in the same - Makefile we must add explicit dependency between them, otherwise - parallel builds can fail. - - * apps/JAWS/server/HTTP_Helpers.cpp: - * examples/IPC_SAP/FILE_SAP/client.cpp: - * examples/Naming/test_multiple_contexts.cpp: - * examples/Threads/thread_specific.cpp: - * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp: - Fixed warnings about mismatches between printf-like strings and - their arguments. - -Wed Nov 8 02:57:15 2000 Darrell Brunsch <brunsch@uci.edu> - - * Local_Name_Space.cpp: - * Local_Name_Space.h: - - Conversion between ACE_WString and ACE_NS_String depended on - ACE_WString storing two byte char's (because it was using - fast_rep ()) Changed to ushort_rep (), but this required - ACE_NS_String to clean up the string once it is done. Added - a destructor and a flag to ACE_NS_String for this purpose. - -Tue Nov 7 11:47:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * tests/Cached_Accept_Conn_Test.cpp: - * tests/Cached_Conn_Test.cpp: - * tests/Collection_Test.cpp: - - Protected some of the explicit template instantiations with #if's - to make sure we don't get duplicate ones with ACE_INT32 == int - (since ACE_HANDLE and DATA are also int in some configurations). - -Tue Nov 7 09:04:15 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/RMCast/RMCast.h: - Undefine macro MT_DATA if defined already. - -Tue Nov 7 09:00:08 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_compile: - By default build everything under ACE_wrappers and - ACE_wrappers/TAO, we used to build just a subset of ACE. - We need to provide full coverage because this script is - replacing all nightly builds, if auto_compile does not test it, - nothing will. - - * bin/show_log_dir.pl: - The script was removing the second and third most recent logs - from the list, this used to be required to remove the brief and - html files, but now we filter those earlier on the script. - -Mon Nov 6 16:23:56 2000 Carlos O'Ryan <coryan@uci.edu> - - * tests/RMCast/RMCast_Fragment_Test.cpp: - * tests/RMCast/RMCast_Reassembly_Test.cpp: - * tests/RMCast/RMCast_Retransmission_Test.cpp: - Fixed warnings reported by DU/CXX - -Sun Nov 5 17:23:55 2000 Carlos O'Ryan <coryan@uci.edu> - - * etc/ace.doxygen: - * etc/ace_rmcast.doxygen: - * etc/ace_ssl.doxygen: - * etc/tao.doxygen: - * etc/tao_dynamicany.doxygen: - * etc/tao_dynamicinterface.doxygen: - * etc/tao_esf.doxygen: - * etc/tao_iormanip.doxygen: - * etc/tao_iortable.doxygen: - * etc/tao_portableserver.doxygen: - * etc/tao_rtevent.doxygen: - Commit doxygen templates, I'm still writing the script to use - them effectively. - -Sun Nov 5 14:37:13 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_compile: - Make log files world readable, under Solaris they are created - with 600 mode by default. - -Sun Nov 5 14:05:13 2000 Darrell Brunsch <brunsch@uci.edu> - - * bin/create_vt_dsps.pl: - * tests/version_tests/Atomic_Op_Test.dsp: - * tests/version_tests/Auto_IncDec_Test.dsp: - * tests/version_tests/Barrier_Test.dsp: - * tests/version_tests/Basic_Types_Test.dsp: - * tests/version_tests/Buffer_Stream_Test.dsp: - * tests/version_tests/CDR_Array_Test.dsp: - * tests/version_tests/CDR_File_Test.dsp: - * tests/version_tests/CDR_Test.dsp: - * tests/version_tests/Cache_Map_Manager_Test.dsp: - * tests/version_tests/Cached_Accept_Conn_Test.dsp: - * tests/version_tests/Cached_Conn_Test.dsp: - * tests/version_tests/Capabilities_Test.dsp: - * tests/version_tests/Collection_Test.dsp: - * tests/version_tests/Conn_Test.dsp: - * tests/version_tests/DLL_Test.dsp: - * tests/version_tests/DLList_Test.dsp: - * tests/version_tests/Dynamic_Priority_Test.dsp: - * tests/version_tests/Enum_Interfaces_Test.dsp: - * tests/version_tests/Env_Value_Test.dsp: - * tests/version_tests/Future_Set_Test.dsp: - * tests/version_tests/Future_Test.dsp: - * tests/version_tests/Handle_Set_Test.dsp: - * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp: - * tests/version_tests/Hash_Map_Manager_Test.dsp: - * tests/version_tests/High_Res_Timer_Test.dsp: - * tests/version_tests/IOStream_Test.dsp: - * tests/version_tests/Lazy_Map_Manager_Test.dsp: - * tests/version_tests/MM_Shared_Memory_Test.dsp: - * tests/version_tests/MT_Reactor_Timer_Test.dsp: - * tests/version_tests/MT_SOCK_Test.dsp: - * tests/version_tests/Malloc_Test.dsp: - * tests/version_tests/Map_Manager_Test.dsp: - * tests/version_tests/Map_Test.dsp: - * tests/version_tests/Mem_Map_Test.dsp: - * tests/version_tests/Message_Block_Test.dsp: - * tests/version_tests/Message_Queue_Notifications_Test.dsp: - * tests/version_tests/Message_Queue_Test.dsp: - * tests/version_tests/Naming_Test.dsp: - * tests/version_tests/New_Fail_Test.dsp: - * tests/version_tests/Notify_Performance_Test.dsp: - * tests/version_tests/OS_Test.dsp: - * tests/version_tests/Object_Manager_Test.dsp: - * tests/version_tests/OrdMultiSet_Test.dsp: - * tests/version_tests/Pipe_Test.dsp: - * tests/version_tests/Priority_Buffer_Test.dsp: - * tests/version_tests/Priority_Reactor_Test.dsp: - * tests/version_tests/Priority_Task_Test.dsp: - * tests/version_tests/Process_Manager_Test.dsp: - * tests/version_tests/Process_Mutex_Test.dsp: - * tests/version_tests/Process_Strategy_Test.dsp: - * tests/version_tests/RB_Tree_Test.dsp: - * tests/version_tests/Reactor_Exceptions_Test.dsp: - * tests/version_tests/Reactor_Notify_Test.dsp: - * tests/version_tests/Reactor_Performance_Test.dsp: - * tests/version_tests/Reactor_Timer_Test.dsp: - * tests/version_tests/Reactors_Test.dsp: - * tests/version_tests/Reader_Writer_Test.dsp: - * tests/version_tests/Recursive_Mutex_Test.dsp: - * tests/version_tests/Reverse_Lock_Test.dsp: - * tests/version_tests/SOCK_Connector_Test.dsp: - * tests/version_tests/SOCK_Send_Recv_Test.dsp: - * tests/version_tests/SOCK_Test.dsp: - * tests/version_tests/SPIPE_Test.dsp: - * tests/version_tests/SString_Test.dsp: - * tests/version_tests/SV_Shared_Memory_Test.dsp: - * tests/version_tests/Semaphore_Test.dsp: - * tests/version_tests/Service_Config_Test.dsp: - * tests/version_tests/Sigset_Ops_Test.dsp: - * tests/version_tests/Simple_Message_Block_Test.dsp: - * tests/version_tests/Svc_Handler_Test.dsp: - * tests/version_tests/TSS_Test.dsp: - * tests/version_tests/Task_Test.dsp: - * tests/version_tests/Thread_Manager_Test.dsp: - * tests/version_tests/Thread_Mutex_Test.dsp: - * tests/version_tests/Thread_Pool_Reactor_Test.dsp: - * tests/version_tests/Thread_Pool_Test.dsp: - * tests/version_tests/Time_Service_Test.dsp: - * tests/version_tests/Time_Value_Test.dsp: - * tests/version_tests/Timeprobe_Test.dsp: - * tests/version_tests/Timer_Queue_Test.dsp: - * tests/version_tests/Tokens_Test.dsp: - * tests/version_tests/UPIPE_SAP_Test.dsp: - * tests/version_tests/Upgradable_RW_Test.dsp: - * tests/version_tests/version_tests.dsw: - - Updated to use the new ACE_AS_STATIC_LIBS macro. - - * ace/Sample_History.cpp: - * ace/SSL/SSL_Context.cpp: - * ace/SSL/SSL_SOCK_Stream.i: - - Fixed miscellaneous ACE_USES_UNICODE problems with ACE_LIB_TEXT. - -Sat Nov 4 19:33:39 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_compile: - Fixed the mail message, the path to the CGI script was garbled. - - * include/makeinclude/rules.local.GNU: - My last fixed did not work for static builds, the SOLINK rules - got in the way. It works correctly for both static and shared - builds now. - -Sat Nov 4 18:19:46 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/RMCast/RMCast_IO_UDP.cpp: - * ace/RMCast/RMCast_Reassembly.cpp: - * tests/Reactor_Notify_Test.cpp: - Add missing template instantiations, they only showed up in - builds with disabled inlining. - -Sat Nov 4 17:05:08 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/auto_compile: - New revision of the script. It can copy log files directly to - the destination directory, and it also runs the make_pretty - script to generate both the HTML and HTML summary of the log. - - * bin/show_log_dir.pl: - Corrections to the document and more fixes to make it Apache - friendly. - - * include/makeinclude/rules.local.GNU: - Add special target to force the creation of the .shobj and .obj - directories, even with parallel builds. The faster our - computers get the more often we get failures due to this - problem. - -Sat Nov 4 14:53:39 2000 Carlos O'Ryan <coryan@uci.edu> - - * bin/make_pretty.pl: - This is a modified version of Darrell's script to beautify our - auto_compile logs. This version works better with Unix builds - and is going to be invoked by bin/auto_compile to generate - summary logs. - - * bin/show_log_dir.pl: - A CGI script to present all the logs for a particular builds in - a single page. It is a modified version of Darrell's script, - but this time it works better on Unix web servers. - -Fri Nov 3 17:22:10 2000 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/config-sunos5.5.h: Backed of changes given by Russ - Noseworthy through bug id #710. This was breaking SunCC5.0 - builds. - -Fri Nov 3 09:41:20 2000 Carlos O'Ryan <coryan@uci.edu> - - * tests/RMCast/RMCast_Membership_Test.cpp: - Fixed warning about variables possibly uninitialized before - their first use. In fact the variables are initialized before - their first use, but the code flow is too complex for the - compiler to figure that out. - -Fri Nov 3 09:34:39 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Makefile: - * tests/Makefile: - * examples/Makefile: - Disable the RMCast builds for old versions of g++ - -Thu Nov 2 12:11:43 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Name_Request_Reply.h: - * ace/Timer_Hash_T.h: - * ace/Map_Manager.h: - * ace/Log_Record.h: - Minor adjustments to make doxygen happier. - -Thu Nov 2 11:57:37 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Makefile: - * tests/Makefile: - * examples/Makefile: - Enable the RMCast library, tests and examples by default. - -Wed Nov 1 17:24:59 2000 Pradeep Gore <pradeep@cs.wustl.edu> - - * tests/RMCast/Makefile.bor: - Added Makefile, thanks to Christopher Kohlhoff - <chris@kohlhoff.com> and Johnny.Willemsen <Johnny.Willemsen@meco.nl> - for contributing. - -Wed Nov 1 14:11:48 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/*.h: - Change all the header files to generate better docs with - Doxygen. Thanks to Darrell for his wonderful script to automate - this process. - -Tue Oct 31 19:01:19 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * netsvcs/lib/Client_Logging_Handler.cpp (handle_input): Added - a comment explaining why we don't go to heroic lengths to recv() - all the data if it fails after the second recv(). Thanks to - Steve Sivier <Steven.Sivier@Eng.Sun.COM> for motivating this. - -Tue Oct 31 14:21:11 2000 David L. Levine <levine@cs.wustl.edu> - - * bin/check_build_logs: sort the output file names, so - that guajira's cxx build shows up first (locally). - Limit total number of lines to 2000 to keep below - majordomo's size limit. - -Tue Oct 31 10:54:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/Process.i: - - Changed the CREATE_UNICODE_ENVIRONMENT section to be only - in ACE_WIN32 environments. - -Tue Oct 31 11:35:31 2000 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/config-sunos5.5.h: - * ace/Log_Msg.cpp: Added patches provided by Russ. Bugzilla id 710. - -Tue Oct 31 08:14:33 2000 Chris Cleeland <cleeland_c@ociweb.com> - - * wrapper_macros.GNU: - - Set defaults for exceptions, rtti, and fast to all be zero - (0),i.e., off. Henceforth, if you're creating a new port and - you want exceptions to be on, you must explicitly have - "exceptions=1" in your platform_*.GNU file. - - * platform_irix6.x_common.GNU: - - Added an "exceptions=1" directive per the comment above. - -Mon Oct 30 18:56:33 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS.cpp: - * ace/OS.h: - * ace/OS.i: - - Changed several of the socket calls to use char instead - of ACE_TCHAR, seeing that no OS supports anything but char. - But I am keeping the ACE_TCHAR or dual char/wchar_t - interfaces on classes higher up the stream. - - Methods changed are: - - - gethostbyaddr - - gethostbyname - - gethostbyname2 - - gethostbyaddr_r - - gethostbyname_r - - getprotobyname - - getprotobyname_r - - getservbyname - - getservbyname_r - - inet_addr - - inet_ntoa - - inet_aton - - inet_ntop - - inet_pton - - This should take care of a couple of things. First we don't - have to worry about returning a wchar_t * static buffer - instead of a char * static buffer from something like - inet_ntoa and this should remove some slowdowns reported from - gethostbyname. Thanks to Nick Pratt <npratt@microstrategy.com> - for reporting both of these. - - * ace/INET_Addr.cpp: - * ace/INET_Addr.h: - * ace/INET_Addr.i: - - Fixed references to interface changes and added dual - char/wchar_t interfaces to replace some ACE_TCHAR ones. - - * ace/MEM_Addr.cpp: - * ace/MEM_Addr.h: - * ace/MEM_Addr.i: - - Changed get_host_name and get_host_name to return char * - - * ace/SOCK_Dgram_Mcast.cpp: - * ace/SOCK_Dgram_Mcast_QoS.cpp: - - Fixed all the references to the interface changes. - - * ace/Object_Manager.cpp: - - Added ERROR to the output for AV's and Unhandled Exceptions. - -Mon Oct 30 18:51:40 2000 Darrell Brunsch <brunsch@uci.edu> - - * examples/IPC_SAP/SSL_SAP/SSL-client.dsp: - * examples/IPC_SAP/SSL_SAP/SSL-server.dsp: - - Removed hardcoded OpenSSL include directories. - - * ace/ssl/SSL_Context.cpp: - * ace/ssl/SSL_Context.h: - * ace/ssl/SSL_SOCK.cpp: - * ace/ssl/SSL_SOCK_Acceptor.cpp: - * ace/ssl/SSL_SOCK_Acceptor.h: - * ace/ssl/SSL_SOCK_Connector.cpp: - * ace/ssl/SSL_SOCK_Connector.h: - * ace/ssl/SSL_SOCK_Connector.i: - * ace/ssl/SSL_SOCK_Stream.cpp: - * ace/ssl/SSL_SOCK_Stream.h: - * ace/ssl/SSL_SOCK_Stream.i: - - Removed the ACE_HAS_SSL #ifdefs, since ACE_SSL is a - separate library, so it isn't really needed. - -Mon Oct 30 16:34:33 2000 Chris Cleeland <cleeland_c@ociweb.com> - - * include/makeinclude/platform_vxworks5.x_g++.GNU: - - More exceptions/fast/rtti canonicalization fixes. Thanks again, - Carlos. - -Mon Oct 30 11:56:13 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Makefile.am: - * ace/Makefile.bor: - Add missing files to the Borland and Automake makefiles. - -Mon Oct 30 11:38:07 2000 Carlos O'Ryan <coryan@cs.wustl.edu> - - * ace/Basic_Stats.cpp: - * ace/Basic_Stats.inl: - * ace/Sample_History.cpp: - * ace/Stats.cpp: - Fixed problems on platforms that lack 64-bit integers. - -Mon Oct 30 11:10:26 2000 Chris Cleeland <cleeland_c@ociweb.com> - - * include/makeinclude/platform_linux.GNU: - * include/makeinclude/platform_chorus_ghs.GNU: - - The change to canonicalize the values used for - exceptions/fast/rtti caused the default for "exceptions" on these - two platforms to change from exceptions off to exceptions on. - There may be others, but without access to the compiler itself - it's hard to tell what the default behavior is for the compiler - and thus set the value for exceptions/rtti/fast accordingly. - - Thanks to Carlos O'Ryan <coryan@uci.edu> for pointing this out. - -Mon Oct 30 00:57:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * tests/OS_Test.cpp: - - Was a bit overzealous on a previous [] to * change, - so switched one back to [] to remove a segfault - with the strncmp section. - -Sun Oct 29 23:46:54 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/ace_wchar.h: - - Removed the definitions for LPTSTR and LPCTSTR. They - will need to be defined outside of ace or in config.h - to be made available on other platforms. Here is a - sample block which can be added to a non-Win32 config.h: - - typedef char *LPSTR; - typedef const char *LPCSTR; - typedef wchar_t *LPWSTR; - typedef const wchar_t *LPCWSTR; - - #if defined (UNICODE) - typedef const wchar_t *LPCTSTR; - typedef wchar_t *LPTSTR; - typedef wchar_t TCHAR; - #define __TEXT(literal) L##literal - #else - typedef const char *LPCTSTR; - typedef char *LPTSTR; - typedef char TCHAR; - #define __TEXT(literal) literal - #endif - - #define TEXT(literal) __TEXT(literal) - - * ace/config-vxworks5.x.h: - - Added ACE_LACKS_WCSDUP. - -Sun Oct 29 01:59:11 2000 Darrell Brunsch <brunsch@uci.edu> - - * bin/doxygen-convert-h.pl: (added) - - New script to convert old header files to new doxygen - style commented files. Works well, but some things - do throw it for a loop, be sure to check output before - checking in. - -Sat Oct 28 15:02:40 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Stats.h: - Cosmetic fixes to make doxygen happier. - -Fri Oct 27 17:21:56 2000 Darrell Brunsch <brunsch@uci.edu> - - * tests/OS_Test.cpp: - - Darrell learned how to use strtok_r properly. 'nuff said. - -Fri Oct 27 17:04:02 2000 Darrell Brunsch <brunsch@uci.edu> - - * tests/OS_Test.cpp: - - Changed the arrays ([]) to array pointers (*) since the - pointer arithmatic I do doesn't seem to work with the - arrays. - -Fri Oct 27 15:45:57 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Add the new files to the MSVC projects. - -Fri Oct 27 15:02:56 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - * ace/Sample_History.h: - * ace/Sample_History.inl: - * ace/Sample_History.cpp: - Add new class to keep a full history of all the samples in a - performance test. - - * ace/Basic_Stats.h: - * ace/Basic_Stats.inl: - * ace/Basic_Stats.cpp: - * ace/Stats.h: - * ace/Stats.cpp: - Refactor code to compute minimum, maximum, average and jitter - into its own class. It used to be part of ACE_Througthput_Stats - - * performance-tests/TCP/Makefile: - * performance-tests/TCP/tcp_test.cpp: - Use the new ACE_Sample_History class. - -Fri Oct 27 12:04:17 2000 Chris Cleeland <cleeland_c@ociweb.com> - - * platform_chorus.GNU: - * platform_chorus4.x_g++.GNU: - * platform_chorus_ghs.GNU: - * platform_cray.GNU: - * platform_hpux_kcc.GNU: - * platform_linux_cxx.GNU: - * platform_osf1_4.0.GNU: - * platform_sunos5_ghs.GNU: - * platform_sunos5_kcc.GNU: - * platform_sunos5_sunc++.GNU: - * platform_vxworks5.x_diab.GNU: - * platform_vxworks5.x_g++.GNU: - * wrapper_macros.GNU: - - Changed the way that 'rtti', 'exceptions', and 'fast' makeflags - get processed in wrapper_macros.GNU. There was a discrepancy - between the "command line" value and the "platform_macros file" - value each needed in order to turn the feature off, e.g., zero - on the command line and "null" in the file. After - investigation, the discrepancy seemed to be without reason, so - I've canonicalized them. You can now put "exceptions=0" on - either the command line OR in the platform_macros.GNU file. - -Fri Oct 27 10:51:26 2000 Steve Huston <shuston@riverace.com> - - * tests/Reactor_Notify_Test.cpp: Moved definition of 'int status' - outside the auto_ptr-scoping block. - -Fri Oct 27 02:06:29 2000 Luther J Baker <luther@cs.wustl.edu> - - * ace/OS.cpp: - * ace/OS.i: - - Fixed some warnings due to int ace_result_ declared for NT. - -Thu Oct 26 22:18:42 2000 Alex Arulanthu <Alex.Arulanthu@sylantro.com> - - * ace/Log_Msg.h: - * ace/Log_Msg.cpp: - * ace/Service_Config.h: - * ace/Service_Config.cpp: - * ace/Service_Config.i: - - Setting the right default values for process and thread level - priority masks. I had already talk to Steve H about this - change. I just forgot to get this in. - -Thu Oct 26 14:04:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS.h: - - Reverted Doug's change which defined ACE_MAX_USERID to - L_cuserid on all platforms. It ended up that this - is only valid on Windows when _POSIX_ is defined. - -Thu Oct 26 11:20:43 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/RMCast/RMCast_IO_UDP.cpp: - * ace/RMCast/RMCast_Reassembly.cpp: - * tests/CDR_Array_Test.cpp: - * tests/RMCast/RMCast_Fragment_Test.cpp: - * tests/RMCast/RMCast_Membership_Test.cpp: - * tests/RMCast/RMCast_Reassembly_Test.cpp: - * tests/RMCast/RMCast_Reordering_Test.cpp: - * tests/RMCast/RMCast_Retransmission_Test.cpp: - * tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp: - - The usual additions of ACE_TEXT to make ACE_USES_WCHAR builds - happy. - -Thu Oct 26 12:19:45 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Memory_Pool.cpp (unmap): Fixed a bug that was preventing - the handle from being closed. Thanks to Ivan Murphy and Dieter - Quehl for reporting this. - -Thu Oct 26 10:56:36 2000 Steve Huston <shuston@riverace.com> - - * ace/OS.i (ACE_OS::rename): Added && (ACE_HAS_WINNT4 == 1) to the - defined (ACE_HAS_WINNT4) to avoid this code section on Win95/98. - -Thu Oct 26 07:39:22 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - ace/OS.h: Added a new macro called ACE_MAX_USERID that is 32 on - Win32 and L_cuserid on other platforms. - - * examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp, - examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.cpp, - examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp, - examples/Service_Configurator/IPC-tests/server/Handle_R_Stream: - Fixed the calls to cuserid() so they don't pass in 0, but - instead pass in a buffer of size ACE_MAX_USERID. This fixes a - problem that occurs on WinNT. Thanks to Mike Curtis - <mccurry@my-deja.com> for pointing this out. - - * tests/Reactor_Notify_Test.cpp: Fixed an unused args warning - and also added the use of auto_ptr to ensure that dynamic memory - is deleted no matter what return path is taken. - -Thu Oct 26 04:00:00 2000 Luther J Baker <luther@cs.wustl.edu> - - * ace/OS.h: - * ace/OS.i: - * ace/OS.cpp: - * ace/OS_Dirent.inl: - Fixing more ACE_HAS_PACE over NT. Most fixes just skip the - PACE call. NT doesn't implement much of posix and so - many ACE calls will skip pace until PACE/WINNT emulates - more posix functionality. - -Wed Oct 25 20:38:33 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/SSL/ACE_SSL.dsp: - - Removed the include/lib directories put here. Instead - we rely on the fact that OpenSSL should be in - DevStudio's global include and library directories. - -Wed Oct 25 13:20:24 2000 Irfan Pyarali <irfan@cs.wustl.edu> - - * tests/Purgable_Map_Manager_Test: Removed this deprecated test. - The following files were effected: - - - Makefile.am - - icc.bat - - t.icc - - These files were removed: - - - Purgable_Map_Manager_Test.cpp - - Purgable_Map_Manager_Test.icc - -Wed Oct 25 11:24:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/adapter/README: (removed) - * ace/adapter/ace/ACE.h: (removed) - * ace/adapter/ace/ARGV.h: (removed) - * ace/adapter/ace/ATM_Addr.h: (removed) - * ace/adapter/ace/Arg_Shifter.h: (removed) - * ace/adapter/ace/Capabilities.h: (removed) - * ace/adapter/ace/DEV_Addr.h: (removed) - * ace/adapter/ace/DLL.h: (removed) - * ace/adapter/ace/Dirent.h: (removed) - * ace/adapter/ace/Dynamic_Service.h: (removed) - * ace/adapter/ace/FIFO.h: (removed) - * ace/adapter/ace/FIFO_Recv.h: (removed) - * ace/adapter/ace/FIFO_Recv_Msg.h: (removed) - * ace/adapter/ace/FIFO_Send.h: (removed) - * ace/adapter/ace/FIFO_Send_Msg.h: (removed) - * ace/adapter/ace/FILE_Addr.h: (removed) - * ace/adapter/ace/Functor.h: (removed) - * ace/adapter/ace/High_Res_Timer.h: (removed) - * ace/adapter/ace/INET_Addr.h: (removed) - * ace/adapter/ace/MEM_Addr.h: (removed) - * ace/adapter/ace/Malloc_T.h: (removed) - * ace/adapter/ace/Memory_Pool.h: (removed) - * ace/adapter/ace/OS.h: (removed) - * ace/adapter/ace/OS_Dirent.h: (removed) - * ace/adapter/ace/OS_String.h: (removed) - * ace/adapter/ace/SOCK_Dgram_Bcast.h: (removed) - * ace/adapter/ace/SOCK_Dgram_Mcast.h: (removed) - * ace/adapter/ace/SOCK_Dgram_Mcast_QoS.h: (removed) - * ace/adapter/ace/SPIPE_Addr.h: (removed) - * ace/adapter/ace/Service_Config.h: (removed) - * ace/adapter/ace/Service_Object.h: (removed) - * ace/adapter/ace/Stats.h: (removed) - * ace/adapter/ace/System_Time.h: (removed) - * ace/adapter/ace/Task_T.h: (removed) - * ace/adapter/ace/Trace.h: (removed) - - The adapter classes were removed since they were - not ready for prime time and their main purpose was - invalidated. If need be, they can be brought back in - the future. - -Wed Oct 25 12:26:25 2000 Carlos O'Ryan <coryan@cs.wustl.edu> - - * ace/RMCast/RMCast_UDP_Reliable_Sender.cpp: - Yet another missing #include - -Wed Oct 25 09:50:48 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/RMCast/RMCast_IO_UDP.h: - * ace/RMCast/RMCast_IO_UDP.cpp: - * ace/RMCast/RMCast_UDP_Reliable_Receiver.h: - * ace/RMCast/RMCast_UDP_Reliable_Receiver.i: - * ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp: - * ace/RMCast/RMCast_UDP_Reliable_Sender.h: - * ace/RMCast/RMCast_UDP_Reliable_Sender.i: - * examples/RMCast/Send_File/Makefile: - * examples/RMCast/Send_File/Sender.cpp: - * examples/RMCast/Send_File/Receiver.cpp: - Change several open() methods to init() because the base class - already has a virtual open() method, but with a different - signature, some compilers generate warnings when this happens. - Add #include required in platforms that do not define - ACE_TEMPLATES_REQUIRE_SOURCE - -Wed Oct 25 09:32:10 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/Object_Manager.cpp: - - Changed to only use the CRT_ERROR disabling under - ACE_DISABLE_WIN32_ERROR_WINDOWS when _DEBUG is defined, - since crtdbg.h is only included by ACE when _DEBUG is - defined. - -Wed Oct 25 10:51:26 2000 Steve Huston <shuston@riverace.com> - - * ace/Select_Reactor_Base.cpp (purge_pending_notifications): Added - ACE_UNUSED_ARG (eh) for the non-ACE_HAS_REACTOR_NOTIFICATION_QUEUE - case to quiet g++'s unused argument warning. - -Tue Oct 24 23:14:55 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS_String.cpp: - * ace/config-win32-borland.h: - - Added ACE_LACKS_WCSDUP to do something similar to - ACE_HAS_STRDUP_EMULATION. Added this to Borland's config, - - Also fixed several warnings in OS_String's emulation - functions that show up with g++. - - * ace/Object_Manager.cpp: - - Added code in the Object Manager to disable some of the - error windows that pops up in Win32 apps. If - ACE_DISABLE_WIN32_ERROR_WINDOWS is defined, then - ACE_ASSERT's and Access Violations will not pop up - error box's anymore. This was mainly added for auto - build purposes. - - * ace/Select_Reactor_Base.cpp: - - Changed ACE_TEXT's to ACE_LIB_TEXT. - - * ace/WFMO_Reactor.cpp: - - In ACE_WFMO_Reactor_Notify::purge_pending_notifications - there was an instance of this type of code: - - for (size_t index = 0; index < ....) - ... - for (index = 0; index ....) - - On Borland, the index is scoped within the for loop, so - the second use of it produces an error. I moved the - declaration outside of the loop to fix this. - -Tue Oct 24 23:40:33 2000 Irfan Pyarali <irfan@cs.wustl.edu> - - * tests/SString_Test.cpp (main): Added tests for string - assignments. - -Tue Oct 24 19:30:16 2000 Steve Huston <shuston@riverace.com> - - * ace/Select_Reactor_Base.cpp (purge_pending_notifications): Correct - erroneous use of 'index' as a variable when it's also a function. - -Tue Oct 24 13:54:49 2000 Ossama Othman <ossama@uci.edu> - - * ace/Makefile (TEMPLATE_FILES): - - Added missing Test_and_Set source file to the list. - - * ace/Makefile.am (libACE_Utils_la_SOURCES, HEADER_FILES, - INLINE_FILES, TEMPLATE_FILES): - - Updated these lists of sources with the newly added sources. - -Tue Oct 24 12:30:47 2000 Steve Huston <shuston@riverace.com> - - * ace/Reactor.h (ACE_Reactor): - * ace/Reactor_Impl.h (ACE_Reactor_Notify and ACE_Reactor_Impl): - * ace/Select_Reactor_Base.h (ACE_Select_Reactor_Notify and - ACE_Select_Reactor_Impl): - * ace/WFMO_Reactor.h (ACE_WFMO_Reactor_Notify and ACE_WFMO_Reactor): - Added new function, purge_pending_notifications (ACE_Event_Handler *) - - * ace/Reactor.i (ACE_Reactor): - * ace/Select_Reactor_Base.i (ACE_Select_Reactor_Impl): - Added implementation of purge_pending_notifications that forwards - the call on to the proper implementation/handler object. - - * ace/Select_Reactor_Base.cpp (ACE_Select_Reactor_Notify): Added - implementation of purge_pending_notifications. Works when - ACE_HAS_REACTOR_NOTIFICATION_QUEUE is defined. Else it does - ACE_NOTSUP_RETURN. - - * ace/WFMO_Reactor.cpp (ACE_WFMO_Reactor, ACE_WFMO_Reactor_Notify): - Added implementation of purge_pending_notifications. - - Thanks to Edan Ayal <edana@bandwiz.com> for supplying the code for - this new feature. - - * ace/Reactor.i (notify): Set the event handler's reactor pointer if - it doesn't already have one. Enables the event handler to purge - its notifications upon destruction. - - * ace/Event_Handler.cpp (~ACE_Event_Handler): Call reactor's - purge_pending_notifications function to avoid delivering notifies - to a deleted handler. - - * tests/Reactor_Notify_Test.cpp: Added the run_notify_purge_test - function to exercise the above new purge_pending_notifications. - -Tue Oct 24 12:05:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS_String.inl: - - Removed an extra } after an #endif that was producing - warnings on OSF. - -Tue Oct 24 09:27:04 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/Test_and_Set.cpp: - Removed the repeated inclusion of the header file. - Thanks to Darrell. - -Tue Oct 24 03:24:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/Basic_Types.h: - * ace/config-win32-common.h: - - Moved the code that defines ACE_SIZEOF_WCHAR to the config file, - so it is easier to add it to other platforms. - - * ace/config-linux-common.h: - - Added ACE_SIZEOF_WCHAR, ACE_LACKS_ITOW, ACE_LACKS_WCSICMP, and - ACE_LACKS_WCSNICMP definitions. - - * ace/Synch.h: - - Moved the ACE_LEGACY_MODE includes further down in the file. It - was producing errors the way it was, since Test_and_Set needed - the Guard classes defined before it was included. - -Mon Oct 23 15:31:52 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Malloc_Allocator.cpp: - Yet another calloc() method that was declared but not defined. - -Mon Oct 23 11:37:06 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/Init_ACE.cpp: - Removed the semicolon at the end of ACE_RCSID. - -Mon Oct 23 11:20:53 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Malloc_T.i: - Add missing function, now things actually link. - -Mon Oct 23 10:02:36 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Malloc_T.h: - Add missing prototype, now the code actually compiles. - -Mon Oct 23 10:59:21 2000 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/OS_String.cpp: Fixed a compile error in gcc 2.95.2. - - * ace/Cached_Connect_Strategy_T.h - * ace/Cached_Connect_Strategy_T.cpp: Added fixes provided by Edan - Ayal <edana@bandwiz.com>. - -Mon Oct 23 08:37:49 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Malloc_T.{h,cpp} - * ace/Malloc_Base.h, - * ace/Malloc_Allocator.{h,cpp}: Added a new calloc() method that - has the same (default) signature as the one in the C/C++ - standard library. Thanks to Shourya Sarcar - <Shourya.Sarcar@geind.ge.com> for reporting this. - - * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp (handle_input): - Fixed a mistake where we were calling release() via a NULL - pointer! Thanks to Pedro Brandao <pbrandao@inescn.pt> for - reporting this. - -Sun Oct 22 18:01:34 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS_String.cpp: - - strtok_r_emulation wasn't protected by #if !defined - (ACE_HAS_REENTRANT_FUNCTIONS). - -Sun Oct 22 17:30:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/ACE.i: - - wcslen was used directly here, changed it to - ACE_OS_String::strlen. - - * ace/ace_wchar.inl: - - Moved around some of the inline functions to - remove warnings. - - * ace/config-vxworks5.x.h: - - Added all the ACE_LACKE_WCS* that VxWorks needs. - -Sun Oct 22 17:22:32 2000 Darrell Brunsch <brunsch@uci.edu> - - * tests/OS_Test.cpp: - - Borland complained about memchr (NULL, ...), since - it couldn't figure out whether to use the void * or - const void* verison of ACE_OS_String::memchr. - Added an explicit cast to help out. - -Sun Oct 22 17:09:26 2000 Darrell Brunsch <brunsch@uci.edu> - - * tests/MT_SOCK_Test.cpp: - - Missed an ACE_ALPHABET in a previous checkin. - - And based on this part of the description in the file: - - "Note that most of the connections will fail since - we're overrunning the size of the listen queue for - the acceptor-mode socket." - - I changed the connection_failed ACE_ERROR_RETURN to an - ACE_DEBUG and return. Now it will not show up as an error - via run_test.pl. - -Sun Oct 22 16:32:24 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/OS_String.cpp: - * ace/OS_String.h: - * ace/OS_String.inl: - * ace/config-linux-common.h: - - Renamed ACE_HAS_SAFE_WCSTOK to ACE_LACKS_WCSTOK to be - consistent with the rest of the ACE_LACKS_WCS* macros. - - Fixed a signature for wcsncmp_emulation, as it was taking - in const wchar_t as the first arg instead of const - wchar_t *. - - Added wcscspn_emulation and an implementation for - wcsncmp_emulation. - -Sun Oct 22 15:35:38 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/Makefile.bor: - - Changed ACE_Sock_Connect.obj to Sock_Connect.obj, since - it appears that it has been renamed. - -Sun Oct 22 15:07:42 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/ace_dll.dsp: - - While playing with doxygen, I found some old .h files listed - in the project but no longer existed. Removed these. - - * ace/OS_String.cpp: - * ace/OS_String.h: - * ace/OS_String.inl: - - Added quite a few emulation macros for wcs* functions that - often do not exist on platforms. Since these wcs* functions - just play with wchar_t's, they are not difficult to put in. - Some, such as to_upper and strtod/l/ul are more difficult, - so they are not present on platforms without support for - them. - - Also updated the docs to doxygen style. Someday I'll get - around to writing a script to do this... - - * ace/config-win32-borland.h: - * ace/config-win32-msvc.h: - - Added a couple of macros: - - ACE_HAS_STRCASECMP_EQUIVALENT - - ACE_HAS_STRNCASECMP_EQUIVALENT - - ACE_ITOA_EQUIVALENT - - These are used to specify different names for functions - that differ in names across different compilers. - - * tests/OS_Test.cpp: - - Added tests to test OS_String methods so I can make sure - the emulations work. - - * tests/Buffer_Stream_Test.cpp: - * tests/Conn_Test.cpp: - * tests/MM_Shared_Memory_Test.cpp: - * tests/Mem_Map_Test.cpp: - * tests/Priority_Buffer_Test.cpp: - * tests/Priority_Reactor_Test.cpp: - * tests/Reactor_Performance_Test.cpp: - * tests/SOCK_Test.cpp: - * tests/SPIPE_Test.cpp: - * tests/test_config.h: - - In order to get the test_config.h to work when a project - has more than one .cpp file that includes it (and some - compilers give warnings about a static char[]) I moved - ACE_ALPHABET into the tests that need it. Also I changed - it to a static const char[] in places that allowed it. - - So it could be possible to move it back to test_config.h - now that it can be static const char[], but I'm not 100% - sure that will keep all compilers from complaining. - - * tests/run_test.lst: - - Added OS_Test to the list of tests run. - -Sun Oct 22 17:11:16 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * ace/Malloc_T.h: Added a default value of sizeof (T) to the - malloc() method of class ACE_Cached_Allocator. Thanks to - Shourya Sarcar <Shourya.Sarcar@geind.ge.com> for reporting this. - -Sun Oct 22 10:08:31 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Makefile.bor: - Update file names for the ACE_ components. - -Sun Oct 22 08:57:33 2000 David L. Levine <levine@cs.wustl.edu> - - * tests/test_config.h: implemented these changes to remove - g++ warnings introduced by: - - Thu Oct 19 13:17:41 2000 Darrell Brunsch <brunsch@uci.edu> - - 1) Moved ace_file_stream typedef to end of file. - 2) Moved inline definition of ACE_Test_Output::output_file () - to before first use. - 3) Removed static qualifier from ACE_ALPHABET. - -Sat Oct 21 12:52:58 2000 Carlos O'Ryan <coryan@uci.edu> - - * Makefile*: - Update dependencies. - -Fri Oct 20 20:46:37 2000 Steve Huston <shuston@riverace.com> - - * ace/OS.i (chdir): Added !defined (AIX) to the !defined (ACE_WIN32) - && defined (<Visual Age C++>) to get it to build clean on AIX. - - * ace/ace-dll.icc: Added Base_Thread_Adapter, Thread_Adapter, - Flag_Manip, Handle_Ops, Init_ACE, Lib_Find, Sock_Connect, - OS_Log_Msg_Attributes, Malloc_Allocator, PI_Malloc, - Thread_Exit, Log_Msg_IPC, OS_Thread_Adapter, Log_Msg_Backend, - Thread_Control (h and cpp). - - * ace/Handle_Ops.cpp: - * ace/PI_Malloc.cpp: Corrected ACE_RCSID args. - -Fri Oct 20 16:38:55 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Update MSVC projects - -Fri Oct 20 16:23:40 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/ACE.h: - Modified to include the renamed files. - -Fri Oct 20 14:13:43 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/Sock_Connect.i: - * ace/Sock_Connect.h: - * ace/Sock_Connect.cpp: - - * ace/Lib_Find.i: - * ace/Lib_Find.h: - * ace/Lib_Find.cpp: - - * ace/Init_ACE.i: - * ace/Init_ACE.h: - * ace/Init_ACE.cpp: - - * ace/Handle_Ops.i: - * ace/Handle_Ops.h: - * ace/Handle_Ops.cpp: - - * ace/Flag_Manip.i: - * ace/Flag_Manip.h: - * ace/Flag_Manip.cpp: - Renamed the recently added ACE_* files as above to follow - the naming convention. - - * ace/IPC_SAP.h: - * ace/IO_SAP.h: - * ace/FILE_Connector.cpp: - * ace/FILE_Addr.h: - Changed the include files to reflect the above change. - - * ace/Makefile: - Added the new files and updated dependencies. - -Fri Oct 20 11:40:31 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/Makefile: - Updated dependencies. - -Fri Oct 20 02:52:17 2000 Marina Spivak <marina@cs.wustl.edu> - - * bin/auto_run_tests.lst: - - Added RTCORBA Server_Declared test. - -Thu Oct 19 18:02:54 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/OS_Log_Msg_Attributes.h : - Modified u_long to 'unsigned long' as the compiler was - complaining. - -Thu Oct 19 13:52:49 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/Malloc_Allocator.cpp: - * ace/Naming_Context.cpp: - * ace/PI_Malloc.cpp: - - Needed to change some ACE_TEXT's to ACE_LIB_TEXT. - - * ace/OS.h: - * ace/OS_Log_Msg_Attributes.h: - - Moved the definition of ACE_OSTREAM_TYPE from OS.h to - OS_Log_Msg_Attributes.h, since some include paths in - ACE_LEGACY_MODE needed it there. - -Thu Oct 19 13:17:41 2000 Darrell Brunsch <brunsch@uci.edu> - - * tests/run_test.pl: - - Changed the method used to detect errors in a log file. Since - the log contains the log message type (such as LM_ERROR), - I changed the detection to look for this. - - * tests/ACE_Init_Test.cpp: - - Added ACE_START_TEST and ACE_END_TEST so the run_test.pl - script won't think ACE_Init_Test failed. - - * tests/test_config.h: - - With the way ACE_ALPHABET and some functions were defined, - they would cause duplicate symbols if test_config.h was - included in more than one object file. Changed them so - the symbols are static to the file. - - * tests/Reactors_Test.cpp: - - When the reactor was shutting down, it was returning a - information message with ACE_ERROR_RETURN. Since it really - wasn't an error condition, changed this to a ACE_DEBUG - and return 0. - - * tests/SOCK_Send_Recv_Test.cpp: - - The test was checking errno without checking a return value. - As a result, it was getting an out-of-date errno and - incorrectly interpreted that as an error. Fixed. - -Thu Oct 19 12:12:00 2000 Darrell Brunsch <brunsch@uci.edu> - - * ace/ACE_Lib_Find.h: - - Added missing static specifier for the wchar version of - strrepl. - -Thu Oct 19 12:03:41 2000 Darrell Brunsch <brunsch@uci.edu> - - * apps/JAWS2/HTTPU/HTTPU.DSP: - * apps/JAWS2/JAWS/jaws.dsp: - - These two projects were placing their DLL's in the wrong - directory. - -Thu Oct 19 14:23:52 2000 Steve Huston <shuston@riverace.com> - - * ace/ace-dll.icc: Removed extraneous ',' from Win32 section. - -Thu Oct 19 12:08:45 2000 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/Cached_Connect_Strategy_T.cpp: Fixed compile errors with old - g++. - -Thu Oct 19 09:56:44 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Basic_Types.h: - Must #include stdio.h for platforms that lack 'long long' - -Thu Oct 19 09:50:30 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Log_Msg.cpp: - Fixed problems during TSS cleanup, the ipc_backend_ object was - used after being destroyed. Apparently this only happens on some - platforms, but fortunately David's build detected the bug. - -Thu Oct 19 09:07:47 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/RMCast/RMCast_Copy_On_Write.h: - Fixed problem in 'friend' declaration, most compilers let it go - through, but not the newer gcc snapshots. Thanks to Craig - Rodrigues <crodrigu@bbn.com> for providing this patch. - -Wed Oct 18 15:44:14 2000 Luther J Baker <luther@cs.wustl.edu> - - * OS.h: - * OS.i: - * OS.cpp: - - Modifications to sem_open debugging ACE_HAS_PACE over NT. - -Wed Oct 18 09:45:12 2000 Balachandran Natarajan <bala@cs.wustl.edu> - - * ace/Cached_Connect_Strategy_T.h : - * ace/Cached_Connect_Strategy_T.cpp: Added some fixes provided by - Edan Ayal <edana@bandwiz.com>. - -Tue Oct 17 23:35:33 2000 David L. Levine <levine@cs.wustl.edu> - - * Don't use ACE_TSS_EMULATION by default with LynxOS 3.1.0 - because it's not necessary, according to - Jessie Ragsdale <jessie.ragsdale@latuslw.com>, and breaks - split=1. Jessie was able to create upo to 118 natvie TSS keys, - so the 3-key limit of LynxOS 3.0.0 has been removed in 3.1.0. - [Bug 701] - -Tue Oct 17 00:21:41 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - - * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h, - examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i, - examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h, - examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i, - examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h, - examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i, - examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h, - examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i, - examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h, - examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i: - Changed *::get_handle(), *::handle_input(), and - *::handle_close() to use ACE_HANDLE and ACE_INVALID_HANDLE - instead of int and -1. Thanks to Mike Curtis - <mccurry@my-deja.com> for pointing this out. - -Mon Oct 16 14:05:13 2000 David L. Levine <levine@cs.wustl.edu> - - * ACE-INSTALL.html: removed spurious 3D characters from - VxWorks section. - -Mon Oct 16 11:17:08 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Makefile.am: - Fixed misnamed file. - -Mon Oct 16 11:07:34 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Log_Msg.cpp: - Fixed memory leak, or rather, make sure that the default Log_Msg - IPC backend is destroyed when the Log_Msg class is closed. - - * ace/Object_Manager.cpp: - Fixed typo in #endif, the final comment was not really a - comment. - -Sun Oct 15 19:14:13 2000 Marina Spivak <marina@cs.wustl.edu> - - * bin/auto_run_tests.lst: - Excluded tests/RTCORBA/Client_Propagated from running in - Exceptions build since it's a linux build. - -Sat Oct 14 15:04:16 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.h: - * ace/Naming_Context.h: - Static services must be exported from the library, so they - require the right export directives. - Added a new ACE_STATIC_SVC_DECLARE_EXPORT() macro for that - purpose and use it for the Naming_Context. - -Sat Oct 14 09:55:43 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Makefile.bor: - Fixed typo in file name. - -Sat Oct 14 03:32:54 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/ACE_Flag_Manip.h: - * ace/Service_Templates.h: - Added a missing header file. - -Fri Oct 13 22:40:27 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Add new files to the project. - - * ace/Log_Msg.cpp: - Fixed typo in management of structured exception handling - callbacks. - -Fri Oct 13 21:49:54 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Makefile: - * ace/Makefile.am: - * ace/Makefile.bor: - Add the new Log_Msg files to the Makefiles. - - * ace/ACE_Lib_Find.cpp: - Add ACE_RCSID macro - - * ace/config-all.h: - * ace/OS_Log_Msg_Attributes.h: - * ace/OS_Log_Msg_Attributes.inl: - * ace/OS_Log_Msg_Attributes.cpp: - * ace/Base_Thread_Adapter.h: - * ace/Base_Thread_Adapter.cpp: - We pre-allocate the Log_Msg attributes in the Thread_Adapter, to - minimize memory allocations during thread creation. - - * ace/Log_Msg_Callback.h: - * ace/Log_Msg_Callback.cpp: - Move the Log_Msg callback interface to its own file. - - * ace/Log_Msg_Backend.h: - * ace/Log_Msg_Backend.cpp: - Define the interface for Log_Msg backend strategies. - - * ace/Log_Msg_IPC.h: - * ace/Log_Msg_IPC.cpp: - Implement a Log_Msg backend based on IPC. - The intention is to decouple Log_Msg from IPC components, thus - Log_Msg only uses the abstract class ACE_Log_Msg_Backend. - In the future we could implement other backends, such as logging - to syslog or the NT event log directly. - We need to use a dynamically loaded factory to complete the - decoupling, but that would take a little more effort. - - * ace/Log_Msg.h: - * ace/Log_Msg.cpp: - Use the attributes directly. - Use the new Log_Msg_Backend classes. - - * tests/Log_Msg_Test.cpp: - * examples/Log_Msg/test_callback.cpp: - #include Log_Msg_Callback.h, the file is not included unless - ACE_LEGACY_MODE is set. - - * tests/Malloc_Test.cpp: - Add missing #include - - * examples/Shared_Malloc/test_position_independent_malloc.h: - * examples/Shared_Malloc/test_position_independent_malloc.cpp: - Reordered #includes to make them more standard. - -Fri Oct 13 22:34:59 2000 Marina Spivak <marina@cs.wustl.edu> - - * bin/auto_run_tests.lst: - - Added new TAO/tests/RTCORBA/Client_Protocol test to the list. - Removed TAO/tests/Endpoint_Per_Priority because - TAO::Client_Priority_Policy is now disabled in builds by - default. Enabled TAO/tests/RTCORBA/Server_Protocol for linux - builds (it was disabled for some reason). - -Fri Oct 13 19:12:31 2000 Steve Huston <shuston@riverace.com> - - * ace/Malloc_T.h: Added #include "ace/Malloc.h" because the definition - of ACE_Control_Block is needed, and it's in Malloc.h. - -Fri Oct 13 18:47:51 2000 Steve Huston <shuston@riverace.com> - - * ace/Caching_Strategies_T.cpp: - * ace/Dynamic_Service.cpp: - * ace/Timer_Hash_T.cpp: - * ace/Timer_Wheel_T.cpp: - * netsvcs/lib/Log_Message_Receiver.cpp: Added #include "ace/Log_Msg.h" - else IBM C++ can't compile the template at instantiation time. - - * tests/Process_Strategy_Test.h: Added #include "ace/File_Lock.h" to - see ACE_File_Lock, so IBM C++ can compile the templates. - -Fri Oct 13 18:43:24 2000 Steve Huston <shuston@riverace.com> - - * tests/MM_Shared_Memory_Test.cpp: Changed SYNCHRONIZER ctor for - ACE_SV_Semaphore_Simple case to specify - ACE_SV_Semaphore_Simple::ACE_CREATE, not ACE_SV_Semaphore_Complex:: - ACE_CREATE. Else it got compile failures on Solaris, Sun CC, - in PACE build (why in just PACE build? Dunno...) - -Fri Oct 13 13:57:40 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/Process_Manager.h : - * ace/Process_Manager.cpp : - - * ace/Service_Config.h : - * ace/Service_Config.cpp: - - Removed dependency of Service_Config on Process_Manager by - registering the Process_Manager singleton with the - Object_Manager when it is instantiated. This way we need not call - ACE_Process_Manager::close_singleton () in Service_Config - implementation. - -Mon Oct 9 10:34:18 2000 Ossama Othman <ossama@uci.edu> - - * configure.in: - - Corrected comments regarding the ACE_HAS_STREAM_PIPES run-time - test. - -Fri Oct 13 11:41:29 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/Makefile.bor (OBJFILES): - * ace/Makefile.am (libACE_Utils_la_SOURCES): - Updated to include the new files. - - * examples/Shared_Malloc/test_position_independent_malloc.cpp: - Included a header file. - -Fri Oct 13 11:43:56 2000 David L. Levine <levine@cs.wustl.edu> - - * ACE-INSTALL.html: updated supported platforms list. - -Fri Oct 13 11:39:54 2000 David L. Levine <levine@cs.wustl.edu> - - * ACE-INSTALL.html: added Jaffar Shaikh's <Jaffar_Shaikh@Mitel.COM> - notes for building for VxWorks target on NT host. - -Fri Oct 13 06:26:18 2000 Balachandran Natarajan <bala@cs.wustl.edu> - - * examples/RMCast/Send_File: - Added makefiles for Send_File multicast example. - - * include/makeinclude/build_dll.bor: - * include/makeinclude/build_exe.bor: - * include/makeinclude/build_lib.bor: - Added support for compilation of C source files. - - * include/makeinclude/ace_flags.bor: - Added IORManip and FaultTolerance libraries for TAO. - - Thanks to Christopher Kohlhoff for providing these fixes. - -Thu Oct 12 23:33:21 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/Synch.h: - * ace/Synch_T.h: - * ace/Test_and_Set.cpp: - Fixed order of includes to compile under gcc. - -Thu Oct 12 22:58:13 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/ACE_Lib_Find.h: - * ace/ACE_Lib_Find.cpp: - * ace/ACE.cpp: - Move the wchar version of strrepl and strsplit_r to the - ACE_Lib_Find class, the other versions where there already. - - * ace/FILE_IO.h: - * ace/FILE_Connector.cpp: - Add missing #include in FILE_IO.h that is used in FILE_IO.i - - * ace/Test_and_Set.h: - * ace/Test_and_Set.cpp: - Fixed the guards for the .cpp file. Add the #include for - platforms that requires template source visible, and add the - #pragma implementation for (really) old g++ versions. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - Move Test_and_Set.cpp to the "Template Files" folder, and - disable compilation for it. - -Thu Oct 12 23:09:17 2000 Joe Hoffert <joeh@cs.wustl.edu> - - * ace/OS.i: - Added a !defined (__Lynx__) check for ACE_HAS_PACE in the - ACE_OS::mmap function. ACE does some special things for Lynx - for mmap since Lynx's mmap is deficient. Probably should - move this fix from ACE to PACE at some point. - -Thu Oct 12 19:38:00 2000 Ossama Othman <ossama@uci.edu> - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: - - Added new files introduced by Priyanka's footprint reduction - effort. - -Thu Oct 12 18:19:46 2000 Priyanka Gontla <pgontla@ece.uci.edu> - - * ace/Makefile: - Made the corresponding changes. - - * ace/System_Time.cpp: - * ace/UPIPE_Connector.cpp : - * ace/Timer_Queue_T.h : - * ace/Task.cpp : - * ace/POSIX_Asynch_IO.cpp: - * ace/OS.h: - * ace/Memory_Pool.cpp: - * ace/MEM_SAP.h: - * ace/MEM_Acceptor.cpp: - * ace/Logging_Strategy.cpp: - * ace/FIFO.h: - * ace/DLL.cpp: - * ace/IO_SAP.h: - * ace/Malloc_T.h : - Cosmetic changes. Ex: Change the included header files to the - new header files and similar changes. - - * ace/Naming_Context.h: - * ace/Naming_Context.cpp: - * ace/Object_Manager.cpp: - - Removed the dependency of Object_Manager on Naming_Context. - - * ace/Test_and_Set.h: - * ace/Test_and_Set.cpp: - * ace/Test_and_Set.i: - - Moved the class Test_and_Set from Synch_T to here. This helped - remove the dependency on Event_Handler. - - * ace/Service_Templates.h: - * ace/Service_Templates.cpp: - - Moved the template instantiations from Service_Config.cpp and - Service_Types.cpp since these templates were not needed by the - respective files. - - * ace/Malloc_Allocator.h : - * ace/Malloc_Allocator.cpp: - * ace/Malloc_Allocator.i : - - * ace/PI_Malloc.h : - * ace/PI_Malloc.cpp: - * ace/PI_Malloc.i : - - * ace/Malloc.h : - * ace/Malloc.cpp : - * ace/Malloc.i : - - Moved the ACE_PI_Control_Block, ACE_New_Allocator and - ACE_Static_Allocator_Base classes to new files: PI_Malloc and - Malloc_Allocator. - - This move helps in reduction in size of Malloc.i since the - template instantiations which were included only for - ACE_PI_Control_Block are now moved to the new file: PI_Malloc. - In addition, is the effect of clear and minimized dependencies. - - * ace/ACE.h : - * ace/ACE.cpp : - * ace/ACE.i : - - Moved several functions in ACE to new classes to minimize the - dependencies on and by ACE. Each of the following files - have the listed functions. - - * ace/Malloc_Instantiations.cpp: - Moved the template instantiations to this file. - - * ace/ACE_Sock_Connect.h : - * ace/ACE_Sock_Connect.cpp : - * ace/ACE_Sock_Connect.i : - - Has the socket connection establishment function calls : - bind_port, get_bcast_addr, get_ip_interfaces, count_interfaces - and get_handle. - - Helps remove the dependency on INET_Addr. - - * ace/ACE_Handle_Ops.h: - * ace/ACE_Handle_Ops.cpp: - * ace/ACE_Handle_Ops.i: - - Has the <handle_timed_open> operation on handles. - Helps remove the dependency of FILE_Connector, SPIPE_COnenctor, - UPIPE_Conenctpr and DEV_Connector on ACE. - - * ace/ACE_Lib_Find.h : - * ace/ACE_Lib_Find.cpp : - * ace/ACE_Lib_Find.i : - - Includes all the functions to search and open shared - libraries and realted functions : - ldfind, ldopen, ldname, get_temp_dir, open_temp_file, - strrepl, strsplit_r. - - Removes the dependency of DLL, Logging_Strategy and FILE_Addr on - ACE. Effects few other classes too but doesnt remove the - dependency on ACE for those classes. - - * ace/ACE_Flag_Manip.h : - * ace/ACE_Flag_Manip.cpp: - * ace/ACE_Flag_Manip.i : - - The Flag Manipulation functions: - set_flags (), clr_flags () and get_flags (). - - Removes the dependency of IO_SAP and IPC_SAP on ACE. - - * ace/ACE_Init.h : - * ace/ACE_Init.cpp: - * ace/ACE_Init.i : - - The init () and fini () functions which are used - for the initialization and shutting down of ACE. - - Removes dependency on Object_Manager. - -Thu Oct 12 15:41:46 2000 Carlos O'Ryan <coryan@uci.edu> - - * include/makeinclude/rules.bin.GNU: - List the LDFLAGS before the name of the program, this seems to - work better for some of our sponsors. - -Thu Oct 12 15:40:51 2000 Carlos O'Ryan <coryan@uci.edu> - - * ace/OS.cpp (ACE_OS_GUARD): - Use explicit names for the OS guards, otherwise the SGI compiler - (7.30 + several patches) crashes. Thanks to Philip Miller - <pwmiller@sarnoff.com> for reporting the problem and providing - the patch. - -Thu Oct 12 12:15:23 2000 Angelo <corsaro@cs.wustl.edu> - - * ACE version 5.1.10 released. diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp deleted file mode 100644 index 221f0e4e4ee..00000000000 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp +++ /dev/null @@ -1,348 +0,0 @@ -// $Id$ - -#include "receiver.h" -#include "ace/Get_Opt.h" - -typedef ACE_Singleton<Receiver, ACE_Null_Mutex> RECEIVER; -// Create a singleton instance of the Sender. - -static FILE *output_file = 0; -// File handle of the file into which received data is written. - -static const char *output_file_name = "output"; -// File name of the file into which received data is written. - -int -Receiver_StreamEndPoint::get_callback (const char *, - TAO_AV_Callback *&callback) -{ - // Return the receiver application callback to the AVStreams for - // future upcalls. - callback = &this->callback_; - - - // Get the stream controller for this stream. - ACE_TRY_NEW_ENV - { - CORBA::Any_ptr streamctrl_any = - this->get_property_value ("Related_StreamCtrl", - ACE_TRY_ENV); - ACE_TRY_CHECK; - - AVStreams::StreamCtrl_ptr streamctrl; - *streamctrl_any >>= streamctrl; - - // Store the stream control for the stream with the callback. - this->callback_.streamctrl (streamctrl); - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Sender_StreamEndPoint::get_callback failed"); - - return -1; - } - ACE_ENDTRY; - - return 0; -} - -Receiver_Callback::Receiver_Callback (void) - : frame_count_ (0) -{ -} - -void -Receiver_Callback::streamctrl (AVStreams::StreamCtrl_ptr streamctrl) -{ - // Set the sender protocol object corresponding to the transport - // protocol selected. - this->streamctrl_ = streamctrl; -} - - -int -Receiver_Callback::receive_frame (ACE_Message_Block *frame, - TAO_AV_frame_info *, - const ACE_Addr &) -{ - // - // Upcall from the AVStreams when there is data to be received from - // the sender. - // - ACE_DEBUG ((LM_DEBUG, - "Receiver_Callback::receive_frame for frame %d\n", - ++this->frame_count_)); - - - if (this->streamctrl_ != 0) - { - // Modify QoS after receiving 20 frames - if (frame_count_ == 20) - { - // Specify the flow for which the qos needs to be changed. - TAO_Forward_FlowSpec_Entry entry ("Data_Receiver", - "IN", - "", - "", - 0); - - AVStreams::flowSpec flow_spec (1); - flow_spec.length (1); - flow_spec [0] = CORBA::string_dup (entry.entry_to_string ()); - - // Initialize the qos parameter(s) that need to be changed - // with the corresponding value. - AVStreams::streamQoS qos; - qos.length (1); - - // The QoS Type that needs to be changed. - qos [0].QoSType = CORBA::string_dup ("video_qos"); - - qos [0].QoSParams.length (1); - qos [0].QoSParams [0].property_name = CORBA::string_dup ("video_frame_rate"); - qos [0].QoSParams [0].property_value <<= (CORBA::Short) 30; - - ACE_DECLARE_NEW_CORBA_ENV; - - // Initiate the modifying of the qos for the flows. - this->streamctrl_->modify_QoS (qos, flow_spec, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - ACE_DEBUG ((LM_DEBUG, - "Stream Ctrl available....Modify QoS called\n")); - } - } - else ACE_DEBUG ((LM_DEBUG, - "No Stream Ctrl\n")); - - while (frame != 0) - { - // Write the received data to the file. - size_t result = - ACE_OS::fwrite (frame->rd_ptr (), - frame->length (), - 1, - output_file); - - if (result == frame->length ()) - ACE_ERROR_RETURN ((LM_ERROR, - "Receiver_Callback::fwrite failed\n"), - -1); - - frame = frame->cont (); - } - - return 0; -} - -int -Receiver_Callback::handle_destroy (void) -{ - // Called when the distributer requests the stream to be shutdown. - ACE_DEBUG ((LM_DEBUG, - "Receiver_Callback::end_stream\n")); - - ACE_TRY_NEW_ENV - { - TAO_AV_CORE::instance ()->orb ()->shutdown (0, - ACE_TRY_ENV); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Receiver_Callback::handle_destroy Failed\n"); - return -1; - - } - ACE_ENDTRY; - - return 0; -} - -Receiver::Receiver (void) - : mmdevice_ (0) -{ -} - -Receiver::~Receiver (void) -{ -} - - - -int -Receiver::init (int, - char **, - CORBA::Environment &ACE_TRY_ENV) -{ - // Initialize the endpoint strategy with the orb and poa. - int result = - this->reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (), - TAO_AV_CORE::instance ()->poa ()); - if (result != 0) - return result; - - // Register the receiver mmdevice object with the ORB - ACE_NEW_RETURN (this->mmdevice_, - TAO_MMDevice (&this->reactive_strategy_), - -1); - - // Servant Reference Counting to manage lifetime - PortableServer::ServantBase_var safe_mmdevice = - this->mmdevice_; - - CORBA::Object_var mmdevice = - this->mmdevice_->_this (ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - - // Register the mmdevice with the naming service. - CosNaming::Name name (1); - name.length (1); - name [0].id = - CORBA::string_dup ("Receiver"); - - // Initialize the naming services - if (this->naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to initialize " - "the TAO_Naming_Client\n"), - -1); - - // Register the receiver object with the naming server. - this->naming_client_->rebind (name, - mmdevice.in (), - ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - - return 0; -} - -int -parse_args (int argc, - char **argv) -{ - // Parse the command line arguments - ACE_Get_Opt opts (argc, - argv, - "f:"); - - int c; - while ((c = opts ()) != -1) - { - switch (c) - { - case 'f': - output_file_name = opts.optarg; - break; - default: - ACE_ERROR_RETURN ((LM_ERROR, - "Usage: receiver -f filename"), - -1); - } - } - - return 0; -} - -int -main (int argc, - char **argv) -{ - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - // Initialize the ORB first. - CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0, - ACE_TRY_ENV); - ACE_TRY_CHECK; - - CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); - ACE_TRY_CHECK; - - // Get the POA_var object from Object_var. - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); - ACE_TRY_CHECK; - - PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); - ACE_TRY_CHECK; - - mgr->activate (ACE_TRY_ENV); - ACE_TRY_CHECK; - - // Initialize the AVStreams components. - TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); - ACE_TRY_CHECK; - - int result = - parse_args (argc, - argv); - - if (result == -1) - return -1; - - // Make sure we have a valid <output_file> - output_file = ACE_OS::fopen (output_file_name, - "w"); - if (output_file == 0) - ACE_ERROR_RETURN ((LM_DEBUG, - "Cannot open output file %s\n", - output_file_name), - -1); - - else - ACE_DEBUG ((LM_DEBUG, - "File Opened Successfull\n")); - - Receiver receiver; - result = - receiver.init (argc, - argv, - ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (result != 0) - return result; - - orb->run (ACE_TRY_ENV); - ACE_TRY_CHECK; - - // Hack for now.... - ACE_OS::sleep (1); - - orb->destroy (ACE_TRY_ENV); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init"); - return -1; - } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); - - ACE_OS::fclose (output_file); - - return 0; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Singleton <Receiver,ACE_Null_Mutex>; -template class TAO_AV_Endpoint_Reactive_Strategy_B<Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>; -template class TAO_AV_Endpoint_Reactive_Strategy<Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Singleton <Receiver,ACE_Null_Mutex> -#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_B<Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> -#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.dsp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.dsp deleted file mode 100644 index 84c536c7bcb..00000000000 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.dsp +++ /dev/null @@ -1,106 +0,0 @@ -# Microsoft Developer Studio Project File - Name="AVStreams Modify_QoS Receiver" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=AVStreams Modify_QoS Receiver - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "receiver.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "receiver.mak" CFG="AVStreams Modify_QoS Receiver - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "AVStreams Modify_QoS Receiver - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "AVStreams Modify_QoS Receiver - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "AVStreams Modify_QoS Receiver - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\.." /I "..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 tao.lib ace.lib TAO_PortableServer.lib TAO_AV.lib TAO_CosProperty.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_IORTable.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao\IORTable"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "AVStreams Modify_QoS Receiver - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\.." /I "..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_AVd.lib TAO_CosPropertyd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_IORTabled.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao\IORTable"
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF
-
-# Begin Target
-
-# Name "AVStreams Modify_QoS Receiver - Win32 Release"
-# Name "AVStreams Modify_QoS Receiver - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\receiver.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\receiver.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h deleted file mode 100644 index 5b7d0844af0..00000000000 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h +++ /dev/null @@ -1,90 +0,0 @@ -/* -*- C++ -*- */ - - -//============================================================================= -/** - * @file receiver.h - * - * $Id$ - * - * @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu> - */ -//============================================================================= - -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" - -// = AVStreams calls this class when data shows up from a sender. -class Receiver_Callback : public TAO_AV_Callback -{ -public: - - Receiver_Callback (void); - /// Constructor. - - /// Method that is called when there is data to be received from a - /// sender. - int receive_frame (ACE_Message_Block *frame, - TAO_AV_frame_info *frame_info, - const ACE_Addr &peer_address); - - /// Called when the sender is done sending data and wants to close - /// down the connection. - int handle_destroy (void); - - /// Set the related stream control for this flow. - void streamctrl (AVStreams::StreamCtrl_ptr streamctrl); - -private: - int frame_count_; - /// Keeping a count of the incoming frames. - - /// Related stream control. - AVStreams::StreamCtrl_ptr streamctrl_; - -}; - -// = AVStreams calls this class during connection setup. -class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint -{ - -public: - /// Create a receiver application callback. - int get_callback (const char *flowname, - TAO_AV_Callback *&callback); - -private: - Receiver_Callback callback_; - /// Receiver application callback. -}; - -// = This class receives data from a AV sender and writes it to a file. -class Receiver -{ -public: - Receiver (void); - /// Constructor - - ~Receiver (void); - /// Destructor. - - int init (int argc, - char **argv, - CORBA::Environment &); - /// Initialize data components. - - -protected: - TAO_Naming_Client naming_client_; - /// The Naming Service Client. - - TAO_AV_Endpoint_Reactive_Strategy_B - <Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_; - /// The endpoint reactive strategy. - - TAO_MMDevice *mmdevice_; - /// Receiver MMDevice. -}; - diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl deleted file mode 100755 index 2de9e19a586..00000000000 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl +++ /dev/null @@ -1,67 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib '../../../../../bin'; -use PerlACE::Run_Test; - -# amount of delay between running the servers - -$sleeptime = 2; -$status = 0; - -$nsior = PerlACE::LocalFile ("ns.ior"); -$outfile = PerlACE::LocalFile ("output"); - -unlink $nsior; - -$NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior"); -$SV = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior"); -$CL = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior"); - -print STDERR "Starting Naming Service\n"; - -$NS->Spawn (); - -if (PerlACE::waitforfile_timed ($nsior, 5) == -1) { - print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); - exit 1; -} - -print STDERR "Starting Receiver\n"; - -$SV->Spawn (); - -sleep $sleeptime; - -print STDERR "Starting Sender\n"; - -$sender = $CL->SpawnWaitKill (60); - -if ($sender != 0) { - print STDERR "ERROR: sender returned $sender\n"; - $status = 1; -} - -$receiver = $SV->TerminateWaitKill (5); - -if ($receiver != 0) { - print STDERR "ERROR: receiver returned $receiver\n"; - $status = 1; -} - -$nserver = $NS->TerminateWaitKill (5); - -if ($nserver != 0) { - print STDERR "ERROR: Naming Service returned $nserver\n"; - $status = 1; -} - -unlink $nsior; -unlink $output; - -exit $status; diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp deleted file mode 100644 index ad3e12574cc..00000000000 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp +++ /dev/null @@ -1,446 +0,0 @@ -// $Id$ - -#include "sender.h" -#include "tao/debug.h" -#include "ace/Get_Opt.h" -#include "ace/High_Res_Timer.h" - -typedef ACE_Singleton<Sender, ACE_Null_Mutex> SENDER; -// Create a singleton instance of the Sender. - -// The time that should lapse between two consecutive frames sent. -ACE_Time_Value inter_frame_time; - -int -Sender_StreamEndPoint::get_callback (const char *, - TAO_AV_Callback *&callback) -{ - // Create and return the sender application callback to AVStreams - // for further upcalls. - callback = &this->callback_; - return 0; -} - -int -Sender_StreamEndPoint::set_protocol_object (const char *, - TAO_AV_Protocol_Object *object) -{ - // Set the sender protocol object corresponding to the transport - // protocol selected. - SENDER::instance ()->protocol_object (object); - return 0; -} - -CORBA::Boolean -Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &/* the_flows */, - CORBA::Environment &/* ACE_TRY_ENV */) -{ - ACE_DEBUG ((LM_DEBUG, - "Sender_StreamEndPoint::modify_QoS\n")); - - // Check if the qos for the flow has changed. - if (new_qos.length () != 0) - { - // Check which qos parameter has changed. - if (strcmp (new_qos [0].QoSParams [0].property_name, "video_frame_rate") == 0) - { - // The video frame rate for this flow has changed. - - // Get the new value of the frame rate. - CORBA::Any frame_rate_any = - new_qos [0].QoSParams [0].property_value; - - CORBA::Short frame_rate; - frame_rate_any >>= frame_rate; - - // Calculate the new inter frame time. - inter_frame_time.set (1 / (double) frame_rate); - } - } - - return 1; -} - -Sender::Sender (void) - : sender_mmdevice_ (0), - streamctrl_ (0), - frame_count_ (0), - filename_ ("input"), - input_file_ (0), - protocol_ ("UDP"), - frame_rate_ (1), - mb_ (BUFSIZ) -{ -} - -void -Sender::protocol_object (TAO_AV_Protocol_Object *object) -{ - // Set the sender protocol object corresponding to the transport - // protocol selected. - this->protocol_object_ = object; -} - -int -Sender::parse_args (int argc, - char **argv) -{ - // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:d"); - - int c; - while ((c= opts ()) != -1) - { - switch (c) - { - case 'f': - this->filename_ = opts.optarg; - break; - case 'p': - this->protocol_ = opts.optarg; - break; - case 'r': - this->frame_rate_ = ACE_OS::atoi (opts.optarg); - break; - case 'd': - TAO_debug_level++; - break; - default: - ACE_DEBUG ((LM_DEBUG, "Unknown Option\n")); - return -1; - } - } - return 0; -} - -// Method to get the object reference of the receiver -int -Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV) -{ - CosNaming::Name name (1); - name.length (1); - name [0].id = - CORBA::string_dup ("Receiver"); - - // Resolve the receiver object reference from the Naming Service - CORBA::Object_var receiver_mmdevice_obj = - this->naming_client_->resolve (name, - ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - - this->receiver_mmdevice_ = - AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in (), - ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - - if (CORBA::is_nil (this->receiver_mmdevice_.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - "Could not resolve Receiver_MMdevice in Naming service <%s>\n"), - -1); - - return 0; -} - -int -Sender::init (int argc, - char **argv, - CORBA::Environment &ACE_TRY_ENV) -{ - // Initialize the endpoint strategy with the orb and poa. - int result = - this->endpoint_strategy_.init (TAO_AV_CORE::instance ()->orb (), - TAO_AV_CORE::instance ()->poa ()); - if (result != 0) - return result; - - // Initialize the naming services - result = - this->naming_client_.init (TAO_AV_CORE::instance ()->orb ()); - if (result != 0) - return result; - - // Parse the command line arguments - result = - this->parse_args (argc, - argv); - if (result != 0) - return result; - - // Open file to read. - this->input_file_ = - ACE_OS::fopen (this->filename_.c_str (), - "r"); - - if (this->input_file_ == 0) - ACE_ERROR_RETURN ((LM_DEBUG, - "Cannot open input file %s\n", - this->filename_.c_str ()), - -1); - else - ACE_DEBUG ((LM_DEBUG, - "File opened successfully\n")); - - // Resolve the object reference of the receiver from the Naming Service. - result = this->bind_to_receiver (ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - - if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) Error binding to the naming service\n"), - -1); - - - // Initialize the QoS - AVStreams::streamQoS_var the_qos (new AVStreams::streamQoS); - - // Create the forward flow specification to describe the flow. - TAO_Forward_FlowSpec_Entry entry ("Data_Receiver", - "IN", - "USER_DEFINED", - "", - this->protocol_.c_str (), - 0); - - AVStreams::flowSpec flow_spec (1); - flow_spec.length (1); - flow_spec [0] = CORBA::string_dup (entry.entry_to_string ()); - - // Register the sender mmdevice object with the ORB - ACE_NEW_RETURN (this->sender_mmdevice_, - TAO_MMDevice (&this->endpoint_strategy_), - -1); - - // Servant Reference Counting to manage lifetime - PortableServer::ServantBase_var safe_mmdevice = - this->sender_mmdevice_; - - AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - - ACE_NEW_RETURN (this->streamctrl_, - TAO_StreamCtrl, - -1); - - PortableServer::ServantBase_var safe_streamctrl = - this->streamctrl_; - - // Bind/Connect the sender and receiver MMDevices. - CORBA::Boolean bind_result = - this->streamctrl_->bind_devs (mmdevice.in (), - this->receiver_mmdevice_.in (), - the_qos.inout (), - flow_spec, - ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - - if (bind_result == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "streamctrl::bind_devs failed\n"), - -1); - - return 0; -} - -// Method to send data at the specified rate -int -Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) -{ - - - // The time between two consecutive frames. - inter_frame_time.set (1 / (double) this->frame_rate_); - - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "Frame Rate = %d / second\n" - "Inter Frame Time = %d (msec)\n", - this->frame_rate_, - inter_frame_time.msec ())); - - ACE_TRY - { - // The time taken for sending a frame and preparing for the next frame - ACE_High_Res_Timer elapsed_timer; - - // Continue to send data till the file is read to the end. - while (1) - { - // Read from the file into a message block. - int n = ACE_OS::fread (this->mb_.wr_ptr (), - 1, - this->mb_.size (), - this->input_file_); - - if (n < 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Sender::pace_data fread failed\n"), - -1); - - if (n == 0) - { - // At end of file break the loop and end the sender. - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG,"Handle_Start:End of file\n")); - break; - } - - this->mb_.wr_ptr (n); - - if (this->frame_count_ > 1) - { - // - // Second frame and beyond - // - - // Stop the timer that was started just before the previous frame was sent. - elapsed_timer.stop (); - - // Get the time elapsed after sending the previous frame. - ACE_Time_Value elapsed_time; - elapsed_timer.elapsed_time (elapsed_time); - - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "Elapsed Time = %d\n", - elapsed_time.msec ())); - - // Check to see if the inter frame time has elapsed. - if (elapsed_time < inter_frame_time) - { - // Inter frame time has not elapsed. - - // Calculate the time to wait before the next frame needs to be sent. - ACE_Time_Value wait_time (inter_frame_time - elapsed_time); - - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "Wait Time = %d\n", - wait_time.msec ())); - - // Run the orb for the wait time so the sender can - // continue other orb requests. - TAO_AV_CORE::instance ()->orb ()->run (wait_time, - ACE_TRY_ENV); - ACE_TRY_CHECK; - } - } - - // Start timer before sending the frame. - elapsed_timer.start (); - - // Send frame. - int result = - this->protocol_object_->send_frame (&this->mb_); - - if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, - "send failed:%p", - "Sender::pace_data send\n"), - -1); - - ACE_DEBUG ((LM_DEBUG, - "Sender::pace_data frame %d was sent succesfully\n", - ++this->frame_count_)); - - // Reset the message block. - this->mb_.reset (); - - } // end while - - // File reading is complete, destroy the stream. - AVStreams::flowSpec stop_spec; - this->streamctrl_->destroy (stop_spec, - ACE_TRY_ENV); - ACE_TRY_CHECK; - - // Shut the orb down. - TAO_AV_CORE::instance ()->orb ()->shutdown (1, - ACE_TRY_ENV); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Sender::pace_data Failed\n"); - return -1; - } - ACE_ENDTRY; - return 0; -} - -int -main (int argc, - char **argv) -{ - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0, - ACE_TRY_ENV); - - CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); - ACE_TRY_CHECK; - - // Get the POA_var object from Object_var - PortableServer::POA_var root_poa - = PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); - ACE_TRY_CHECK; - - PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); - ACE_TRY_CHECK; - - mgr->activate (ACE_TRY_ENV); - ACE_TRY_CHECK; - - // Initialize the AV Stream components. - TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); - ACE_TRY_CHECK; - - // Initialize the Sender. - int result = 0; - result = SENDER::instance ()->init (argc, - argv, - ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Sender::init failed\n"), - -1); - - // Start sending data. - result = SENDER::instance ()->pace_data (ACE_TRY_ENV); - ACE_TRY_CHECK; - - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Sender Failed\n"); - return -1; - } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); - return 0; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Singleton <Sender,ACE_Null_Mutex>; -template class TAO_AV_Endpoint_Reactive_Strategy_A<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>; -template class TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Singleton <Sender,ACE_Null_Mutex> -#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> -#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h deleted file mode 100644 index ec1b361a1fa..00000000000 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h +++ /dev/null @@ -1,121 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file sender.h - * - * $Id$ - * - * @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu> - */ -//============================================================================= - -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Protocol_Factory.h" - -// = Defines application specific sender stream endpoint. -class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint -{ - public: - int get_callback (const char *flowname, - TAO_AV_Callback *&callback); - /// Create the application callback and return its handle to - /// AVStreams for further application callbacks. - - int set_protocol_object (const char *flowname, - TAO_AV_Protocol_Object *object); - /// Set protocol object corresponding to the transport protocol - /// chosen. - - CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &flow_spec, - CORBA::Environment &ACE_TRY_ENV); - /// The over-ridden modify_qos method to change the qos of the - /// flows specified in the flow spec to that in the new_qos. - -protected: - TAO_AV_Callback callback_; - /// Application callback. -}; - -typedef TAO_AV_Endpoint_Reactive_Strategy_A -<Sender_StreamEndPoint, - TAO_VDev, - AV_Null_MediaCtrl> -SENDER_ENDPOINT_STRATEGY; - -/** - * @class Sender - * - * @brief Class is responsible for streaming (and pacing) data to a - * receiver. - * - */ -class Sender -{ -public: - Sender (void); - /// Constructor - - int init (int argc, - char **argv, - CORBA::Environment&); - /// Method to initialize the various data components. - - int pace_data (CORBA::Environment &); - /// Method to pace and send data from a file. - - void protocol_object (TAO_AV_Protocol_Object *protocol_object); - /// Set the protocol object corresponding to the transport protocol chosen. - -private: - int parse_args (int argc, char **argv); - /// Method to parse the command line arguments. - - int bind_to_receiver (CORBA::Environment& ACE_TRY_ENV); - /// Method that binds the sender to the receiver. - - SENDER_ENDPOINT_STRATEGY endpoint_strategy_; - /// The endpoint strategy used by the sender. - - AVStreams::MMDevice_var receiver_mmdevice_; - /// The receiver MMDevice that the sender connects to. - - TAO_MMDevice *sender_mmdevice_; - /// The sender MMDevice. - - TAO_StreamCtrl *streamctrl_; - /// Stream controller - - int frame_count_; - /// Number of frames sent. - - ACE_CString filename_; - /// File from which data is read. - - TAO_Naming_Client naming_client_; - /// The Naming Service client. - - FILE *input_file_; - /// File handle of the file read from. - - ACE_CString protocol_; - /// Selected protocol - default is UDP - - int frame_rate_; - /// Rate at which the data will be sent. - - ACE_Message_Block mb_; - /// Message block into which data is read from a file and then sent. - - TAO_AV_Protocol_Object *protocol_object_; - /// Protocol object corresponding to the transport protocol selected. -}; - - - - - - diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile index a81d5198d97..cf49d426c3e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile @@ -11,10 +11,6 @@ LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO -ifeq ($(rapi),1) - LDLIBS += -lACE_QoS -endif # rapi - SERVER_OBJS = server.o CLIENT_OBJS = ftp.o diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile index ec18967b622..0400e1589ba 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile @@ -11,10 +11,6 @@ LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO -ifeq ($(rapi),1) - LDLIBS += -lACE_QoS -endif # rapi - SERVER_OBJS = server.o CLIENT_OBJS = ftp.o diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile index 0df53b03b81..5ec8d869153 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile @@ -11,10 +11,6 @@ LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO -ifeq ($(rapi),1) - LDLIBS += -lACE_QoS -endif # rapi - SERVER_OBJS = server.o CLIENT_OBJS = ftp.o diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile index 2563597f247..28aec598348 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile @@ -11,10 +11,6 @@ LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO -ifeq ($(rapi),1) - LDLIBS += -lACE_QoS -endif # rapi - SENDER_OBJS = sender.o DISTRIBUTER_OBJS = distributer.o RECEIVER_OBJS = receiver.o diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile index ec8add735dd..e56f4c2d9f1 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile @@ -11,10 +11,6 @@ LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO -ifeq ($(rapi),1) - LDLIBS += -lACE_QoS -endif # rapi - RECEIVER_OBJS = receiver.o SENDER_OBJS = sender.o diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile deleted file mode 100644 index 5a7b7147475..00000000000 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile +++ /dev/null @@ -1,805 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Top-level Makefile for Pluggable testing of AVStreams of TAO. -# -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO -lACE_QoS - -RECEIVER_OBJS = receiver.o -SENDER_OBJS = sender.o - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -ifndef TAO_ROOT -TAO_ROOT = $(ACE_ROOT)/TAO -endif - -FILES = sender receiver -DEFS = $(addsuffix .h,$(FILES)) -LSRC = $(addsuffix .cpp,$(FILES)) - -BIN2 = receiver sender - -#### If the TAO orbsvcs library wasn't built with sufficient components, -#### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # AV - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(TAO_ROOT)/rules.tao.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#DCFLAGS = -g -LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -Wl,-rpath $(ACE_ROOT)/ace - -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \ - -I$(TAO_ROOT) - -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ - $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/tao/corba.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/CDR_Base.inl \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/CORBA_macros.h \ - $(TAO_ROOT)/tao/varbase.h \ - $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ - $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Managed_Types.h \ - $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/OctetSeqC.i \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_Dgram.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ - $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(ACE_ROOT)/ace/ATM_Addr.h \ - $(ACE_ROOT)/ace/ATM_Addr.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/Process.i \ - $(ACE_ROOT)/ace/SOCK_CODgram.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_CODgram.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ - $(TAO_ROOT)/tao/debug.h \ - $(ACE_ROOT)/ace/Process_Semaphore.h \ - $(ACE_ROOT)/ace/Process_Semaphore.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/High_Res_Timer.h \ - $(ACE_ROOT)/ace/High_Res_Timer.i - -.obj/receiver.o .obj/receiver.so .shobj/receiver.o .shobj/receiver.so: receiver.cpp receiver.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ - $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/tao/corba.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/CDR_Base.inl \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/CORBA_macros.h \ - $(TAO_ROOT)/tao/varbase.h \ - $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ - $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Managed_Types.h \ - $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/OctetSeqC.i \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_Dgram.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ - $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(ACE_ROOT)/ace/ATM_Addr.h \ - $(ACE_ROOT)/ace/ATM_Addr.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/Process.i \ - $(ACE_ROOT)/ace/SOCK_CODgram.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_CODgram.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ - $(TAO_ROOT)/tao/debug.h \ - $(ACE_ROOT)/ace/Process_Semaphore.h \ - $(ACE_ROOT)/ace/Process_Semaphore.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/README b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/README deleted file mode 100644 index 243fb4ded87..00000000000 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/README +++ /dev/null @@ -1,47 +0,0 @@ -// $Id$ - -Description ------------ - -This directory contains a simple test in the form of a sender and a -receiver. The test has the following features: - -1. It tests the AVStreams Integration with the AQoSA API. The test -initiates an RSVP session between the sender and receiver. -2. Shows a mechanism to pace data. - -Running the test ----------------- - -First start the RSVP daemon(s) - -receiver --------- - -receiver -f <output_filename> - --f <output_filename> -> The name of the file under which the received stream - data has to be stored (defaults to "output") - -sender ------- - -sender [-f <filename>] [-p <protocol>] [-r <frame rate>] [-a <address>] [-d] - - --f filename --> The file to be streamed to the receiver (defaults to - "input"). - --p protocol --> The protocol string could be UDP or TCP (defaults to - UDP). But with the multicast address it should be UDP. - --r framerate--> The rate at which tha data frames need to be sent - (defaults to 30 frames per second). - --a address --> Destination address. - --d --> Increament the TAO_debug_level for debug messages. - - -The test must be run with the naming service. Check the run_test.pl -to see how to configure the test case. diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/input b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/input deleted file mode 100644 index b71b9f74fab..00000000000 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/input +++ /dev/null @@ -1,995 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Top-level Makefile for Pluggable testing of AVStreams of TAO. -# -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO - -SERVER_OBJS = server.o -CLIENT_OBJS = ftp.o - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -ifndef TAO_ROOT -TAO_ROOT = $(ACE_ROOT)/TAO -endif - -FILES = ftp server -DEFS = $(addsuffix .h,$(FILES)) -LSRC = $(addsuffix .cpp,$(FILES)) - -BIN2 = server ftp - -#### If the TAO orbsvcs library wasn't built with sufficient components, -#### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # AV - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(TAO_ROOT)/rules.tao.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#DCFLAGS = -g -LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \ - -I$(TAO_ROOT) - -#server:$(addprefix $(VDIR),$(SERVER_OBJS)) -# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - -#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS)) -# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/ftp.o .obj/ftp.so .shobj/ftp.o .shobj/ftp.so: ftp.cpp ftp.h \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/CDR_Base.inl \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/CORBA_macros.h \ - $(TAO_ROOT)/tao/varbase.h \ - $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Managed_Types.h \ - $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ - $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/TAO_Server_Request.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/Pluggable.i \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/Profile.h \ - $(TAO_ROOT)/tao/Tagged_Components.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.i \ - $(TAO_ROOT)/tao/Tagged_Components.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Profile.i \ - $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/Policy_Manager.i \ - $(TAO_ROOT)/tao/Resource_Factory.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(TAO_ROOT)/tao/Protocol_Factory.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(TAO_ROOT)/tao/Parser_Registry.h \ - $(TAO_ROOT)/tao/Parser_Registry.i \ - $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ - $(TAO_ROOT)/tao/Endpoint.h \ - $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \ - $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ - $(TAO_ROOT)/tao/Object_Ref_Table.h \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ - $(TAO_ROOT)/tao/RT_Policy_i.h \ - $(TAO_ROOT)/tao/RTCORBAS.h \ - $(TAO_ROOT)/tao/IOPS.h \ - $(TAO_ROOT)/tao/IOPS_T.h \ - $(TAO_ROOT)/tao/IOPS_T.i \ - $(TAO_ROOT)/tao/IOPS_T.cpp \ - $(TAO_ROOT)/tao/IOPS.i \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/RTCORBAS_T.h \ - $(TAO_ROOT)/tao/RTCORBAS_T.i \ - $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ - $(TAO_ROOT)/tao/RTCORBAS.i \ - $(TAO_ROOT)/tao/RT_Policy_i.i \ - $(TAO_ROOT)/tao/Protocols_Hooks.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/TAOC.h \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ - $(TAO_ROOT)/tao/Priority_Mapping.h \ - $(TAO_ROOT)/tao/Priority_Mapping.i \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ - $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/tao/operation_details.h \ - $(TAO_ROOT)/tao/target_specification.h \ - $(TAO_ROOT)/tao/target_specification.i \ - $(TAO_ROOT)/tao/operation_details.i \ - $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ - $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ - $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/BiDirPolicyC.h \ - $(TAO_ROOT)/tao/BiDirPolicyC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/QoS_Session.h \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_Dgram.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(ACE_ROOT)/ace/ATM_Addr.h \ - $(ACE_ROOT)/ace/ATM_Addr.i \ - $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/Process.i \ - $(ACE_ROOT)/ace/SOCK_CODgram.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_CODgram.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ - $(ACE_ROOT)/ace/Process_Semaphore.h \ - $(ACE_ROOT)/ace/Process_Semaphore.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \ - $(ACE_ROOT)/ace/High_Res_Timer.h \ - $(ACE_ROOT)/ace/High_Res_Timer.i \ - $(ACE_ROOT)/ace/Stats.h \ - $(ACE_ROOT)/ace/Basic_Stats.h \ - $(ACE_ROOT)/ace/Basic_Stats.inl \ - $(ACE_ROOT)/ace/Stats.i - -.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/CDR_Base.inl \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/CORBA_macros.h \ - $(TAO_ROOT)/tao/varbase.h \ - $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ - $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Managed_Types.h \ - $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/TAO_Server_Request.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/Pluggable.i \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/Profile.h \ - $(TAO_ROOT)/tao/Tagged_Components.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.i \ - $(TAO_ROOT)/tao/Tagged_Components.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Profile.i \ - $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/Policy_Manager.i \ - $(TAO_ROOT)/tao/Resource_Factory.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(TAO_ROOT)/tao/Protocol_Factory.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(TAO_ROOT)/tao/Parser_Registry.h \ - $(TAO_ROOT)/tao/Parser_Registry.i \ - $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ - $(TAO_ROOT)/tao/Endpoint.h \ - $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \ - $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ - $(TAO_ROOT)/tao/Object_Ref_Table.h \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ - $(TAO_ROOT)/tao/RT_Policy_i.h \ - $(TAO_ROOT)/tao/RTCORBAS.h \ - $(TAO_ROOT)/tao/IOPS.h \ - $(TAO_ROOT)/tao/IOPS_T.h \ - $(TAO_ROOT)/tao/IOPS_T.i \ - $(TAO_ROOT)/tao/IOPS_T.cpp \ - $(TAO_ROOT)/tao/IOPS.i \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/tao/RTCORBAS_T.h \ - $(TAO_ROOT)/tao/RTCORBAS_T.i \ - $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ - $(TAO_ROOT)/tao/RTCORBAS.i \ - $(TAO_ROOT)/tao/RT_Policy_i.i \ - $(TAO_ROOT)/tao/Protocols_Hooks.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/TAOC.h \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ - $(TAO_ROOT)/tao/Priority_Mapping.h \ - $(TAO_ROOT)/tao/Priority_Mapping.i \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ - $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/tao/operation_details.h \ - $(TAO_ROOT)/tao/target_specification.h \ - $(TAO_ROOT)/tao/target_specification.i \ - $(TAO_ROOT)/tao/operation_details.i \ - $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ - $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ - $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/BiDirPolicyC.h \ - $(TAO_ROOT)/tao/BiDirPolicyC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/QoS_Session.h \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_Dgram.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(ACE_ROOT)/ace/ATM_Addr.h \ - $(ACE_ROOT)/ace/ATM_Addr.i \ - $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/Process.i \ - $(ACE_ROOT)/ace/SOCK_CODgram.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_CODgram.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ - $(ACE_ROOT)/ace/Process_Semaphore.h \ - $(ACE_ROOT)/ace/Process_Semaphore.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \ - $(ACE_ROOT)/ace/High_Res_Timer.h \ - $(ACE_ROOT)/ace/High_Res_Timer.i \ - $(ACE_ROOT)/ace/Stats.h \ - $(ACE_ROOT)/ace/Basic_Stats.h \ - $(ACE_ROOT)/ace/Basic_Stats.inl \ - $(ACE_ROOT)/ace/Stats.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp deleted file mode 100644 index 43e706c67f2..00000000000 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp +++ /dev/null @@ -1,248 +0,0 @@ -// $Id$ - -#include "receiver.h" -#include "ace/Get_Opt.h" - -typedef ACE_Singleton<Receiver, ACE_Null_Mutex> RECEIVER; -// Create a singleton instance of the Sender. - -static FILE *output_file = 0; -// File handle of the file into which received data is written. - -static const char *output_file_name = "output"; -// File name of the file into which received data is written. - -int -Receiver_StreamEndPoint::get_callback (const char *, - TAO_AV_Callback *&callback) -{ - // Return the receiver application callback to the AVStreams for - // future upcalls. - callback = &this->callback_; - - return 0; -} - -Receiver_Callback::Receiver_Callback (void) - : frame_count_ (0) -{ -} - -int -Receiver_Callback::receive_frame (ACE_Message_Block *frame, - TAO_AV_frame_info *, - const ACE_Addr &) -{ - // - // Upcall from the AVStreams when there is data to be received from - // the sender. - // - ACE_DEBUG ((LM_DEBUG, - "Receiver_Callback::receive_frame for frame %d\n", - ++this->frame_count_)); - - while (frame != 0) - { - // Write the received data to the file. - size_t result = - ACE_OS::fwrite (frame->rd_ptr (), - frame->length (), - 1, - output_file); - - if (result == frame->length ()) - ACE_ERROR_RETURN ((LM_ERROR, - "Receiver_Callback::fwrite failed\n"), - -1); - - frame = frame->cont (); - } - - return 0; -} - -Receiver::Receiver (void) - : mmdevice_ (0) -{ -} - -Receiver::~Receiver (void) -{ -} - - - -int -Receiver::init (int, - char **, - CORBA::Environment &ACE_TRY_ENV) -{ - // Initialize the endpoint strategy with the orb and poa. - int result = - this->reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (), - TAO_AV_CORE::instance ()->poa ()); - if (result != 0) - return result; - - // Register the receiver mmdevice object with the ORB - ACE_NEW_RETURN (this->mmdevice_, - TAO_MMDevice (&this->reactive_strategy_), - -1); - - // Servant Reference Counting to manage lifetime - PortableServer::ServantBase_var safe_mmdevice = - this->mmdevice_; - - CORBA::Object_var mmdevice = - this->mmdevice_->_this (ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - - // Register the mmdevice with the naming service. - CosNaming::Name name (1); - name.length (1); - name [0].id = - CORBA::string_dup ("Receiver"); - - // Initialize the naming services - if (this->naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to initialize " - "the TAO_Naming_Client\n"), - -1); - - // Register the receiver object with the naming server. - this->naming_client_->rebind (name, - mmdevice.in (), - ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - - return 0; -} - -int -parse_args (int argc, - char **argv) -{ - // Parse the command line arguments - ACE_Get_Opt opts (argc, - argv, - "f:"); - - int c; - while ((c = opts ()) != -1) - { - switch (c) - { - case 'f': - output_file_name = opts.optarg; - break; - default: - ACE_ERROR_RETURN ((LM_ERROR, - "Usage: receiver -f filename"), - -1); - } - } - - return 0; -} - -int -main (int argc, - char **argv) -{ - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - // Initialize the ORB first. - CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0, - ACE_TRY_ENV); - ACE_TRY_CHECK; - - CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); - ACE_TRY_CHECK; - - // Get the POA_var object from Object_var. - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); - ACE_TRY_CHECK; - - PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); - ACE_TRY_CHECK; - - mgr->activate (ACE_TRY_ENV); - ACE_TRY_CHECK; - - // Initialize the AVStreams components. - TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); - ACE_TRY_CHECK; - - int result = - parse_args (argc, - argv); - - if (result == -1) - return -1; - - // Make sure we have a valid <output_file> - output_file = ACE_OS::fopen (output_file_name, - "w"); - if (output_file == 0) - ACE_ERROR_RETURN ((LM_DEBUG, - "Cannot open output file %s\n", - output_file_name), - -1); - - else - ACE_DEBUG ((LM_DEBUG, - "File Opened Successfull\n")); - - Receiver receiver; - result = - receiver.init (argc, - argv, - ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (result != 0) - return result; - - orb->run (ACE_TRY_ENV); - ACE_TRY_CHECK; - - // Hack for now.... - ACE_OS::sleep (1); - - orb->destroy (ACE_TRY_ENV); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init"); - return -1; - } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); - - ACE_OS::fclose (output_file); - - return 0; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Singleton <Receiver,ACE_Null_Mutex>; -template class TAO_AV_Endpoint_Reactive_Strategy_B<Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>; -template class TAO_AV_Endpoint_Reactive_Strategy<Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Singleton <Receiver,ACE_Null_Mutex> -#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_B<Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> -#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.dsp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.dsp deleted file mode 100644 index da65848fd15..00000000000 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.dsp +++ /dev/null @@ -1,106 +0,0 @@ -# Microsoft Developer Studio Project File - Name="AVStreams Simple_Two_Stage_With_QoS Receiver" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=AVStreams Simple_Two_Stage_With_QoS Receiver - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "receiver.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "receiver.mak" CFG="AVStreams Simple_Two_Stage_With_QoS Receiver - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "AVStreams Simple_Two_Stage_With_QoS Receiver - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "AVStreams Simple_Two_Stage_With_QoS Receiver - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "AVStreams Simple_Two_Stage_With_QoS Receiver - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\.." /I "..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 tao.lib ace.lib TAO_PortableServer.lib TAO_AV.lib TAO_CosProperty.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_IORTable.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao\IORTable"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "AVStreams Simple_Two_Stage_With_QoS Receiver - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\.." /I "..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_AVd.lib TAO_CosPropertyd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_IORTabled.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao\IORTable"
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF
-
-# Begin Target
-
-# Name "AVStreams Simple_Two_Stage_With_QoS Receiver - Win32 Release"
-# Name "AVStreams Simple_Two_Stage_With_QoS Receiver - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\receiver.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\receiver.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h deleted file mode 100644 index d4e04e5f782..00000000000 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h +++ /dev/null @@ -1,100 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/orbsvcs/tests/AVStreams/Simple -// -// = FILENAME -// receiver.h -// -// = DESCRIPTION -// This application receives data from a AV sender and writes it to -// a file. -// -// = AUTHOR -// Yamuna Krishnamurthy <yamuna@cs.wustl.edu> -// -// ============================================================================ - -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" - - -class Receiver_Callback : public TAO_AV_Callback -{ - // = TITLE - // Application defined callback object. - // - // = DESCRIPTION - // AVStreams calls this class when data shows up from a sender. -public: - - Receiver_Callback (void); - // Constructor. - - // Method that is called when there is data to be received from a - // sender. - int receive_frame (ACE_Message_Block *frame, - TAO_AV_frame_info *frame_info, - const ACE_Addr &peer_address); - -private: - int frame_count_; - // Keeping a count of the incoming frames. -}; - -class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint -{ - // = TITLE - // Application defined stream endpoint object. - // - // = DESCRIPTION - // AVStreams calls this class during connection setup. -public: - // Create a receiver application callback. - int get_callback (const char *flowname, - TAO_AV_Callback *&callback); - -private: - Receiver_Callback callback_; - // Receiver application callback. -}; - -class Receiver -{ - // = TITLE - // Receiver application class. - // - // = DESCRIPTION - // This class receives data from a AV sender and writes it to - // a file. -public: - Receiver (void); - // Constructor - - ~Receiver (void); - // Destructor. - - int init (int argc, - char **argv, - CORBA::Environment &); - // Initialize data components. - -protected: - TAO_Naming_Client naming_client_; - // The Naming Service Client. - - TAO_AV_Endpoint_Reactive_Strategy_B - <Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_; - // The endpoint reactive strategy. - - TAO_MMDevice *mmdevice_; - // Receiver MMDevice. -}; - - - diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl deleted file mode 100755 index 2de9e19a586..00000000000 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl +++ /dev/null @@ -1,67 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib '../../../../../bin'; -use PerlACE::Run_Test; - -# amount of delay between running the servers - -$sleeptime = 2; -$status = 0; - -$nsior = PerlACE::LocalFile ("ns.ior"); -$outfile = PerlACE::LocalFile ("output"); - -unlink $nsior; - -$NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior"); -$SV = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior"); -$CL = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior"); - -print STDERR "Starting Naming Service\n"; - -$NS->Spawn (); - -if (PerlACE::waitforfile_timed ($nsior, 5) == -1) { - print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); - exit 1; -} - -print STDERR "Starting Receiver\n"; - -$SV->Spawn (); - -sleep $sleeptime; - -print STDERR "Starting Sender\n"; - -$sender = $CL->SpawnWaitKill (60); - -if ($sender != 0) { - print STDERR "ERROR: sender returned $sender\n"; - $status = 1; -} - -$receiver = $SV->TerminateWaitKill (5); - -if ($receiver != 0) { - print STDERR "ERROR: receiver returned $receiver\n"; - $status = 1; -} - -$nserver = $NS->TerminateWaitKill (5); - -if ($nserver != 0) { - print STDERR "ERROR: Naming Service returned $nserver\n"; - $status = 1; -} - -unlink $nsior; -unlink $output; - -exit $status; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp deleted file mode 100644 index 0634fd490da..00000000000 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp +++ /dev/null @@ -1,452 +0,0 @@ -// $Id$ - -#include "sender.h" -#include "tao/debug.h" -#include "ace/Get_Opt.h" -#include "ace/High_Res_Timer.h" - -typedef ACE_Singleton<Sender, ACE_Null_Mutex> SENDER; -// Create a singleton instance of the Sender. - -// The time that should lapse between two consecutive frames sent. -ACE_Time_Value inter_frame_time; - -int -Sender_StreamEndPoint::get_callback (const char *, - TAO_AV_Callback *&callback) -{ - // Create and return the sender application callback to AVStreams - // for further upcalls. - callback = &this->callback_; - return 0; -} - -int -Sender_StreamEndPoint::set_protocol_object (const char *, - TAO_AV_Protocol_Object *object) -{ - // Set the sender protocol object corresponding to the transport - // protocol selected. - SENDER::instance ()->protocol_object (object); - return 0; -} - -Sender::Sender (void) - : sender_mmdevice_ (0), - streamctrl_ (0), - frame_count_ (0), - filename_ ("input"), - input_file_ (0), - protocol_ ("QoS_UDP"), - frame_rate_ (1), - mb_ (BUFSIZ), - address_ ("localhost:8000") -{ -} - -void -Sender::protocol_object (TAO_AV_Protocol_Object *object) -{ - // Set the sender protocol object corresponding to the transport - // protocol selected. - this->protocol_object_ = object; -} - -int -Sender::parse_args (int argc, - char **argv) -{ - // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:a:d"); - - int c; - while ((c= opts ()) != -1) - { - switch (c) - { - case 'f': - this->filename_ = opts.optarg; - break; - case 'p': - this->protocol_ = opts.optarg; - break; - case 'r': - this->frame_rate_ = ACE_OS::atoi (opts.optarg); - break; - case 'd': - TAO_debug_level++; - break; - case 'a': - this->address_ = opts.optarg; - break; - default: - ACE_DEBUG ((LM_DEBUG, "Unknown Option\n")); - return -1; - } - } - return 0; -} - -void -Sender::fill_qos (AVStreams::streamQoS &qos) -{ - qos.length (1); - qos [0].QoSType = CORBA::string_dup ("Data_Receiver"); - - qos [0].QoSParams.length (10); - - qos [0].QoSParams [0].property_name = CORBA::string_dup ("Service_Type"); - qos [0].QoSParams [0].property_value <<= (CORBA::Short) ACE_SERVICETYPE_CONTROLLEDLOAD; - - qos [0].QoSParams [1].property_name = CORBA::string_dup ("Token_Rate"); - qos [0].QoSParams [1].property_value <<= (CORBA::ULong) 9200; - - qos [0].QoSParams [2].property_name = CORBA::string_dup ("Token_Bucket_Size"); - qos [0].QoSParams [2].property_value <<= (CORBA::ULong) 9200; - - qos [0].QoSParams [3].property_name = CORBA::string_dup ("Peak_Bandwidth"); - qos [0].QoSParams [3].property_value <<= (CORBA::ULong) 18400; - - qos [0].QoSParams [4].property_name = CORBA::string_dup ("Latency"); - qos [0].QoSParams [4].property_value <<= (CORBA::ULong) 0; - - qos [0].QoSParams [5].property_name = CORBA::string_dup ("Delay_Variation"); - qos [0].QoSParams [5].property_value <<= (CORBA::ULong) 0; - - qos [0].QoSParams [6].property_name = CORBA::string_dup ("Max_SDU_Size"); - qos [0].QoSParams [6].property_value <<= (CORBA::ULong) 368; - - qos [0].QoSParams [7].property_name = CORBA::string_dup ("Minimum_Policed_Size"); - qos [0].QoSParams [7].property_value <<= (CORBA::ULong) 368; - - qos [0].QoSParams [8].property_name = CORBA::string_dup ("TTL"); - qos [0].QoSParams [8].property_value <<= (CORBA::ULong) 25; - - qos [0].QoSParams [9].property_name = CORBA::string_dup ("Priority"); - qos [0].QoSParams [9].property_value <<= (CORBA::ULong) 1; - -} - -// Method to get the object reference of the receiver -int -Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV) -{ - CosNaming::Name name (1); - name.length (1); - name [0].id = - CORBA::string_dup ("Receiver"); - - // Resolve the receiver object reference from the Naming Service - CORBA::Object_var receiver_mmdevice_obj = - this->naming_client_->resolve (name, - ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - - this->receiver_mmdevice_ = - AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in (), - ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - - if (CORBA::is_nil (this->receiver_mmdevice_.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - "Could not resolve Receiver_MMdevice in Naming service <%s>\n"), - -1); - - return 0; -} - -int -Sender::init (int argc, - char **argv, - CORBA::Environment &ACE_TRY_ENV) -{ - // Initialize the endpoint strategy with the orb and poa. - int result = - this->endpoint_strategy_.init (TAO_AV_CORE::instance ()->orb (), - TAO_AV_CORE::instance ()->poa ()); - if (result != 0) - return result; - - // Initialize the naming services - result = - this->naming_client_.init (TAO_AV_CORE::instance ()->orb ()); - if (result != 0) - return result; - - // Parse the command line arguments - result = - this->parse_args (argc, - argv); - if (result != 0) - return result; - - // Open file to read. - this->input_file_ = - ACE_OS::fopen (this->filename_.c_str (), - "r"); - - if (this->input_file_ == 0) - ACE_ERROR_RETURN ((LM_DEBUG, - "Cannot open input file %s\n", - this->filename_.c_str ()), - -1); - else - ACE_DEBUG ((LM_DEBUG, - "File opened successfully\n")); - - // Resolve the object reference of the receiver from the Naming Service. - result = this->bind_to_receiver (ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - - if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) Error binding to the naming service\n"), - -1); - - ACE_INET_Addr addr (this->address_.c_str ()); - - // Create the forward flow specification to describe the flow. - TAO_Forward_FlowSpec_Entry entry ("Data_Receiver", - "IN", - "USER_DEFINED", - "", - this->protocol_.c_str (), - &addr); - - AVStreams::flowSpec flow_spec (1); - flow_spec.length (1); - flow_spec [0] = CORBA::string_dup (entry.entry_to_string ()); - - // Register the sender mmdevice object with the ORB - ACE_NEW_RETURN (this->sender_mmdevice_, - TAO_MMDevice (&this->endpoint_strategy_), - -1); - - // Servant Reference Counting to manage lifetime - PortableServer::ServantBase_var safe_mmdevice = - this->sender_mmdevice_; - - AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - - ACE_NEW_RETURN (this->streamctrl_, - TAO_StreamCtrl, - -1); - - PortableServer::ServantBase_var safe_streamctrl = - this->streamctrl_; - - AVStreams::streamQoS qos; - - this->fill_qos (qos); - - // Bind/Connect the sender and receiver MMDevices. - CORBA::Boolean bind_result = - this->streamctrl_->bind_devs (mmdevice.in (), - this->receiver_mmdevice_.in (), - qos, - flow_spec, - ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - - if (bind_result == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "streamctrl::bind_devs failed\n"), - -1); - - return 0; -} - -// Method to send data at the specified rate -int -Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) -{ - - - // The time between two consecutive frames. - inter_frame_time.set (1 / (double) this->frame_rate_); - - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "Frame Rate = %d / second\n" - "Inter Frame Time = %d (msec)\n", - this->frame_rate_, - inter_frame_time.msec ())); - - ACE_TRY - { - // The time taken for sending a frame and preparing for the next frame - ACE_High_Res_Timer elapsed_timer; - - // Continue to send data till the file is read to the end. - while (1) - { - // Read from the file into a message block. - int n = ACE_OS::fread (this->mb_.wr_ptr (), - 1, - this->mb_.size (), - this->input_file_); - - if (n < 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Sender::pace_data fread failed\n"), - -1); - - if (n == 0) - { - // At end of file break the loop and end the sender. - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG,"Handle_Start:End of file\n")); - break; - } - - this->mb_.wr_ptr (n); - - if (this->frame_count_ > 1) - { - // - // Second frame and beyond - // - - // Stop the timer that was started just before the previous frame was sent. - elapsed_timer.stop (); - - // Get the time elapsed after sending the previous frame. - ACE_Time_Value elapsed_time; - elapsed_timer.elapsed_time (elapsed_time); - - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "Elapsed Time = %d\n", - elapsed_time.msec ())); - - // Check to see if the inter frame time has elapsed. - if (elapsed_time < inter_frame_time) - { - // Inter frame time has not elapsed. - - // Calculate the time to wait before the next frame needs to be sent. - ACE_Time_Value wait_time (inter_frame_time - elapsed_time); - - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "Wait Time = %d\n", - wait_time.msec ())); - - // Run the orb for the wait time so the sender can - // continue other orb requests. - TAO_AV_CORE::instance ()->orb ()->run (wait_time, - ACE_TRY_ENV); - ACE_TRY_CHECK; - } - } - - // Start timer before sending the frame. - elapsed_timer.start (); - - // Send frame. - int result = - this->protocol_object_->send_frame (&this->mb_); - - if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, - "send failed:%p", - "Sender::pace_data send\n"), - -1); - - ACE_DEBUG ((LM_DEBUG, - "Sender::pace_data frame %d was sent succesfully\n", - ++this->frame_count_)); - - // Reset the message block. - this->mb_.reset (); - - } // end while - - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Sender::pace_data Failed\n"); - return -1; - } - ACE_ENDTRY; - return 0; -} - -int -main (int argc, - char **argv) -{ - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0, - ACE_TRY_ENV); - - CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); - ACE_TRY_CHECK; - - // Get the POA_var object from Object_var - PortableServer::POA_var root_poa - = PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); - ACE_TRY_CHECK; - - PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); - ACE_TRY_CHECK; - - mgr->activate (ACE_TRY_ENV); - ACE_TRY_CHECK; - - // Initialize the AV Stream components. - TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); - ACE_TRY_CHECK; - - // Initialize the Sender. - int result = 0; - result = SENDER::instance ()->init (argc, - argv, - ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Sender::init failed\n"), - -1); - - // Start sending data. - result = SENDER::instance ()->pace_data (ACE_TRY_ENV); - ACE_TRY_CHECK; - - orb->run (); - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Sender Failed\n"); - return -1; - } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); - return 0; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Singleton <Sender,ACE_Null_Mutex>; -template class TAO_AV_Endpoint_Reactive_Strategy_A<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>; -template class TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Singleton <Sender,ACE_Null_Mutex> -#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> -#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.dsp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.dsp deleted file mode 100644 index 92288577dd3..00000000000 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.dsp +++ /dev/null @@ -1,106 +0,0 @@ -# Microsoft Developer Studio Project File - Name="AVStreams Simple_Two_Stage_With_QoS Sender" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=AVStreams Simple_Two_Stage_With_QoS Sender - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "sender.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "sender.mak" CFG="AVStreams Simple_Two_Stage_With_QoS Sender - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "AVStreams Simple_Two_Stage_With_QoS Sender - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "AVStreams Simple_Two_Stage_With_QoS Sender - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "AVStreams Simple_Two_Stage_With_QoS Sender - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\.." /I "..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 tao.lib ace.lib TAO_PortableServer.lib TAO_AV.lib TAO_CosProperty.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_IORTable.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao\IORTable"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "AVStreams Simple_Two_Stage_With_QoS Sender - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\.." /I "..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_AVd.lib TAO_CosPropertyd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_IORTabled.lib /nologo /subsystem:console /debug /machine:I386 /out:"sender.exe" /pdbtype:sept /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao\IORTable"
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF
-
-# Begin Target
-
-# Name "AVStreams Simple_Two_Stage_With_QoS Sender - Win32 Release"
-# Name "AVStreams Simple_Two_Stage_With_QoS Sender - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\sender.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\sender.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h deleted file mode 100644 index 9cdbbba4027..00000000000 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h +++ /dev/null @@ -1,124 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS -// -// = FILENAME -// sender.h -// -// = DESCRIPTION -// This application reads data from a file and sends it to s -// receiver through an RSVP enabled stream. -// -// = AUTHOR -// Yamuna Krishnamurthy <yamuna@cs.wustl.edu> -// -// ============================================================================ - -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Protocol_Factory.h" - -class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint -{ - // = TITLE - // Defines a sender stream endpoint. -public: - int get_callback (const char *flowname, - TAO_AV_Callback *&callback); - // Create the application callback and return its handle to - // AVStreams for further application callbacks. - - int set_protocol_object (const char *flowname, - TAO_AV_Protocol_Object *object); - // Set protocol object corresponding to the transport protocol - // chosen. - -protected: - TAO_AV_Callback callback_; - // Application callback. -}; - -typedef TAO_AV_Endpoint_Reactive_Strategy_A - <Sender_StreamEndPoint, - TAO_VDev, - AV_Null_MediaCtrl> - SENDER_ENDPOINT_STRATEGY; - -class Sender -{ - // = TITLE - // Sender Application. - // - // = DESCRIPTION - // Class is responsible for streaming (and pacing) data to a - // receiver. -public: - Sender (void); - // Constructor - - int init (int argc, - char **argv, - CORBA::Environment&); - // Method to initialize the various data components. - - int pace_data (CORBA::Environment &); - // Method to pace and send data from a file. - - void protocol_object (TAO_AV_Protocol_Object *protocol_object); - // Set the protocol object corresponding to the transport protocol chosen. - - void fill_qos (AVStreams::streamQoS &); - // Method to populate the required qos. - -private: - int parse_args (int argc, char **argv); - // Method to parse the command line arguments. - - int bind_to_receiver (CORBA::Environment& ACE_TRY_ENV); - // Method that binds the sender to the receiver. - - SENDER_ENDPOINT_STRATEGY endpoint_strategy_; - // The endpoint strategy used by the sender. - - AVStreams::MMDevice_var receiver_mmdevice_; - // The receiver MMDevice that the sender connects to. - - TAO_MMDevice *sender_mmdevice_; - // The sender MMDevice. - - TAO_StreamCtrl *streamctrl_; - // Stream controller - - int frame_count_; - // Number of frames sent. - - ACE_CString filename_; - // File from which data is read. - - TAO_Naming_Client naming_client_; - // The Naming Service client. - - FILE *input_file_; - // File handle of the file read from. - - ACE_CString protocol_; - // Selected protocol - default is UDP - - int frame_rate_; - // Rate at which the data will be sent. - - ACE_Message_Block mb_; - // Message block into which data is read from a file and then sent. - - TAO_AV_Protocol_Object *protocol_object_; - // Protocol object corresponding to the transport protocol selected. - - ACE_CString address_; - // Destination Address. - -}; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile index 826ff7d1c45..eab33335354 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile @@ -53,7 +53,7 @@ LDFLAGS += -L$(TAO_ROOT)/tao testS_T.h testS_T.cpp testS_T.i client: $(addprefix $(VDIR),$(CLNT_TEST_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_IFR_CLNT_LIBS) $(TAO_DYNAMIC_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_IFR_CLNT_LIBS) $(TAO_DYNAMIC_LIBS) $(TAO_CLNT_LIBS) $(POSTLINK) server: $(addprefix $(VDIR),$(SVR_TEST_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_IFR_CLNT_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK) diff --git a/TAO/orbsvcs/tests/Security/RejectInsecure/authorization_test_i.cpp b/TAO/orbsvcs/tests/Security/RejectInsecure/authorization_test_i.cpp deleted file mode 100644 index d0ab49a1939..00000000000 --- a/TAO/orbsvcs/tests/Security/RejectInsecure/authorization_test_i.cpp +++ /dev/null @@ -1,23 +0,0 @@ -// $Id$ - -#include "authorization_test_i.h" - -#if !defined(__ACE_INLINE__) -#include "authorization_test_i.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(Authorize, authorization_test_i, "$Id$") - -CORBA::Boolean -Authorization_Server_i::check_access (CORBA::Environment &) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return 0; -} - -void -Authorization_Server_i::shutdown (CORBA::Environment&) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - this->orb_->shutdown (0); -} diff --git a/TAO/orbsvcs/tests/Trading/TradingLib.dsp b/TAO/orbsvcs/tests/Trading/TradingLib.dsp index 776512d4b34..9fa80964dd8 100644 --- a/TAO/orbsvcs/tests/Trading/TradingLib.dsp +++ b/TAO/orbsvcs/tests/Trading/TradingLib.dsp @@ -37,7 +37,7 @@ RSC=rc.exe # PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
+# PROP Output_Dir "Release"
# PROP Intermediate_Dir ".\Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
diff --git a/TAO/performance-tests/Latency/Makefile b/TAO/performance-tests/Latency/Makefile index 45a1e776855..b52a504633e 100644 --- a/TAO/performance-tests/Latency/Makefile +++ b/TAO/performance-tests/Latency/Makefile @@ -78,7 +78,7 @@ st_client: $(addprefix $(VDIR),$(ST_CLIENT_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK) deferred_synch_client: $(addprefix $(VDIR),$(DII_CLIENT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) $(TAO_CLNT_LIBS) $(POSTLINK) server: $(addprefix $(VDIR),$(SERVER_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) diff --git a/TAO/performance-tests/Latency/client.conf b/TAO/performance-tests/Latency/client.conf index 1396ec82df2..caebbf11fe5 100644 --- a/TAO/performance-tests/Latency/client.conf +++ b/TAO/performance-tests/Latency/client.conf @@ -1,4 +1,4 @@ # $Id$ # -static Advanced_Resource_Factory "-ORBReactorType select_mt" +static Advanced_Resource_Factory "-ORBReactorType select_mt -ORBFlushingStrategy blocking" static Client_Strategy_Factory "-ORBclientconnectionhandler RW" diff --git a/TAO/performance-tests/Latency/st_client.cpp b/TAO/performance-tests/Latency/st_client.cpp index ae992702e84..830d22f31cb 100644 --- a/TAO/performance-tests/Latency/st_client.cpp +++ b/TAO/performance-tests/Latency/st_client.cpp @@ -166,11 +166,11 @@ main (int argc, char *argv[]) if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i)); - if (period != -1) - { - ACE_Time_Value tv (0, period * 1000); - ACE_OS::sleep (tv); - } + if (period != -1) + { + ACE_Time_Value tv (0, period * 1000); + ACE_OS::sleep (tv); + } } #if defined (USING_QUANTIFY) @@ -205,6 +205,9 @@ main (int argc, char *argv[]) server->shutdown (ACE_TRY_ENV); ACE_TRY_CHECK; } + + orb->destroy (ACE_TRY_ENV); + ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/performance-tests/Makefile b/TAO/performance-tests/Makefile index 5b3327a24f3..c4c8ccd9bd2 100644 --- a/TAO/performance-tests/Makefile +++ b/TAO/performance-tests/Makefile @@ -13,10 +13,10 @@ DIRS = Cubit \ POA \ Pluggable \ + Thruput \ RTCorba \ Latency \ - Callback \ - Throughput + Callback ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO diff --git a/TAO/performance-tests/Makefile.bor b/TAO/performance-tests/Makefile.bor index 2247563d9fc..519d8655ae3 100644 --- a/TAO/performance-tests/Makefile.bor +++ b/TAO/performance-tests/Makefile.bor @@ -10,6 +10,5 @@ DIRS = \ Pluggable \ POA \ RTCorba \ - Throughput !include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/performance-tests/Throughput/README b/TAO/performance-tests/Throughput/README deleted file mode 100644 index 8995dba125d..00000000000 --- a/TAO/performance-tests/Throughput/README +++ /dev/null @@ -1,28 +0,0 @@ -/** - -@page Throughput Performance Test README File - - This test tries to estimate the maximum throughput (int bytes -per second) that the ORB can achieve. The test sends octet sequences -of increasing sizes to a remote consumer, and measures both the time -it takes to receive the data as well as the time required to send it. -A single twoway operation is used to ensure that the data is properly -flushed. - - Please do not extend this test to deal with other data types, -configurations, etc. If you need to just create a new test. In the -past we had multi-purpose tests like that, they were hard to maintain, -and the results were hard to interpret. Furthermore, the test is -purposely simple so its output can be parsed via nightly scripts and -plotted in a graph. More importantly, the throughput for raw data -and the marshaling time are completely different things and should be -measured with different tools. - - To run the test use the run_test.pl script: - -$ ./run_test.pl - - the script returns 0 if the test was successful, and prints -out the performance numbers. - -*/ diff --git a/TAO/performance-tests/Throughput/Receiver.cpp b/TAO/performance-tests/Throughput/Receiver.cpp deleted file mode 100644 index da9f6df9b71..00000000000 --- a/TAO/performance-tests/Throughput/Receiver.cpp +++ /dev/null @@ -1,99 +0,0 @@ -// -// $Id$ -// - -#include "Receiver.h" -#include "ace/High_Res_Timer.h" - -ACE_RCSID(Throughput, Receiver, "$Id$") - -Receiver::Receiver (void) - : start_time_ (0) - , message_count_ (0) - , byte_count_ (0) - , last_message_time_ (0) - , last_message_id_ (0) -{ -} - -void -Receiver::receive_data (const Test::Message &the_message, - CORBA::Environment &) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - ACE_hrtime_t now = ACE_OS::gethrtime (); - if (this->message_count_ == 0) - { - this->start_time_ = now; - } - else - { - if (this->last_message_id_ > the_message.message_id) - { - ACE_ERROR ((LM_ERROR, - "ERROR: (%P|%t) Receiver::receive_data, " - "message out of sequence %d / %d\n", - the_message.message_id, - this->last_message_id_)); - return; - } - this->last_message_id_ = the_message.message_id; - } - this->message_count_++; - this->byte_count_ += the_message.the_payload.length (); - this->last_message_time_ = now; -} - -void -Receiver::done (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - if (this->message_count_ == 0) - { - ACE_ERROR ((LM_ERROR, - "ERROR: (%P|%t) Receiver::done, " - "no messages received\n")); - } - else - { - ACE_UINT32 gsf = - ACE_High_Res_Timer::global_scale_factor (); - - ACE_hrtime_t elapsed_time = - this->last_message_time_ - this->start_time_; - - // convert to microseconds -#if !defined ACE_LACKS_LONGLONG_T - ACE_UINT32 usecs = ACE_UINT32(elapsed_time / gsf); -#else /* ! ACE_LACKS_LONGLONG_T */ - ACE_UINT32 usecs = elapsed_time / gsf; -#endif /* ! ACE_LACKS_LONGLONG_T */ - - if (usecs != 0) - { - double bytes = - (1000000.0 * this->byte_count_) / usecs; - double kbytes = bytes / 1024; - double mbytes = kbytes / 1024; - double mbits = bytes * 8 / 10000000; - - ACE_DEBUG ((LM_DEBUG, - "Receiver %f (bytes/sec), %f (Kb/sec)\n" - "Receiver %f (Mb/sec), %f Mbits\n", - bytes, kbytes, - mbytes, mbits)); - } - } - - ACE_TRY - { - PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV); - ACE_TRY_CHECK; - PortableServer::ObjectId_var oid = - poa->servant_to_id (this, ACE_TRY_ENV); - ACE_TRY_CHECK; - poa->deactivate_object (oid.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - } - ACE_CATCHANY {} ACE_ENDTRY; -} diff --git a/TAO/performance-tests/Throughput/Receiver.h b/TAO/performance-tests/Throughput/Receiver.h deleted file mode 100644 index d3f74c51d74..00000000000 --- a/TAO/performance-tests/Throughput/Receiver.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// $Id$ -// - -#ifndef THROUGHPUT_RECEIVER_H -#define THROUGHPUT_RECEIVER_H -#include "ace/pre.h" - -#include "TestS.h" - -#if defined (_MSC_VER) -# if (_MSC_VER >= 1200) -# pragma warning(push) -# endif /* _MSC_VER >= 1200 */ -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - -/// Implement the Test::Receiver interface -class Receiver - : public virtual POA_Test::Receiver - , public virtual PortableServer::RefCountServantBase -{ -public: - /// Constructor - Receiver (void); - - // = The skeleton methods - virtual void receive_data (const Test::Message &message, - CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void done (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)); - -private: - /// The timestamp for the first message - ACE_hrtime_t start_time_; - - /// The number of messages received - size_t message_count_; - - /// The number of bytes received - size_t byte_count_; - - /// The timestamp for the last message - ACE_hrtime_t last_message_time_; - - /// The id for the last message - CORBA::ULong last_message_id_; -}; - -#if defined(_MSC_VER) && (_MSC_VER >= 1200) -# pragma warning(pop) -#endif /* _MSC_VER */ - -#include "ace/post.h" -#endif /* THROUGHPUT_RECEIVER_H */ diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.cpp b/TAO/performance-tests/Throughput/Receiver_Factory.cpp deleted file mode 100644 index 680c542f853..00000000000 --- a/TAO/performance-tests/Throughput/Receiver_Factory.cpp +++ /dev/null @@ -1,33 +0,0 @@ -// -// $Id$ -// -#include "Receiver_Factory.h" -#include "Receiver.h" - -ACE_RCSID(Throughput, Receiver_Factory, "$Id$") - -Receiver_Factory::Receiver_Factory (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)) -{ -} - -Test::Receiver_ptr -Receiver_Factory::create_receiver (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - Receiver *receiver_impl; - ACE_NEW_THROW_EX (receiver_impl, - Receiver, - CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (Test::Receiver::_nil ()); - PortableServer::ServantBase_var transfer_ownership(receiver_impl); - - return receiver_impl->_this (ACE_TRY_ENV); -} - -void -Receiver_Factory::shutdown (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - this->orb_->shutdown (0, ACE_TRY_ENV); -} diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.h b/TAO/performance-tests/Throughput/Receiver_Factory.h deleted file mode 100644 index 6d37f71e9fe..00000000000 --- a/TAO/performance-tests/Throughput/Receiver_Factory.h +++ /dev/null @@ -1,44 +0,0 @@ -// -// $Id$ -// - -#ifndef THROUGHPUT_RECEIVER_FACTORY_H -#define THROUGHPUT_RECEIVER_FACTORY_H -#include "ace/pre.h" - -#include "TestS.h" - -#if defined (_MSC_VER) -# if (_MSC_VER >= 1200) -# pragma warning(push) -# endif /* _MSC_VER >= 1200 */ -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - -/// Implement the Test::Receiver_Factory interface -class Receiver_Factory - : public virtual POA_Test::Receiver_Factory - , public virtual PortableServer::RefCountServantBase -{ -public: - /// Constructor - Receiver_Factory (CORBA::ORB_ptr orb); - - // = The skeleton methods - virtual Test::Receiver_ptr create_receiver (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)); - -private: - /// Keep a reference to the ORB in order to shutdown the app - CORBA::ORB_var orb_; -}; - -#if defined(_MSC_VER) && (_MSC_VER >= 1200) -# pragma warning(pop) -#endif /* _MSC_VER */ - -#include "ace/post.h" -#endif /* THROUGHPUT_RECEIVER_FACTORY_H */ diff --git a/TAO/performance-tests/Throughput/Test.idl b/TAO/performance-tests/Throughput/Test.idl deleted file mode 100644 index 08e67ceed46..00000000000 --- a/TAO/performance-tests/Throughput/Test.idl +++ /dev/null @@ -1,33 +0,0 @@ -// -// $Id$ -// - -module Test -{ - /// The data payload - typedef sequence<octet> Payload; - struct Message { - unsigned long message_id; - Payload the_payload; - }; - - /// Implement a simple interface to receive a lot of data - interface Receiver - { - /// Receive a big payload - oneway void receive_data (in Message the_message); - - /// All the data has been sent, print out performance data - void done (); - }; - - /// Implement a factory to create Receivers - interface Receiver_Factory - { - /// Create a new receiver - Receiver create_receiver (); - - /// Shutdown the application - oneway void shutdown (); - }; -}; diff --git a/TAO/performance-tests/Throughput/client.cpp b/TAO/performance-tests/Throughput/client.cpp deleted file mode 100644 index 3aa2d17e251..00000000000 --- a/TAO/performance-tests/Throughput/client.cpp +++ /dev/null @@ -1,158 +0,0 @@ -// $Id$ - -#include "TestC.h" -#include "ace/High_Res_Timer.h" -#include "ace/Get_Opt.h" - -ACE_RCSID(Throughput, client, "$Id$") - -const char *ior = "file://test.ior"; -int message_size = 2048; -int message_count = 10 * 1024; -int test_runs = 6; -int do_shutdown = 0; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "k:b:i:n:x"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'k': - ior = get_opts.optarg; - break; - - case 'b': - message_size = ACE_OS::atoi (get_opts.optarg); - break; - - case 'i': - message_count = ACE_OS::atoi (get_opts.optarg); - break; - - case 'n': - test_runs = ACE_OS::atoi (get_opts.optarg); - break; - - case 'x': - do_shutdown = 1; - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-k <ior> " - "-b <message_size> " - "-i <message_count> " - "-n <test_repetitions> " - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - CORBA::Object_var tmp = - orb->string_to_object(ior, ACE_TRY_ENV); - ACE_TRY_CHECK; - - Test::Receiver_Factory_var receiver_factory = - Test::Receiver_Factory::_narrow(tmp.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (CORBA::is_nil (receiver_factory.in ())) - { - ACE_ERROR_RETURN ((LM_DEBUG, - "Nil receiver factory reference <%s>\n", - ior), - 1); - } - - ACE_UINT32 gsf = - ACE_High_Res_Timer::global_scale_factor (); - - Test::Message message; - - for (int j = 0; j != test_runs; ++j) - { - ACE_DEBUG ((LM_DEBUG, - "Testing with %d bytes per message\n", - message_size)); - - message.the_payload.length (message_size); - - Test::Receiver_var receiver = - receiver_factory->create_receiver (ACE_TRY_ENV); - ACE_TRY_CHECK; - - ACE_hrtime_t start = ACE_OS::gethrtime (); - for (int i = 0; i != message_count; ++i) - { - message.message_id = i; - receiver->receive_data (message, ACE_TRY_ENV); - ACE_TRY_CHECK; - } - - receiver->done (ACE_TRY_ENV); - ACE_TRY_CHECK; - ACE_hrtime_t elapsed_time = ACE_OS::gethrtime () - start; - - // convert to microseconds -#if !defined ACE_LACKS_LONGLONG_T - ACE_UINT32 usecs = ACE_UINT32(elapsed_time / gsf); -#else /* ! ACE_LACKS_LONGLONG_T */ - ACE_UINT32 usecs = elapsed_time / gsf; -#endif /* ! ACE_LACKS_LONGLONG_T */ - - double bytes = - (1000000.0 * message_count * message_size) / usecs; - double kbytes = bytes / 1024; - double mbytes = kbytes / 1024; - double mbits = bytes * 8 / 10000000; - - ACE_DEBUG ((LM_DEBUG, - "Sender[%d] %f (bytes/sec), " - "%f (Kb/sec)\n" - "Sender[%d] %f (Mb/sec), %f Mbits\n", - message_size, bytes, kbytes, - message_size, mbytes, mbits)); - - message_size *= 2; - } - - if (do_shutdown) - { - receiver_factory->shutdown (ACE_TRY_ENV); - ACE_TRY_CHECK; - } - - orb->destroy (ACE_TRY_ENV); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/performance-tests/Throughput/run_test.pl b/TAO/performance-tests/Throughput/run_test.pl deleted file mode 100755 index 3a548abb8f5..00000000000 --- a/TAO/performance-tests/Throughput/run_test.pl +++ /dev/null @@ -1,49 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib "../../../bin"; -use PerlACE::Run_Test; - -$status = 0; -$iorfile = PerlACE::LocalFile ("test.ior"); -$svc_conf = PerlACE::LocalFile ("svc.conf"); - -print STDERR "================ Throughput test\n"; - -unlink $iorfile; - -$SV = new PerlACE::Process ("server", - " -ORBSvcConf $svc_conf"); - -$CL = new PerlACE::Process ("client", - " -ORBSvcConf $svc_conf -ORBNoDelay 1" - . " -x"); - -$SV->Spawn (); - -if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); - exit 1; -} - -$client = $CL->SpawnWaitKill (6000); -$server = $SV->WaitKill (10); - -unlink $iorfile; - -if ($client != 0) { - print STDERR "ERROR: client returned $client\n"; - $status = 1; -} - -if ($server != 0) { - print STDERR "ERROR: server returned $server\n"; - $status = 1; -} - -exit $status; diff --git a/TAO/performance-tests/Throughput/svc.conf b/TAO/performance-tests/Throughput/svc.conf deleted file mode 100644 index aa3f18e54f9..00000000000 --- a/TAO/performance-tests/Throughput/svc.conf +++ /dev/null @@ -1,8 +0,0 @@ -# $Id$ -# -# Please see $TAO_ROOT/docs/Options.html for details on these options. -# - -static Resource_Factory "-ORBresources global -ORBInputCDRAllocator null -ORBReactorType select_st -ORBReactorMaskSignals 0 -ORBConnectionCacheLock null" -static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW" -static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0" diff --git a/TAO/performance-tests/Thruput/Makefile b/TAO/performance-tests/Thruput/Makefile new file mode 100644 index 00000000000..94771f24151 --- /dev/null +++ b/TAO/performance-tests/Thruput/Makefile @@ -0,0 +1,30 @@ +#---------------------------------------------------------------------------- +# $Id$ +# +# Makefile for the TAO thruput tests +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +DIRS = TAO + +# DIRS = CORBAplus \ +# Orbix \ +# TAO + +ifndef TAO_ROOT + TAO_ROOT = $(ACE_ROOT)/TAO +endif + +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(TAO_ROOT)/rules.tao.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU diff --git a/TAO/performance-tests/Throughput/Makefile b/TAO/performance-tests/Thruput/TAO/Makefile index 598e25845a6..0ddb9132cea 100644 --- a/TAO/performance-tests/Throughput/Makefile +++ b/TAO/performance-tests/Thruput/TAO/Makefile @@ -1,31 +1,32 @@ #---------------------------------------------------------------------------- +# $Id$ # -# $Id$ -# +# Top-level Makefile for the TAO_TTCP benchmark #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Local macros +# Local macros #---------------------------------------------------------------------------- ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO +IDL_FILES = ttcp +IDL_SRC = ttcpC.cpp ttcpS.cpp +PROG_SRCS = $(IDL_SRC) client.cpp ttcp_i.cpp server.cpp utils.cpp tmplinst.cpp + +LSRC = $(PROG_SRCS) -IDL_FILES = Test -IDL_SRC = TestC.cpp TestS.cpp -BIN = server client +TTCP_CLIENT_OBJS = ttcpC.o client.o utils.o tmplinst.o -SRC = $(addsuffix .cpp, $(BIN) Receiver Receiver_Factory) $(IDL_SRC) +TTCP_SERVER_OBJS = ttcpC.o ttcpS.o server.o ttcp_i.o utils.o tmplinst.o -CLIENT_OBJS = client.o TestC.o -SERVER_OBJS = server.o TestC.o TestS.o Receiver_Factory.o Receiver.o +BIN = client server TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- -# Include macros and targets +# Include macros and targets #---------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU @@ -37,28 +38,28 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU include $(TAO_ROOT)/taoconfig.mk #---------------------------------------------------------------------------- -# Local targets +# Local modifications to variables imported by includes above. #---------------------------------------------------------------------------- -.PRECIOUS: $(foreach ext, $(IDL_EXT), Test$(ext)) +LDFLAGS += -L$(TAO_ROOT)/tao +CPPFLAGS += -I$(TAO_ROOT) -server: $(addprefix $(VDIR),$(SERVER_OBJS)) +server: $(addprefix $(VDIR),$(TTCP_SERVER_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) -client: $(addprefix $(VDIR),$(CLIENT_OBJS)) +client: $(addprefix $(VDIR),$(TTCP_CLIENT_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK) realclean: clean - -$(RM) $(foreach ext, $(IDL_EXT), Test$(ext)) + -$(RM) ttcpC.* ttcpS.* ttcpS_T.* # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Receiver_Factory.h \ - $(ACE_ROOT)/ace/pre.h \ - TestS.h TestC.h \ +.obj/ttcpC.o .obj/ttcpC.so .shobj/ttcpC.o .shobj/ttcpC.so: ttcpC.cpp ttcpC.h \ $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -199,7 +200,6 @@ realclean: clean $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -209,6 +209,25 @@ realclean: clean $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -216,13 +235,38 @@ realclean: clean $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + ttcpC.i $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ @@ -231,9 +275,249 @@ realclean: clean $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/RequestInfo_Util.h + +.obj/ttcpS.o .obj/ttcpS.so .shobj/ttcpS.o .shobj/ttcpS.so: ttcpS.cpp ttcpS.h ttcpC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -241,15 +525,25 @@ realclean: clean $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - TestC.i \ + ttcpC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ @@ -265,11 +559,142 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - TestS_T.h TestS_T.i TestS_T.cpp TestS.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + ttcpS_T.h ttcpS_T.i ttcpS_T.cpp ttcpS.i \ + $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ + $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ + $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ + $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ + $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ + $(ACE_ROOT)/ace/Dynamic_Service.i \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/RequestInfo_Util.h -.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp TestC.h \ +.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp ttcpC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ @@ -412,7 +837,6 @@ realclean: clean $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -422,31 +846,13 @@ realclean: clean $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -454,22 +860,40 @@ realclean: clean $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - TestC.i \ + ttcpC.i ttcp_decl.h \ + $(ACE_ROOT)/ace/Profile_Timer.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ + $(ACE_ROOT)/ace/Profile_Timer.i \ + $(TAO_ROOT)/tao/debug.h \ + $(ACE_ROOT)/ace/Read_Buffer.h \ + $(ACE_ROOT)/ace/Read_Buffer.i \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i -.obj/Receiver.o .obj/Receiver.so .shobj/Receiver.o .shobj/Receiver.so: Receiver.cpp Receiver.h \ +.obj/ttcp_i.o .obj/ttcp_i.so .shobj/ttcp_i.o .shobj/ttcp_i.so: ttcp_i.cpp \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/pre.h \ - TestS.h TestC.h \ - $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -478,13 +902,6 @@ realclean: clean $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ @@ -495,6 +912,8 @@ realclean: clean $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -507,7 +926,11 @@ realclean: clean $(ACE_ROOT)/ace/Init_ACE.i \ $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/ACE.i ttcp_i.h ttcpS.h \ + ttcpC.h $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ @@ -610,7 +1033,6 @@ realclean: clean $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -620,31 +1042,13 @@ realclean: clean $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -652,15 +1056,25 @@ realclean: clean $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - TestC.i \ + ttcpC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ @@ -676,14 +1090,18 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - TestS_T.h TestS_T.i TestS_T.cpp TestS.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + ttcpS_T.h ttcpS_T.i ttcpS_T.cpp ttcpS.i ttcp_decl.h \ + $(ACE_ROOT)/ace/Profile_Timer.h \ + $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/High_Res_Timer.h \ - $(ACE_ROOT)/ace/High_Res_Timer.i + $(ACE_ROOT)/ace/High_Res_Timer.i \ + $(ACE_ROOT)/ace/Profile_Timer.i -.obj/Receiver_Factory.o .obj/Receiver_Factory.so .shobj/Receiver_Factory.o .shobj/Receiver_Factory.so: Receiver_Factory.cpp Receiver_Factory.h \ - $(ACE_ROOT)/ace/pre.h \ - TestS.h TestC.h \ +.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp ttcp_i.h ttcpS.h ttcpC.h \ $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -824,7 +1242,6 @@ realclean: clean $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -834,31 +1251,13 @@ realclean: clean $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -866,15 +1265,25 @@ realclean: clean $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - TestC.i \ + ttcpC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ @@ -890,9 +1299,14 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - TestS_T.h TestS_T.i TestS_T.cpp TestS.i Receiver.h + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + ttcpS_T.h ttcpS_T.i ttcpS_T.cpp ttcpS.i \ + $(TAO_ROOT)/tao/debug.h \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i -.obj/TestC.o .obj/TestC.so .shobj/TestC.o .shobj/TestC.so: TestC.cpp TestC.h \ +.obj/utils.o .obj/utils.so .shobj/utils.o .shobj/utils.so: utils.cpp ttcpC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ @@ -1035,7 +1449,6 @@ realclean: clean $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -1045,31 +1458,13 @@ realclean: clean $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -1077,127 +1472,32 @@ realclean: clean $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - TestC.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/Pluggable.i \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/Profile.h \ - $(TAO_ROOT)/tao/Tagged_Components.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.i \ - $(TAO_ROOT)/tao/Tagged_Components.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Profile.i \ - $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/Policy_Manager.i \ - $(TAO_ROOT)/tao/Resource_Factory.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(TAO_ROOT)/tao/Protocol_Factory.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(TAO_ROOT)/tao/Parser_Registry.h \ - $(TAO_ROOT)/tao/Parser_Registry.i \ - $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ - $(TAO_ROOT)/tao/Endpoint.h \ - $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ - $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ - $(TAO_ROOT)/tao/Object_Ref_Table.h \ - $(TAO_ROOT)/tao/RT_Policy_i.h \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/RT_Policy_i.i \ - $(TAO_ROOT)/tao/Protocols_Hooks.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/TAOC.h \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ - $(TAO_ROOT)/tao/Priority_Mapping.h \ - $(TAO_ROOT)/tao/Priority_Mapping.i \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ - $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/tao/operation_details.h \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/target_specification.h \ - $(TAO_ROOT)/tao/target_specification.i \ - $(TAO_ROOT)/tao/operation_details.i \ - $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ - $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ - $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - $(TAO_ROOT)/tao/RequestInfo_Util.h + ttcpC.i ttcp_decl.h \ + $(ACE_ROOT)/ace/Profile_Timer.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ + $(ACE_ROOT)/ace/Profile_Timer.i -.obj/TestS.o .obj/TestS.so .shobj/TestS.o .shobj/TestS.so: TestS.cpp TestS.h TestC.h \ +.obj/tmplinst.o .obj/tmplinst.so .shobj/tmplinst.o .shobj/tmplinst.so: tmplinst.cpp ttcpC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ @@ -1340,7 +1640,6 @@ realclean: clean $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -1350,31 +1649,13 @@ realclean: clean $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -1382,154 +1663,24 @@ realclean: clean $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - TestC.i \ - $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ - $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - TestS_T.h TestS_T.i TestS_T.cpp TestS.i \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ - $(ACE_ROOT)/ace/Map.h \ - $(ACE_ROOT)/ace/Map_T.h \ - $(ACE_ROOT)/ace/Pair.h \ - $(ACE_ROOT)/ace/Pair_T.h \ - $(ACE_ROOT)/ace/Pair_T.i \ - $(ACE_ROOT)/ace/Pair_T.cpp \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Active_Map_Manager.h \ - $(ACE_ROOT)/ace/Active_Map_Manager.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ - $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ - $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ - $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ - $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/TAO_Server_Request.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/Policy_Manager.i \ - $(TAO_ROOT)/tao/Resource_Factory.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/Pluggable.i \ - $(TAO_ROOT)/tao/Protocol_Factory.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ - $(TAO_ROOT)/tao/Parser_Registry.h \ - $(TAO_ROOT)/tao/Parser_Registry.i \ - $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ - $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ - $(TAO_ROOT)/tao/Endpoint.h \ - $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ - $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ - $(TAO_ROOT)/tao/Object_Ref_Table.h \ - $(TAO_ROOT)/tao/RT_Policy_i.h \ - $(TAO_ROOT)/tao/RT_Policy_i.i \ - $(TAO_ROOT)/tao/Protocols_Hooks.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/Profile.h \ - $(TAO_ROOT)/tao/Tagged_Components.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.i \ - $(TAO_ROOT)/tao/Tagged_Components.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Profile.i \ - $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ - $(TAO_ROOT)/tao/RequestInfo_Util.h \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ - $(ACE_ROOT)/ace/Dynamic_Service.i \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp + ttcpC.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/performance-tests/Thruput/TAO/README b/TAO/performance-tests/Thruput/TAO/README new file mode 100644 index 00000000000..a28a4046eb6 --- /dev/null +++ b/TAO/performance-tests/Thruput/TAO/README @@ -0,0 +1,63 @@ + TAO_TTCP Benchmark README file + +This directory contains a modified version of the TTCP benchmark that +uses the TAO ORB. TAO_TTCP is used to measure the throughput of TAO +for sending different data types. This code tests sequences of short, +long, octet, char, double, and richly-typed data such as a struct. + +Organization +------------ + +client.cpp Client main program +server.cpp Server main program +ttcpC.cpp Client side stubs +ttcpS.cpp Server side skeletons +ttcpC.h Header file for stubs +ttcpS.h Header file for the skeletons +ttcp_i.cpp Implementaion of the interface +ttcp_i.h Header for the implementation +utils.cpp Utilities to calculate throughput +ttcp_decls.h Common declarations + +Results +------- +Throughput results are stored under the results directory. If testing +for REMOTE transfers, use the ./results/REMOTE directory. + +Running the tests +----------------- +Three scripts are provided + +(1) run_server : runs the server. Be sure to change the host name +(2) run_client : runs tests for various data types +(3) run_test : called by run_client + +Three perl script are provided (same scripts just ported to perl) + +(1) new_server_test : runs the server. + +(2) new_client_test : runs the client for various data types. command +options are a directory (./results/REMOTE/XXX) to store the results and a +second option that is the file permissions to set for the directory that +the results are stored in; defaults to 755. + +(3) new_run_test : called by new_client_test + +Compiling --------- + +Type make + +To provide for 2way tests (no data is sent in the reverse +direction. Sender blocks for a minimal ACK), comment out the -DONEWAY +flag from the CPPFLAGS + +Aniruddha Gokhale +gokhale@cs.wustl.edu + + + + + + + + diff --git a/TAO/performance-tests/Thruput/TAO/client.cpp b/TAO/performance-tests/Thruput/TAO/client.cpp new file mode 100644 index 00000000000..84cc206218f --- /dev/null +++ b/TAO/performance-tests/Thruput/TAO/client.cpp @@ -0,0 +1,312 @@ +// $Id$ + +// ============================================================================ +// +// = TAO tests +// Throughput measurement using the TTCP benchmark adapted to work +// using TAO +// +// = FILENAME +// client.cpp +// +// Main program for the client +// +// = AUTHOR +// Aniruddha Gokhale +// +// ============================================================================ + +#include "ttcpC.h" +#include "ttcp_decl.h" + +#include "tao/debug.h" + +#include "ace/ACE.h" +#include "ace/Read_Buffer.h" +#include "ace/Get_Opt.h" + +ACE_RCSID(TAO, client, "$Id$") + +int print_usage (void); + +char * read_ior (char *filename); +char Usage[] = + "Usage: client [-options] \n" + "Common options:\n" + "-i <ior> Object reference string that the server outputs when started\n" + "-f ior_file\n" + "-l ## length of bufs read from or written to network (default 8192)\n" + "-v verbose: print more statistics\n" + "-d ## debug level\n" + "-m X format for rate: k,K = kilo{bit,byte}; m,M = mega; g,G = giga\n" + "-L ## Output file name to store results\n" + "-S ## Total Data Size to be sent\n" + "-q <type> Send Sequence: Enumeration for various data types:\n" + " s = short, l = long, d = double, c = char\n" + " o = octet, S = BinStruct \n"; + +CORBA::Long trans = 1; // we are a client - used for debugging purposes +CORBA::Long buflen = 8 * 1024; // length of buffer, default 8,192 bytes +CORBA::Char *buf; // ptr to dynamic buffer +CORBA::Long nbuf; // number of buffers to send in sinkmode +CORBA::Short port = TAO_DEFAULT_SERVER_PORT; // TCP port number +const char* host = "localhost"; // ptr to name of host +CORBA::Long verbose = 0; // 0=print basic info, 1=print cpu + // rate, proc resource usage. +CORBA::Char fmt = 'K'; // output + // format:k=kilobits,K=kilobytes, m = megabits, + // M = megabytes, g = gigabits, G = gigabytes +char* title = 0; // title of file to gather statistics +char stats[128]; // gathering the statistics +unsigned long srcDataSize; // Total amount of source data +unsigned long nbytes; // bytes on net +unsigned long numCalls; // # of I/O system calls +double cput, realt; // user, real time (seconds) +unsigned long dt; // data type +char * ior = 0; + +// declare variables for various message types +ttcp_sequence::ShortSeq *sseq; +ttcp_sequence::LongSeq *lseq; +ttcp_sequence::OctetSeq *oseq; +ttcp_sequence::DoubleSeq *dseq; +ttcp_sequence::CharSeq *cseq; +ttcp_sequence::StructSeq *Sseq; + +int +main (int argc, char *argv[]) +{ + + int c; + CORBA::ORB_ptr orb_ptr; // underlying ORB + // server + CORBA::Object_ptr objref = CORBA::Object::_nil(); // object reference + ttcp_sequence_ptr ttcp_seq = 0; // obj reference to TTCP object + + // parse the arguments + ACE_Get_Opt get_opt (argc, argv, "d:vm:l:L:S:q:i:f:"); + TAO_debug_level = 0; + while ((c = get_opt ()) != -1) + { + switch (c) + { + case 'i': + ior = ACE_OS::strdup (get_opt.optarg); + break; + case 'L': + title = ACE_OS::strdup (get_opt.optarg); + break; + case 'd': + TAO_debug_level = ACE_OS::atoi (get_opt.optarg); + if (TAO_debug_level > 10) + TAO_debug_level = 10; + break; + case 'l': + buflen = ACE_OS::atoi (get_opt.optarg); + break; + case 'v': + verbose = 1; + break; + case 'm': + fmt = *get_opt.optarg; + break; + case 'S': /* total source data to send. */ + srcDataSize = ACE_OS::atoi (get_opt.optarg); + break; + case 'q': /* Send sequence of desired data type */ + switch(*get_opt.optarg){ + case 's': + dt = SEND_SHORT; + break; + case 'l': + dt = SEND_LONG; + break; + case 'd': + dt = SEND_DOUBLE; + break; + case 'c': + dt = SEND_CHAR; + break; + case 'o': + dt = SEND_OCTET; + break; + case 'S': + dt = SEND_STRUCT; + break; + case 'C': + dt = SEND_COMPOSITE; + break; + } + break; + case 'f': + ior = read_ior (get_opt.optarg); + break; + default: + return print_usage (); + } + } + + ACE_DECLARE_NEW_CORBA_ENV; + ACE_TRY + { + // + // Transmitter + // + + // get a handle to the ORB + orb_ptr = CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV); + ACE_TRY_CHECK; + + ACE_DEBUG ((LM_DEBUG, "Read IOR string as: %s\n" , ior)); + + // retrieve an object reference out of the stringified IOR + objref = orb_ptr->string_to_object (ior, ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (!CORBA::is_nil (objref)) + { + // if it is a valid obj ref, narrow it to a ttcp_sequence + // CORBA object + ttcp_seq = ttcp_sequence::_narrow (objref, ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (!CORBA::is_nil (ttcp_seq)) + { + // the number of iterations is based on the total data size and the + // individual buffer size sent + nbuf = srcDataSize/buflen; + ACE_DEBUG ((LM_DEBUG, "data size = %d, buflen = %d, nbuf = %d\n", + srcDataSize, buflen, nbuf)); + + // + // Prepare the Message to be sent + // + + + // first allocate a buffer of the desired size and alignment + errno = 0; + if ((buf = (char *) ACE_OS::malloc (buflen)) == (char *) NULL) + err ("malloc"); + + // fill the buffer with the data type to be sent + FillPattern (buf, buflen, dt); + + // + // Start the timers on the client and server sides + // + + prep_timer (); // start our time + // ask the server to start its timer + ttcp_seq->start_timer (ACE_TRY_ENV); + ACE_TRY_CHECK; + +#if defined (ACE_HAS_QUANTIFY) + /* start recording quantify data from here */ + quantify_clear_data (); + quantify_start_recording_data (); +#endif /* ACE_HAS_QUANTIFY */ + // send the same buffer nbuf times + while (nbuf--) + { + switch (dt) + { + case SEND_SHORT: + ttcp_seq->sendShortSeq (*sseq, ACE_TRY_ENV); + ACE_TRY_CHECK; + nbytes += sseq->length () * sizeof (CORBA::Short); + break; + case SEND_LONG: + ttcp_seq->sendLongSeq (*lseq, ACE_TRY_ENV); + ACE_TRY_CHECK; + nbytes += lseq->length () * sizeof (CORBA::Long); + break; + case SEND_OCTET: + ttcp_seq->sendOctetSeq (*oseq, ACE_TRY_ENV); + ACE_TRY_CHECK; + nbytes += oseq->length () * sizeof (CORBA::Octet); + break; + case SEND_DOUBLE: + ttcp_seq->sendDoubleSeq (*dseq, ACE_TRY_ENV); + ACE_TRY_CHECK; + nbytes += dseq->length () * sizeof (CORBA::Double); + break; + case SEND_CHAR: + ttcp_seq->sendCharSeq (*cseq, ACE_TRY_ENV); + ACE_TRY_CHECK; + nbytes += cseq->length () * sizeof (CORBA::Char); + break; + case SEND_STRUCT: + ttcp_seq->sendStructSeq (*Sseq, ACE_TRY_ENV); + ACE_TRY_CHECK; + nbytes += Sseq->length () * sizeof (BinStruct); + break; + } + numCalls++; // nbytes and numCalls are used in the thruput + // measurement + } + } +#if defined (ACE_HAS_QUANTIFY) + quantify_stop_recording_data(); +#endif /* ACE_HAS_QUANTIFY */ + // + // Stop the timer + // + // stop the timer on the server side + ttcp_seq->stop_timer (ACE_TRY_ENV); + ACE_TRY_CHECK; + + // stop our timer + (void) read_timer (stats, sizeof (stats)); + + // print results + PrintStats(); + } + + CORBA::release (ttcp_seq); + CORBA::release (objref); + CORBA::release (orb_ptr); + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client"); + return -1; + } + ACE_ENDTRY; + ACE_CHECK_RETURN (-1); + + return 0; +} + +int print_usage (void) +{ + ACE_ERROR ((LM_ERROR, "Usage error\n")); + ACE_ERROR ((LM_ERROR, "%s\n", Usage)); + return -1; +} + +char* +read_ior (char *filename) +{ + ACE_HANDLE f_handle; + // Open the file for reading. + f_handle = ACE_OS::open (filename, O_RDONLY); + + if (f_handle == ACE_INVALID_HANDLE) + ACE_ERROR_RETURN ((LM_ERROR, + "Unable to open %s for reading: %p\n", + filename?filename:"(null filename)"), + 0); + ACE_Read_Buffer ior_buffer (f_handle); + char *data = ior_buffer.read (); + + if (data == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Unable to allocate memory to read ior: %p\n"), + 0); + + char *ior = 0; + ior = ACE_OS::strdup (data); + ior_buffer.alloc ()->free (data); + + return ior; +} diff --git a/TAO/performance-tests/Thruput/TAO/new_client_test b/TAO/performance-tests/Thruput/TAO/new_client_test new file mode 100755 index 00000000000..2e87ccf2df3 --- /dev/null +++ b/TAO/performance-tests/Thruput/TAO/new_client_test @@ -0,0 +1,71 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# +#new_client_test <filename to store results in> [FILEPERMISSION (default is 755)] [OBJ_REF] +# +# The first three lines above let this script run without specifying the +# full path to perl, as long as it is in the user's PATH. +# Taken from perlrun man page. + +$TEST_NAME = shift (@ARGV); +$TEST_RES_BASE_DIR = "./results/REMOTE/"; +$TEST_DIR = $TEST_RES_BASE_DIR . $TEST_NAME; +$FILE_PERMISSIONS = shift (@ARGV); +$OBJ_REF = shift (@ARGV); +$FILE_TO_WRITE_EXT = $TEST_DIR . '/sun-iiop.atm1.64'; + +#if the file permissions aren't specified, default to 755 +if ($FILE_PERMISSIONS == NULL){ + $FILE_PERMISSIONS = 755; +} + +if (! (-d $TEST_DIR)) { + chdir $TEST_RES_BASE_DIR; + mkdir ($TEST_NAME, 0755); + system ("chmod $FILE_PERMISSIONS $TEST_NAME"); + chdir "../../"; +} + +# shorts +system ("new_run_test 67108864 128 $FILE_TO_WRITE_EXT s $OBJ_REF"); +sleep 5; +# longs +system ("new_run_test 67108864 128 $FILE_TO_WRITE_EXT l $OBJ_REF"); +sleep 5; +# octets +system ("new_run_test 67108864 128 $FILE_TO_WRITE_EXT o $OBJ_REF"); +sleep 5; +# doubles +system ("new_run_test 67108864 128 $FILE_TO_WRITE_EXT d $OBJ_REF"); +sleep 5; +# chars +system ("new_run_test 67108864 128 $FILE_TO_WRITE_EXT c $OBJ_REF"); +sleep 5; +# structures +system ("new_run_test 67108864 128 $FILE_TO_WRITE_EXT S $OBJ_REF"); +sleep 5; +#Composite Structs +system ("new_run_test 67108864 128 $FILE_TO_WRITE_EXT C $OBJ_REF"); +sleep 5; + + + + + + + + + + + + + + + + + + + diff --git a/TAO/performance-tests/Thruput/TAO/new_run_test b/TAO/performance-tests/Thruput/TAO/new_run_test new file mode 100755 index 00000000000..c86b231cd11 --- /dev/null +++ b/TAO/performance-tests/Thruput/TAO/new_run_test @@ -0,0 +1,55 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# +# $1 <Total_Data_Size> +# $2 <Max_msg_size_in_Kb?> <-- currently not used? $2 == $argv[2] ?? +# $3 <Output file name> +# $4 <seq_type> +# $5 <ior_from_server> +# e.g. +# % run_test 10000 512 mambo\! s iiop:1.0//128.252.165.144:10015/P350892cc000ad963RootPOA/RootPOA_is_BAD/TTCP_IIOP_test +# +# The first three lines above let this script run without specifying the +# full path to perl, as long as it is in the user's PATH. +# Taken from perlrun man page. + +$TOTAL_DATA_SIZE = shift (@ARGV); +$MAX_MSG_SIZE_IN_KB = shift (@ARGV); +$OUTPUT_FILE_NAME = shift (@ARGV); +$SEQ_TYPE = shift (@ARGV); +$IOR_FROM_SERVER = shift (@ARGV); +$msize = 1024; +$limit = ($MAX_MSG_SIZE_IN_KB * 1024); + +while ($msize <= $limit){ + print "-->", "\n"; + print "--> ITERATION #1", "\n"; + print " client -S ", $TOTAL_DATA_SIZE, " -m m -l ", $msize, " -L ", $OUTPUT_FILE_NAME, " -q ", $SEQ_TYPE, " -f ior", "\n"; + print "-->", "\n"; + system ("./client -S $TOTAL_DATA_SIZE -m m -l $msize -L $OUTPUT_FILE_NAME -q $SEQ_TYPE -f ior"); + + sleep 5; + foreach $i (2) { + print "-->", "\n"; + print "--> ITERATION #", $i, "\n"; + print " client -S ", $TOTAL_DATA_SIZE, " -m m -l ", $msize, " -L ", $OUTPUT_FILE_NAME, " -q ", $SEQ_TYPE, " -f ior", "\n"; + print "-->"; + system ("client -S $TOTAL_DATA_SIZE -m m -l $msize -L $OUTPUT_FILE_NAME -q $SEQ_TYPE -f ior"); + } + + print "---------------------------"; + $msize = $msize * 2; + sleep 5; +} + +print " ", "\n"; +print "Done at:", "\n"; +system ("date"); + + + + + diff --git a/TAO/performance-tests/Thruput/TAO/new_server_test b/TAO/performance-tests/Thruput/TAO/new_server_test new file mode 100755 index 00000000000..ede88fbfe83 --- /dev/null +++ b/TAO/performance-tests/Thruput/TAO/new_server_test @@ -0,0 +1,16 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# +# Usage: server <switches> +# -u : use IOR +# -f m : output results in Mbps +# -b <sock Q size> ** not implemented ** +# +# The first three lines above let this script run without specifying the +# full path to perl, as long as it is in the user's PATH. +# Taken from perlrun man page. + +system ("server -d 1 -f m -o ior -ORBdotteddecimaladdresses 1 -ORBobjrefstyle url"); diff --git a/TAO/performance-tests/Thruput/TAO/results/REMOTE/README b/TAO/performance-tests/Thruput/TAO/results/REMOTE/README new file mode 100644 index 00000000000..2ece064f320 --- /dev/null +++ b/TAO/performance-tests/Thruput/TAO/results/REMOTE/README @@ -0,0 +1,4 @@ +This file is here to make the directory non-empty so it won't be +removed by cvs. + Shawn Atkins <sma1@cs.wustl.edu> + diff --git a/TAO/performance-tests/Thruput/TAO/run b/TAO/performance-tests/Thruput/TAO/run new file mode 100755 index 00000000000..009677fdcde --- /dev/null +++ b/TAO/performance-tests/Thruput/TAO/run @@ -0,0 +1 @@ +client -S 67108864 -f m -l $1 -L temp -q $2 -d $3 diff --git a/TAO/performance-tests/Thruput/TAO/run_client b/TAO/performance-tests/Thruput/TAO/run_client new file mode 100755 index 00000000000..f439dde2444 --- /dev/null +++ b/TAO/performance-tests/Thruput/TAO/run_client @@ -0,0 +1,41 @@ +#!/bin/csh -f +# All ATM tests: 64k socket Queue Size +# +# Arguments: +# $1 <Test_Name> +# $2 <ior_file> + +# if ($#argv < 2) then +# echo "Usage: run_client <Test_Name> <obj_reference_From_Server>" +# exit 1 +# endif + +#if the directory $1 <TEST_NAME> doesn't exist create it +if (!(-d ./results/REMOTE/$1)) then + chdir ./results/REMOTE + mkdir $1 + chdir ../../ +endif + +#shorts +run_test 67108864 128 ./results/REMOTE/$1/sun-iiop.atm1.64 s $2 +sleep 5 +# longs +run_test 67108864 128 ./results/REMOTE/$1/sun-iiop.atm1.64 l $2 +sleep 5 +# octets +run_test 67108864 128 ./results/REMOTE/$1/sun-iiop.atm1.64 o $2 +sleep 5 +# doubles +run_test 67108864 128 ./results/REMOTE/$1/sun-iiop.atm1.64 d $2 +sleep 5 +# chars +run_test 67108864 128 ./results/REMOTE/$1/sun-iiop.atm1.64 c $2 +sleep 5 +# structures +run_test 67108864 128 ./results/REMOTE/$1/sun-iiop.atm1.64 S $2 +sleep 5 +#Composite Structs +run_test 67108864 128 ./results/REMOTE/$1/sun-iiop.atm1.64 C $2 +sleep 5 + diff --git a/TAO/performance-tests/Thruput/TAO/run_server b/TAO/performance-tests/Thruput/TAO/run_server new file mode 100755 index 00000000000..6f9a139916c --- /dev/null +++ b/TAO/performance-tests/Thruput/TAO/run_server @@ -0,0 +1,10 @@ +#!/bin/csh -x +# +# Usage: server <switches> +# -u : use IOR +# -f m : output results in Mbps +# -b <sock Q size> ** not implemented ** +# +# + +./server -d 1 -f m -o ior -ORBdotteddecimaladdresses 1 -ORBobjrefstyle url diff --git a/TAO/performance-tests/Thruput/TAO/run_test b/TAO/performance-tests/Thruput/TAO/run_test new file mode 100755 index 00000000000..e2590581ed4 --- /dev/null +++ b/TAO/performance-tests/Thruput/TAO/run_test @@ -0,0 +1,55 @@ +#!/bin/csh -f +# +# $Id$ +# + +# $1 <Total_Data_Size> +# $2 <Max_msg_size_in_Kb?> <-- currently not used? $2 == $argv[2] ?? +# $3 <Output file name> +# $4 <seq_type> +# $5 <ior_file> + +# e.g. +# % run_test 10000 512 mambo\! s iiop:1.0//128.252.165.144:10015/P350892cc000ad963RootPOA/RootPOA_is_BAD/TTCP_IIOP_test +# + +# if ($#argv < 4) then +# echo "Usage: run_test <Total_Data_Size> <Max_msg_size> <Title_Of_This_Test> <seq_type>" +# exit 1 +# endif +# +@ msize=1024 +@ limit= ($argv[2] * 1024) +#echo $limit +#echo $msize + echo "-->" + echo "--> ITERATION #" 1 + echo " client -S" $1 "-m m -l" $msize "-L" $3 "-q" $4 -f $5 + echo "-->" +./client -S $1 -m m -l $msize -L $3 -q $4 -f $5 +set flag=0 +while ($msize <= $limit) + if ($flag == 0) goto label + echo "-->" + echo "--> ITERATION #" 1 + echo " client -S" $1 "-m m -l" $msize "-L" $3 "-q" $4 -f $5 + echo "-->" + ./client -S $1 -m m -l $msize -L $3 -q $4 -f $5 + label: + set flag=1 + sleep 5 + foreach i (2) + echo "-->" + echo "--> ITERATION #" $i + echo " client -S" $1 "-m m -l" $msize "-L" $3 "-q" $4 -f $5 + echo "-->" + ./client -S $1 -m m -l $msize -L $3 -q $4 -f $5 + end + echo "---------------------------" + @ msize = ($msize * 2) + sleep 5 +end + +echo " " +echo "Done at:" +date diff --git a/TAO/performance-tests/Thruput/TAO/server.cpp b/TAO/performance-tests/Thruput/TAO/server.cpp new file mode 100644 index 00000000000..842ef5903a4 --- /dev/null +++ b/TAO/performance-tests/Thruput/TAO/server.cpp @@ -0,0 +1,209 @@ +// $Id$ + +// ============================================================================ +// +// = TAO tests +// Throughput measurement using the TTCP benchmark adapted to work +// using TAO +// +// = FILENAME +// server.cpp +// +// = AUTHOR +// Aniruddha Gokhale +// +// ============================================================================ + +#include "ttcp_i.h" + +#include "tao/debug.h" + +#include "ace/ACE.h" +#include "ace/Get_Opt.h" + +ACE_RCSID(TAO, server, "$Id$") + +char Usage[] = "\ +Usage: server [TAO options] [options] \n\ +Common options:\n\ +-l ## length of bufs read from or written to network (default 8192)\n\ +-v verbose: print more statistics\n\ +-d ## set debug level \n\ +-f X format for rate: k,K = kilo{bit,byte}; m,M = mega; g,G = giga\n\ +-L ## Output file name for the data type used\n\n\ +-o ior_filename\ +"; + +CORBA::Long trans = 0; // we are the receiver +CORBA::Long buflen = 8 * 1024; // length of buffer +CORBA::Char *buf; // ptr to dynamic buffer +CORBA::Long nbuf; // number of buffers to send in sinkmode +CORBA::Long verbose = 0; // 0=print basic info, 1=print cpu rate, proc + // resource usage. +CORBA::Char fmt = 'K'; // output format:k=kilobits,K=kilobytes, m = + // megabits, M = megabytes, g = gigabits, G = + // gigabytes + +CORBA::Char *title = 0; // results filename + +CORBA::Char stats[128]; // gathering the statistics +CORBA::ULong srcDataSize; // Total amount of source data +CORBA::ULong nbytes; // bytes on net +CORBA::ULong numCalls; // # of I/O system calls +CORBA::Double cput, realt; // user, real time (seconds) +CORBA::ULong dt; // data type + +/* declare struct variables for various message types */ +ttcp_sequence::ShortSeq *sseq; +ttcp_sequence::LongSeq *lseq; +ttcp_sequence::OctetSeq *oseq; +ttcp_sequence::DoubleSeq *dseq; +ttcp_sequence::CharSeq *cseq; +ttcp_sequence::StructSeq *Sseq; + +ttcp_sequence_i *my_ttcp; // instance of the target object + +// main program - Driver +int +main (int argc, char **argv) +{ + + int c; // option + CORBA::ORB_var orb_var; // handle to the ORB + PortableServer::POA_var root_poa; // Object adapter + CORBA::Object_var obj_var; + const char *oa_name = "RootPOA"; // name of our OA + const char *orb_name = "internet"; // name of our ORB + char* str; // for stringified representation of the object reference + FILE *ior_file = 0; + + // initialize the underlying ORB and get a handle to it + ACE_DECLARE_NEW_CORBA_ENV; + ACE_TRY + { + orb_var = CORBA::ORB_init (argc, argv, orb_name, ACE_TRY_ENV); + ACE_TRY_CHECK; + + obj_var = orb_var->resolve_initial_references(oa_name, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (CORBA::is_nil(obj_var.in())) + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Unable to initialize the POA.\n"), + -1); + + root_poa = PortableServer::POA::_narrow (obj_var.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + PortableServer::POAManager_var poa_manager = + root_poa->the_POAManager (ACE_TRY_ENV); + ACE_TRY_CHECK; + + CORBA::PolicyList policies (2); + policies.length (2); + policies[0] = + root_poa->create_id_assignment_policy (PortableServer::USER_ID, + ACE_TRY_ENV); + ACE_TRY_CHECK; + policies[1] = + root_poa->create_lifespan_policy (PortableServer::PERSISTENT, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + // We use a different POA, otherwise the user would have to + // change the object key each time it invokes the server. + PortableServer::POA_var good_poa = + root_poa->create_POA ("child_poa", + poa_manager.in (), + policies, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + // for parsing the arguments + ACE_Get_Opt get_opt (argc, argv, "l:vd:f:L:o:"); + + TAO_debug_level = 0; + for (; (c = get_opt ()) != EOF;) + { + switch (c) + { + case 'L': + // title of output file that stores result + title = ACE_OS::strdup (get_opt.optarg); + break; + case 'd': + // debugging level + TAO_debug_level = ACE_OS::atoi (get_opt.optarg); + if (TAO_debug_level > 10) + TAO_debug_level = 10; + break; + case 'f': + // output format i.e., Mbps, Kbps, etc + fmt = *get_opt.optarg; + break; + case 'o': + ior_file = ACE_OS::fopen (get_opt.optarg,"w"); + ACE_DEBUG ((LM_DEBUG,"ior_file is %s\n",get_opt.optarg)); + break; + } + } + + // + // Receiver + // + + // create an instance of an object implementing the "ttcp" interface + my_ttcp = new ttcp_sequence_i; // this is its name + + PortableServer::ObjectId_var id = + PortableServer::string_to_ObjectId ("TTCP_IIOP_test"); + good_poa->activate_object_with_id (id.in (), + my_ttcp, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + obj_var = good_poa->id_to_reference (id.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + poa_manager->activate (ACE_TRY_ENV); + ACE_TRY_CHECK; + + // get a stringified representation of the object reference + // created above + str = orb_var->object_to_string (obj_var.in (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (TAO_debug_level > 0) + { + ACE_DEBUG ((LM_DEBUG, "stringified obj reference = %s\n", str)); + } + + if (ior_file != 0) + { + // write ior to a file + ACE_OS::fprintf (ior_file,"%s",str); + ACE_OS::fclose (ior_file); + } + +#if defined (ACE_HAS_QUANTIFY) + // gather profile data + quantify_clear_data(); + quantify_start_recording_data(); +#endif /* ACE_HAS_QUANTIFY */ + + // Handle requests for this object until we're killed, or one of the + // methods asks us to exit. + orb_var->run (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "server"); + return 1; + } + ACE_ENDTRY; + + return 0; +} diff --git a/TAO/performance-tests/Thruput/TAO/svc.conf b/TAO/performance-tests/Thruput/TAO/svc.conf new file mode 100644 index 00000000000..d6c7074dd38 --- /dev/null +++ b/TAO/performance-tests/Thruput/TAO/svc.conf @@ -0,0 +1,4 @@ +# $Id$ +# + +static Server_Strategy_Factory "-ORBconcurrency thread-per-connection " diff --git a/TAO/performance-tests/Thruput/TAO/tmplinst.cpp b/TAO/performance-tests/Thruput/TAO/tmplinst.cpp new file mode 100644 index 00000000000..a3d83aabe63 --- /dev/null +++ b/TAO/performance-tests/Thruput/TAO/tmplinst.cpp @@ -0,0 +1,22 @@ +// +// $Id$ +// + +// The contents of this file REALLY should be generated by the IDL +// compiler, but that functionality isn't available yet. + +#include "ttcpC.h" + +ACE_RCSID(TAO, tmplinst, "$Id$") + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +template class TAO_Unbounded_Sequence<CORBA::Double>; +template class TAO_Unbounded_Sequence<BinStruct>; +template class TAO_Unbounded_Sequence<CORBA::Char>; +template class TAO_Unbounded_Sequence<CORBA::Short>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +#pragma instantiate TAO_Unbounded_Sequence<CORBA::Double> +#pragma instantiate TAO_Unbounded_Sequence<BinStruct> +#pragma instantiate TAO_Unbounded_Sequence<CORBA::Char> +#pragma instantiate TAO_Unbounded_Sequence<CORBA::Short> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/performance-tests/Thruput/TAO/ttcp.idl b/TAO/performance-tests/Thruput/TAO/ttcp.idl new file mode 100644 index 00000000000..461d4ae7440 --- /dev/null +++ b/TAO/performance-tests/Thruput/TAO/ttcp.idl @@ -0,0 +1,36 @@ +/* -*- C++ -*- */ +// $Id$ + +struct BinStruct +{ + short s; + char c; + long l; + octet o; + double d; + // octet pad[8]; // to make it 32 bytes + // commented out until IDL support for arrays is added +}; + +// Richly typed data +interface ttcp_sequence +{ + typedef sequence<short> ShortSeq; + typedef sequence<long> LongSeq; + typedef sequence<double> DoubleSeq; + typedef sequence<char> CharSeq; + typedef sequence<octet> OctetSeq; + typedef sequence<BinStruct> StructSeq; + + // = Routines to send sequences of various data types. + oneway void sendShortSeq (in ShortSeq ttcp_seq); + oneway void sendLongSeq (in LongSeq ttcp_seq); + oneway void sendDoubleSeq (in DoubleSeq ttcp_seq); + oneway void sendCharSeq (in CharSeq ttcp_seq); + oneway void sendOctetSeq (in OctetSeq ttcp_seq); + oneway void sendStructSeq (in StructSeq ttcp_seq); + + // = Control the timers. + oneway void start_timer (); + oneway void stop_timer (); +}; diff --git a/TAO/performance-tests/Thruput/TAO/ttcp_decl.h b/TAO/performance-tests/Thruput/TAO/ttcp_decl.h new file mode 100644 index 00000000000..d0eeba8cc79 --- /dev/null +++ b/TAO/performance-tests/Thruput/TAO/ttcp_decl.h @@ -0,0 +1,77 @@ +// $Id$ + +// This file includes all the declarations and prototypes. + +#ifndef _TTCP_DECL_H_ +#define _TTCP_DECL_H_ + +#include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ace/Profile_Timer.h" + +// File to be included if Quantify is to be used. +#if defined (ACE_HAS_QUANTIFY) +# include <quantify.h> +#endif /* ACE_HAS_QUANTIFY */ + +// define the data types to be sent. +#define SEND_SHORT ((CORBA::ULong)(1)) +#define SEND_LONG ((CORBA::ULong)(2)) +#define SEND_CHAR ((CORBA::ULong)(3)) +#define SEND_OCTET ((CORBA::ULong)(4)) +#define SEND_DOUBLE ((CORBA::ULong)(5)) +#define SEND_STRUCT ((CORBA::ULong)(6)) +#define SEND_COMPOSITE ((CORBA::ULong)(7)) + +/************** +// Prototypes +***************/ +int err (const char *s); +void mes (const char *s); +char* outfmt (CORBA::Double b); +void prep_timer (void); +CORBA::Double read_timer (CORBA::Char *str, CORBA::Long len); +void prusage (CORBA::Char *outp); +void tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1); +void tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0); +void psecs (CORBA::Double d, register CORBA::Char *cp); +void delay (CORBA::Long us); +void FillPattern (register CORBA::Char *cp, register CORBA::Long bufLen, CORBA::ULong dt); +void PrintStats (void); + +/* Global variables defined here as extern */ +extern ACE_Svc_Export CORBA::Long trans; // whether we are transmitter + // or receiver +extern ACE_Svc_Export CORBA::Long buflen; /* length of buffer */ +extern ACE_Svc_Export CORBA::Char *buf; /* ptr to dynamic buffer */ +extern ACE_Svc_Export CORBA::Long nbuf; /* number of buffers to send in sinkmode */ +extern ACE_Svc_Export CORBA::Short port; /* TCP port number */ +extern ACE_Svc_Export const char *host; /* ptr to name of host */ +extern ACE_Svc_Export CORBA::Long verbose; /* 0=print basic info, 1=prCORBA::Long cpu rate, proc + * resource usage. */ +extern ACE_Svc_Export CORBA::Char fmt; /* output format:k=kilobits,K=kilobytes, + * m = megabits, M = megabytes, + * g = gigabits, G = gigabytes */ +extern ACE_Svc_Export CORBA::Char *title; + +extern ACE_Svc_Export CORBA::Char stats[128]; +extern ACE_Svc_Export unsigned long srcDataSize; /* Total amount of source data */ +extern ACE_Svc_Export unsigned long nbytes; /* bytes on net */ +extern ACE_Svc_Export unsigned long numCalls; /* # of I/O system calls */ +extern ACE_Svc_Export CORBA::Double cput, realt; /* user, real time (seconds) */ +extern ACE_Svc_Export unsigned long dt; + +/* declare struct variables for various message types */ +extern ACE_Svc_Export ttcp_sequence::ShortSeq *sseq; +extern ACE_Svc_Export ttcp_sequence::LongSeq *lseq; +extern ACE_Svc_Export ttcp_sequence::OctetSeq *oseq; +extern ACE_Svc_Export ttcp_sequence::DoubleSeq *dseq; +extern ACE_Svc_Export ttcp_sequence::CharSeq *cseq; +extern ACE_Svc_Export ttcp_sequence::StructSeq *Sseq; +//extern ACE_Svc_Export ttcp_sequence::RtiPacketSeq *rtipacketSeq; + +#endif /* _TTCP_DECL_H_ */ diff --git a/TAO/performance-tests/Thruput/TAO/ttcp_i.cpp b/TAO/performance-tests/Thruput/TAO/ttcp_i.cpp new file mode 100644 index 00000000000..29dd86df849 --- /dev/null +++ b/TAO/performance-tests/Thruput/TAO/ttcp_i.cpp @@ -0,0 +1,112 @@ +// $Id$ + +#include "ace/ACE.h" +#include "ttcp_i.h" +#include "ttcp_decl.h" + +ACE_RCSID (TAO, ttcp_i, "$Id$") + + // the ttcp_i class implementation +ttcp_sequence_i::ttcp_sequence_i (void) +{ + this->nbytes_ = 0; + numCalls = 0; +} + +void +ttcp_sequence_i::start_timer (CORBA::Environment &IT_env) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + ACE_UNUSED_ARG (IT_env); + this->nbytes_ = 0; + ::prep_timer (); +} + +void +ttcp_sequence_i::stop_timer (CORBA::Environment &IT_env) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + ACE_UNUSED_ARG (IT_env); + + ::read_timer (stats, sizeof (stats)); + ::nbytes = this->nbytes_; + ::PrintStats (); + // reset + this->nbytes_ = 0; + numCalls = 0; +#if defined (ACE_HAS_QUANTIFY) + quantify_stop_recording_data (); + ACE_Service_Config::end_reactor_event_loop (); + ACE_OS::fprintf (stderr, "*********** just before exiting\n"); +#endif /* ACE_HAS_QUANTIFY */ +#if defined (ACE_HAS_PURIFY) + ACE_Service_Config::end_reactor_event_loop (); + ACE_OS::fprintf (stderr, "*********** just before exiting\n"); +#endif /* ACE_HAS_PURIFY */ +} + +void +ttcp_sequence_i::sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq, + CORBA::Environment &IT_env) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + ACE_UNUSED_ARG (IT_env); + numCalls++; + this->nbytes_ += ttcp_seq.length () * sizeof (CORBA::Short); +} + +void +ttcp_sequence_i::sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq, + CORBA::Environment &IT_env) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + ACE_UNUSED_ARG (IT_env); + numCalls++; + this->nbytes_ += ttcp_seq.length () * sizeof (CORBA::Long); +} + +void +ttcp_sequence_i::sendOctetSeq (const ttcp_sequence::OctetSeq& ttcp_seq, + CORBA::Environment &IT_env) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + ACE_UNUSED_ARG (IT_env); + numCalls++; + this->nbytes_ += ttcp_seq.length () * sizeof (CORBA::Octet); +} + +void +ttcp_sequence_i::sendDoubleSeq (const ttcp_sequence::DoubleSeq & + ttcp_seq, + CORBA::Environment &IT_env) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + ACE_UNUSED_ARG (IT_env); + numCalls++; + this->nbytes_ += ttcp_seq.length () * sizeof (CORBA::Double); +} + +void +ttcp_sequence_i::sendCharSeq (const ttcp_sequence::CharSeq& ttcp_seq, + CORBA::Environment &IT_env) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + ACE_UNUSED_ARG (IT_env); + numCalls++; + this->nbytes_ += ttcp_seq.length () * sizeof (CORBA::Char); +} + +void +ttcp_sequence_i::sendStructSeq (const ttcp_sequence::StructSeq& ttcp_seq, + CORBA::Environment &IT_env) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + ACE_UNUSED_ARG (IT_env); + numCalls++; + this->nbytes_ += ttcp_seq.length () * sizeof (BinStruct); +#if !defined (ACE_NDEBUG) + ACE_DEBUG ((LM_DEBUG, + "Bytes received so far = %d\n", + this->nbytes_)); +#endif /* ACE_NDEBUG */ +} diff --git a/TAO/performance-tests/Thruput/TAO/ttcp_i.h b/TAO/performance-tests/Thruput/TAO/ttcp_i.h new file mode 100644 index 00000000000..5f2f9707472 --- /dev/null +++ b/TAO/performance-tests/Thruput/TAO/ttcp_i.h @@ -0,0 +1,56 @@ +// $Id$ + +// ============================================================================ +// +// = TAO tests +// Throughput measurement using the TTCP benchmark adapted to work using TAO +// +// = FILENAME +// ttcp_i.h +// +// = AUTHOR +// Aniruddha Gokhale +// +// ============================================================================ + +#ifndef TTCP_I_H +#define TTCP_I_H + +#include "ttcpS.h" + +class ttcp_sequence_i: public POA_ttcp_sequence +{ +public: + ttcp_sequence_i(); + + virtual void sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq, + CORBA::Environment &IT_env) + ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq, + CORBA::Environment &IT_env) + ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void sendDoubleSeq (const ttcp_sequence::DoubleSeq& ttcp_seq, + CORBA::Environment &IT_env) + ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void sendCharSeq (const ttcp_sequence::CharSeq& ttcp_seq, + CORBA::Environment &IT_env) + ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void sendStructSeq (const ttcp_sequence::StructSeq& ttcp_seq, + CORBA::Environment &IT_env) + ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void sendOctetSeq (const ttcp_sequence::OctetSeq& ttcp_seq, + CORBA::Environment &IT_env) + ACE_THROW_SPEC ((CORBA::SystemException)); + + // = Routines to calculate the time required to transfer. + virtual void start_timer (CORBA::Environment &IT_env) + ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void stop_timer (CORBA::Environment &IT_env) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + u_long nbytes_; +}; + +#endif /* TTCP_I_H */ + diff --git a/TAO/performance-tests/Thruput/TAO/utils.cpp b/TAO/performance-tests/Thruput/TAO/utils.cpp new file mode 100644 index 00000000000..54785fc4f44 --- /dev/null +++ b/TAO/performance-tests/Thruput/TAO/utils.cpp @@ -0,0 +1,593 @@ +// $Id$ + +// ============================================================================ +// +// = TAO tests +// Throughput measurement using the TTCP benchmark adapted to work using TAO +// +// = FILENAME +// utils.cpp +// +// = AUTHOR +// Aniruddha Gokhale +// +// = BEING MODIFIED BY +// Shawn Atkins +// ============================================================================ + +// This file has all the helper functions that do the computation of +// throughput, system time used, user time, etc based on data collected. + +#include "ttcpC.h" +#include "ttcp_decl.h" + +ACE_RCSID(TAO, utils, "$Id$") + +// the error function. +// displays the error message and exits +int err (const char* s) +{ + ACE_OS::fprintf (stderr, "ttcp%s: ", trans ? "-t" : "-r"); + ACE_OS::perror (s); + ACE_OS::fprintf (stderr, "errno=%d\n", errno); + return -1; +} + +// prints a message indicating if it is a transmitter or a receiver +void mes (const char* s) +{ + ACE_OS::fprintf (stderr, "ttcp%s: %s\n", trans ? "-t" : "-r", s); +} + +// does the formatting for the desired units in which the result is to be +// displayed +char* +outfmt (CORBA::Double b) +{ + static CORBA::Char obuf[50]; + switch (fmt) + { + case 'G': + ACE_OS::sprintf (obuf, "%.2f GB", b / 1024.0 / 1024.0 / 1024.0); + break; + default: + case 'K': + ACE_OS::sprintf (obuf, "%.2f KB", b / 1024.0); + break; + case 'M': + ACE_OS::sprintf (obuf, "%.2f MB", b / 1024.0 / 1024.0); + break; + case 'g': + ACE_OS::sprintf (obuf, "%.2f Gbit", b * 8.0 / 1024.0 / 1024.0 / 1024.0); + break; + case 'k': + ACE_OS::sprintf (obuf, "%.2f Kbit", b * 8.0 / 1024.0); + break; + case 'm': + ACE_OS::sprintf (obuf, "%.2f Mbit", b * 8.0 / 1024.0 / 1024.0); + break; + } + return obuf; +} + +#if defined (VXWORKS) || defined (CHORUS) +// Just so this file will compile. +inline +int +lrand48 () +{ + return ::rand (); +} + +inline +double +drand48 () +{ + return ::rand (); +} +#endif /* VXWORKS || CHORUS */ + +// fill up a buffer with a data type that we want to send +void +FillPattern (register CORBA::Char *cp, register CORBA::Long bufLen, CORBA::ULong dt) +{ + unsigned long + num, i; + + switch(dt){ + case SEND_SHORT: + { + register short *SeqPtr = (short *)cp; + num = bufLen/sizeof(short); + for (i=0; i < num; i++) + SeqPtr[i] = (short)lrand48(); + sseq = new ttcp_sequence::ShortSeq(num,num, SeqPtr); + } + break; + case SEND_LONG: + { + register CORBA::Long *SeqPtr = (CORBA::Long *)cp; + num = bufLen/sizeof(long); + for (i=0; i < num; i++) + SeqPtr[i] = lrand48(); + lseq = new ttcp_sequence::LongSeq(num, num, SeqPtr); + } + break; + case SEND_DOUBLE: + { + register double *SeqPtr = (double *)cp; + num = bufLen/sizeof(double); + for (i=0; i < num; i++) + SeqPtr[i] = drand48(); + dseq = new ttcp_sequence::DoubleSeq(num, num, SeqPtr); + } + break; + case SEND_CHAR: + { + register CORBA::Char *SeqPtr = (CORBA::Char *)cp; + register char c = 0; + num = bufLen/sizeof(char); + for(i=0; i < num; i++){ + while (!isprint(c & 0x7f)) + c++; + SeqPtr[i] = (c++ & 0x7f); + } + cseq = new ttcp_sequence::CharSeq(num, num, SeqPtr); + } + break; + case SEND_STRUCT: + { + register BinStruct *SeqPtr = (BinStruct *)cp; + register char c = 0; + num = bufLen/sizeof(BinStruct); + for (i=0; i < num; i++){ + SeqPtr[i].s = (short)lrand48(); + SeqPtr[i].l = lrand48(); + SeqPtr[i].d = drand48(); + while (!isprint(c & 0x7f)) + c++; + SeqPtr[i].c = (c++ & 0x7f); + while (!isprint(c & 0x7f)) + c++; + SeqPtr[i].o = (unsigned char)(c++ & 0x7f); + } + Sseq = new ttcp_sequence::StructSeq(num, num, SeqPtr); + + } + break; + case SEND_COMPOSITE: + /*still being worked on*/ + /* + { fill in the RtiPacketSequence + register RtiPacket *SeqPtr = (RtiPacket *)cp; + register char c = 0; + num = bufLen / sizeof (RtiPacket); + can't know sizeof (RtiPacket) can it? if can have variable length sequence inside of it. + num = bufLen; + int numUpdates = 2; + int numAttrs = 5; + for (i = 0; bufLen > 0; i++){ + SeqPtr [i].packetHeader.packetLength = 1; // this is probably redundant + SeqPtr [i].packetHeader.federationHandle = 2; + SeqPtr [i].packetHeader.channelHandle = 3; + SeqPtr [i].packetHeader.packetColor = 4; + + SeqPtr [i].msgs.length (numUpdates); + + for (int j = 0; j < numUpdates; ++j) + { + SeqPtr [i].msgs[j].oumh (RtiObjectUpdateMessageHeader ()); + RtiObjectUpdateMessageHeader & oumh = SeqPtr [i].msgs[j].oumh (); + oumh.updateLength = 2001; // redundant + oumh.updateTag = 2002; + oumh.objectHandle = 2003; + oumh.timestamp = 3.14159; + oumh.eventRetractionHandle = 2004; + oumh.classHandle = 2005; + oumh.sendingFederateHandle = 2006; + oumh.userTag = CORBA::string_dup ("beefcake!"); + oumh.regionData.length(0); + oumh.transportationHandle = 1; + oumh.orderingHandle = 1; + oumh.messagePayload.length (numAttrs); + + for (int k = 0; k < numAttrs; ++k) + { + oumh.messagePayload[k] = HandleValuePair (); + HandleValuePair &hvp = oumh.messagePayload[k]; + hvp.handle = k * k; + char *d1 = "somedata"; + hvp.data.length (ACE_OS::strlen (d1)+1); + ACE_OS::strcpy ((char *) hvp.data.get_buffer (), d1); + } + num -= sizeof (SeqPtr [i]); + printf ("SIZE OF RTIPACKET IS %d", sizeof (SeqPtr [i])); + } + + fill in the RtiPacket + } + rtipacketSeq = new ttcp_sequence::RtiPacketSeq (num, num, SeqPtr); + + }*/ + + break; + case SEND_OCTET: + default: + { + register CORBA::Octet *SeqPtr = (CORBA::Octet *)cp; + register char c = 0; + num = bufLen/sizeof(CORBA::Octet); + for(i=0; i < num; i++){ + while (!isprint(c & 0x7f)) + c++; + SeqPtr[i] = (c++ & 0x7f); + } + oseq = new ttcp_sequence::OctetSeq(num, num, SeqPtr); + } + break; + } +} + +// print all the statistics +void PrintStats (void) +{ + if (cput <= 0.0) + cput = 0.001; + if (realt <= 0.0) + realt = 0.001; + + if (title != 0) + { + double tmp; + FILE *outFile; + char filename[BUFSIZ]; + + strcpy(filename, title); + switch(dt){ + case SEND_SHORT: + strcat(filename, ".shortSeq.results"); + break; + case SEND_LONG: + strcat(filename, ".longSeq.results"); + break; + case SEND_DOUBLE: + strcat(filename, ".doubleSeq.results"); + break; + case SEND_CHAR: + strcat(filename, ".charSeq.results"); + break; + case SEND_STRUCT: + strcat(filename, ".structSeq.results"); + break; + case SEND_COMPOSITE: + strcat(filename, ".compositeSeq.results"); + break; + case SEND_OCTET: + default: + strcat(filename, ".octetSeq.results"); + break; + } + outFile = fopen (filename, "a+"); + ACE_OS::fprintf (outFile, "%dk \t", buflen / 1024); + tmp = ((double) nbytes) / realt; + ACE_OS::fprintf (outFile, "%.2f\n", tmp * 8.0 / 1024.0 / 1024.0); + fclose (outFile); + } + + ACE_OS::fprintf (stdout, + "ttcp%s: %ld bytes in %.2f real seconds = %s/sec +++\n", + trans ? "-t" : "-r", + nbytes, realt, outfmt (((double) nbytes) / realt)); + if (verbose) + { + ACE_OS::fprintf (stdout, + "ttcp%s: %ld bytes in %.2f CPU seconds = %s/cpu sec\n", + trans ? "-t" : "-r", + nbytes, cput, outfmt (((double) nbytes) / cput)); + } + ACE_OS::fprintf (stdout, + "ttcp%s: %ld Server Method calls, msec/call = %.2f, calls/sec = %.2f\n", + trans ? "-t" : "-r", + numCalls, + 1024.0 * realt / ((double) numCalls), + ((double) numCalls) / realt); + ACE_OS::fprintf (stdout, "ttcp%s: %s\n", trans ? "-t" : "-r", stats); + if (verbose) + { + ACE_OS::fprintf (stdout, + "ttcp%s: buffer address %#lx\n", + trans ? "-t" : "-r", + ACE_reinterpret_cast (long, buf)); + } +} + +// generate the specified delay in microseconds +void +delay (int us) +{ + struct timeval tv; + + tv.tv_sec = 0; + tv.tv_usec = us; + (void) select (1, (fd_set *) 0, (fd_set *) 0, (fd_set *) 0, &tv); +} + +#if defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE) +// Mon Apr 06 09:50:16 1998 David L. Levine <levine@cs.wustl.edu> +// @@ This file should be updated to use ACE_Profile_Timer instead of +// using rusage directly. + +ACE_Profile_Timer ru0; //Timer to calculate stats + +/* + * P R E P _ T I M E R + */ +// this is in fact the internals of the "start_timer" operation +void +prep_timer (void) +{ + ru0.start (); +} + +/* + * R E A D _ T I M E R + * + */ +// This implements the internals of the "stop_timer" method +double +read_timer (CORBA::Char *str, CORBA::Long len) +{ + char line[132]; + ACE_Profile_Timer::ACE_Elapsed_Time et; + + ru0.stop (); + ru0.elapsed_time (et); + + prusage (line); + (void) strncpy (str, line, len); + + //Get real time + realt = et.real_time; + + //Get CPU time (user+sys) + cput = et.user_time + et.system_time; + if (cput < 0.00001) + cput = 0.00001; + return (cput); +} + +// prints the rusage stats +void +prusage (char *outp) +{ + register ACE_timer_t t, ms; + register const char *cp; + register int i; + + ACE_Profile_Timer::ACE_Elapsed_Time et; + ACE_Profile_Timer::Rusage rusage; + ru0.elapsed_time (et); + ru0.elapsed_rusage (rusage); + + t = et.user_time + et.system_time; + ms = et.real_time; + +#define END(x) {while(*x) x++;} +#if defined(SYSV) + cp = "%Uuser %Ssys %Ereal %P"; +#else +#if defined(sgi) /* IRIX 3.3 will show 0 for %M,%F,%R,%C */ + cp = "%Uuser %Ssys %Ereal %P %Mmaxrss %F+%Rpf %Ccsw"; +#else + cp = "%Uuser %Ssys %Ereal %P %Xi+%Dd %Mmaxrss %F+%Rpf %Ccsw"; +#endif +#endif + for (; *cp; cp++) + { + if (*cp != '%') + *outp++ = *cp; + else if (cp[1]) + switch (*++cp) + { + + case 'U': + ACE_OS::sprintf (outp, "%f ", et.user_time); + END (outp); + break; + + case 'S': + ACE_OS::sprintf (outp, "%f ", et.system_time); + END (outp); + break; + + case 'E': + psecs (ms, outp); + END (outp); + break; + + case 'P': + ACE_OS::sprintf (outp, "%d%%", (int) (t * 100 / ((ms ? ms : 1)))); + END (outp); + break; + + /*possible thing to add in is the equivalent for case X, D, K, M, F, and R for prusage_t*/ +#if !defined(SYSV) +# if defined (ACE_HAS_PRUSAGE_T) + case 'W': + i = rusage.pr_nswap;; + ACE_OS::sprintf (outp, "%d", i); + END (outp); + break; + + case 'X': + // ACE_OS::sprintf (outp, "%d", t == 0 ? 0 : (rusage.ru_ixrss) / t); + //END (outp); + break; + + case 'D': + //ACE_OS::sprintf (outp, "%d", t == 0 ? 0 : + // (rusage.ru_idrss + rusage.ru_isrss) / t); + //END (outp); + break; + + case 'K': + //ACE_OS::sprintf (outp, "%d", t == 0 ? 0 : + // (rusage.ru_ixrss + rusage.ru_isrss + rusage.ru_idrss) / t); + //END (outp); + break; + + case 'M': + /* ACE_OS::sprintf (outp, "%d", rusage.ru_maxrss / 2); + END (outp);*/ + break; + + case 'F': + /* + ACE_OS::sprintf (outp, "%d", rusage.ru_majflt); + END (outp);*/ + break; + + case 'R': + /*ACE_OS::sprintf (outp, "%d", rusage.ru_minflt); + END (outp);*/ + break; + + case 'I': + ACE_OS::sprintf (outp, "%d", rusage.pr_inblk); + END (outp); + break; + + case 'O': + ACE_OS::sprintf (outp, "%d", rusage.pr_oublk); + END (outp); + break; + case 'C': + ACE_OS::sprintf (outp, "%d+%d", rusage.pr_vctx, rusage.pr_ictx); + END (outp); + break; +# elif defined (ACE_HAS_GETRUSAGE) + case 'W': + i = rusage.ru_nswap;; + ACE_OS::sprintf (outp, "%d", i); + END (outp); + break; + + case 'X': + ACE_OS::sprintf (outp, "%d", t == 0 ? 0 : (int) ((rusage.ru_ixrss) / t)); + END (outp); + break; + + case 'D': + ACE_OS::sprintf (outp, "%d", t == 0 ? 0 : + (int) ((rusage.ru_idrss + rusage.ru_isrss) / t)); + END (outp); + break; + + case 'K': + ACE_OS::sprintf (outp, "%d", t == 0 ? 0 : + (int) ((rusage.ru_ixrss + rusage.ru_isrss + rusage.ru_idrss) / t)); + END (outp); + break; + + case 'M': + ACE_OS::sprintf (outp, "%ld", rusage.ru_maxrss / 2); + END (outp); + break; + + case 'F': + ACE_OS::sprintf (outp, "%ld", rusage.ru_majflt); + END (outp); + break; + + case 'R': + ACE_OS::sprintf (outp, "%ld", rusage.ru_minflt); + END (outp); + break; + + case 'I': + ACE_OS::sprintf (outp, "%ld", rusage.ru_inblock); + END (outp); + break; + + case 'O': + ACE_OS::sprintf (outp, "%ld", rusage.ru_oublock); + END (outp); + break; + + case 'C': + ACE_OS::sprintf (outp, "%ld+%ld", + rusage.ru_nvcsw, rusage.ru_nivcsw); + END (outp); + break; +# endif /*ACE HAS PRUSAGE_T | ACE_HAS_GETRUSAGE*/ +#endif /* !SYSV */ + } + } + *outp = '\0'; +} + +// adds two "timeval" structures +void +tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1) +{ + tsum->tv_sec = t0->tv_sec + t1->tv_sec; + tsum->tv_usec = t0->tv_usec + t1->tv_usec; + if (tsum->tv_usec > 1000000) + tsum->tv_sec++, tsum->tv_usec -= 1000000; +} + +// finds difference between two timevals +void +tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0) +{ + tdiff->tv_sec = t1->tv_sec - t0->tv_sec; + tdiff->tv_usec = t1->tv_usec - t0->tv_usec; + if (tdiff->tv_usec < 0) + tdiff->tv_sec--, tdiff->tv_usec += 1000000; +} + +// print in seconds +void +psecs (CORBA::Double d, register CORBA::Char *cp) +{ + register int i; + + i = (int) d / 3600; + if (i) + { + ACE_OS::sprintf (cp, "%d:", i); + END (cp); + i = (int) d % 3600; + ACE_OS::sprintf (cp, "%d%d ", (i / 60) / 10, (i / 60) % 10); + END (cp); + } + else + { + i = (int) d; + ACE_OS::sprintf (cp, "%d", i / 60); + END (cp); + } + i %= 60; + *cp++ = ':'; + ACE_OS::sprintf (cp, "%d%d ", i / 10, i % 10); +} + + +#else /* ! ACE_HAS_PRUSAGE_T || ! ACE_HAS_GETRUSAGE */ + +void +prep_timer (void) +{ + ACE_ERROR ((LM_ERROR, "%s:%d; not supported\n", __FILE__, __LINE__)); + errno = ENOTSUP; +} + +double +read_timer (CORBA::Char *str, CORBA::Long len) +{ + ACE_UNUSED_ARG(str); + ACE_UNUSED_ARG(len); + ACE_NOTSUP_RETURN (0.0); +} + +#endif /* ! ACE_HAS_PRUSAGE_T || ! ACE_HAS_GETRUSAGE */ diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp new file mode 100644 index 00000000000..b848b178a97 --- /dev/null +++ b/TAO/tao/Asynch_Queued_Message.cpp @@ -0,0 +1,77 @@ +// -*- C++ -*- +// $Id$ + +#include "Asynch_Queued_Message.h" + +ACE_RCSID(tao, Asynch_Queued_Message, "$Id$") + +TAO_Asynch_Queued_Message:: + TAO_Asynch_Queued_Message (const ACE_Message_Block *contents) + : offset_ (0) +{ + this->size_ = contents->total_length (); + // @@ Use a pool for these guys!! + ACE_NEW (this->buffer_, char[this->size_]); + + size_t copy_offset = 0; + for (const ACE_Message_Block *i = contents; + i != 0; + i = i->cont ()) + { + ACE_OS::memcpy (this->buffer_ + copy_offset, + i->rd_ptr (), + i->length ()); + copy_offset += i->length (); + } +} + +TAO_Asynch_Queued_Message::~TAO_Asynch_Queued_Message (void) +{ + // @@ Use a pool for these guys! + delete[] this->buffer_; +} + +size_t +TAO_Asynch_Queued_Message::message_length (void) const +{ + return this->size_ - this->offset_; +} + +int +TAO_Asynch_Queued_Message::all_data_sent (void) const +{ + return this->size_ == this->offset_; +} + +void +TAO_Asynch_Queued_Message::fill_iov (int iovcnt_max, + int &iovcnt, + iovec iov[]) const +{ + ACE_ASSERT (iovcnt_max > iovcnt); + + iov[iovcnt].iov_base = this->buffer_ + this->offset_; + iov[iovcnt].iov_len = this->size_ - this->offset_; + iovcnt++; +} + +void +TAO_Asynch_Queued_Message::bytes_transferred (size_t &byte_count) +{ + size_t remaining_bytes = this->size_ - this->offset_; + if (byte_count > remaining_bytes) + { + this->offset_ = this->size_; + byte_count -= remaining_bytes; + return; + } + this->offset_ += byte_count; + byte_count = 0; +} + +void +TAO_Asynch_Queued_Message::destroy (void) +{ + // @@ Maybe it comes from a pool, we should do something about it. + delete this; +} diff --git a/TAO/tao/Asynch_Queued_Message.h b/TAO/tao/Asynch_Queued_Message.h new file mode 100644 index 00000000000..dbb4ca38bb0 --- /dev/null +++ b/TAO/tao/Asynch_Queued_Message.h @@ -0,0 +1,73 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file Asynch_Queued_Message.h + * + * $Id$ + * + * @author Carlos O'Ryan <coryan@uci.edu> + */ +//============================================================================= + +#ifndef TAO_ASYNCH_QUEUED_MESSAGE_H +#define TAO_ASYNCH_QUEUED_MESSAGE_H +#include "ace/pre.h" + +#include "Queued_Message.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +/** + * @class TAO_Asynch_Queued_Message + * + * @brief Specialize TAO_Queued_Message for asynch requests, + * i.e. oneways sent with SYNC_NONE policy. + * + */ +class TAO_Export TAO_Asynch_Queued_Message : public TAO_Queued_Message +{ +public: + /// Constructor + /** + * @param contents The message block chain that must be sent. + * + * @todo I'm almost sure this class will require a callback + * interface for AMIs sent with SYNC_NONE policy. Those guys + * need to hear when the connection timeouts or closes, but + * cannot block waiting for the message to be delivered. + */ + TAO_Asynch_Queued_Message (const ACE_Message_Block *contents); + + /// Destructor + virtual ~TAO_Asynch_Queued_Message (void); + + /** Implement the Template Methods from TAO_Queued_Message + */ + //@{ + virtual size_t message_length (void) const; + virtual int all_data_sent (void) const; + virtual void fill_iov (int iovcnt_max, int &iovcnt, iovec iov[]) const; + virtual void bytes_transferred (size_t &byte_count); + virtual void destroy (void); + //@} + +private: + /// The number of bytes in the buffer + size_t size_; + + /// The offset in the buffer + /** + * Data up to @c offset has been sent already, only the + * [offset_,size_) range remains to be sent. + */ + size_t offset_; + + /// The buffer containing the complete message. + char *buffer_; +}; + +#include "ace/post.h" +#endif /* TAO_ASYNCH_QUEUED_MESSAGE_H */ diff --git a/TAO/tao/BiDir_GIOP/Makefile b/TAO/tao/BiDir_GIOP/Makefile index 39408caf92d..c36d03b0305 100644 --- a/TAO/tao/BiDir_GIOP/Makefile +++ b/TAO/tao/BiDir_GIOP/Makefile @@ -69,7 +69,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/BiDir_Adapter.h \ - $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -157,9 +156,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -168,6 +164,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -191,8 +189,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -200,39 +198,28 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ BiDirPolicyC.i BiDir_ORBInitializer.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -257,6 +244,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ @@ -323,7 +320,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/BiDir_Adapter.h \ - $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -411,9 +407,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -422,6 +415,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -445,8 +440,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -454,15 +449,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - BiDirPolicyC.i \ $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + BiDirPolicyC.i .obj/BiDir_ORBInitializer.o .obj/BiDir_ORBInitializer.so .shobj/BiDir_ORBInitializer.o .shobj/BiDir_ORBInitializer.so: BiDir_ORBInitializer.cpp \ BiDir_ORBInitializer.h \ @@ -592,33 +588,20 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ @@ -778,33 +761,20 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ @@ -850,7 +820,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/OS_Errno.inl \ BiDirGIOP.h \ $(TAO_ROOT)/tao/BiDir_Adapter.h \ - $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -938,9 +907,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -949,6 +915,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -972,8 +940,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -981,11 +949,14 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ BiDirPolicyC.i \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -993,8 +964,6 @@ CPPFLAGS += -I$(TAO_ROOT) BiDir_Policy_i.inl \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -1040,14 +1009,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ diff --git a/TAO/tao/BiDir_Policy_i.cpp b/TAO/tao/BiDir_Policy_i.cpp deleted file mode 100644 index 3a02dbd8a5c..00000000000 --- a/TAO/tao/BiDir_Policy_i.cpp +++ /dev/null @@ -1,79 +0,0 @@ -// $Id$ - -#include "tao/BiDir_Policy_i.h" -#include "tao/Stub.h" - -ACE_RCSID(TAO, BiDir_Policy_i, "$Id$") - - - -#if ! defined (__ACE_INLINE__) -#include "tao/BiDir_Policy_i.inl" -#endif /* __ACE_INLINE__ */ - -TAO_BidirectionalPolicy::TAO_BidirectionalPolicy ( - const BiDirPolicy::BidirectionalPolicyValue val) - : value_ (val) -{ -} - -TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy &rhs) - : BiDirPolicy::BidirectionalPolicy (), - TAO_Local_RefCounted_Object (), - value_ (rhs.value_) -{ -} - - - -CORBA::PolicyType -TAO_BidirectionalPolicy::policy_type (CORBA_Environment &) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // Future policy implementors: notice how this minimizes the - // footprint of the class. - return BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE; -} - - -TAO_BidirectionalPolicy * -TAO_BidirectionalPolicy::clone (void) const -{ - TAO_BidirectionalPolicy *copy = 0; - ACE_NEW_RETURN (copy, - TAO_BidirectionalPolicy (*this), - 0); - return copy; -} - -CORBA::Policy_ptr -TAO_BidirectionalPolicy::copy (CORBA_Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // Future policy implementors: notice how the following code is - // exception safe! - - TAO_BidirectionalPolicy* tmp; - ACE_NEW_THROW_EX (tmp, TAO_BidirectionalPolicy (*this), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, - CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - - return tmp; -} - -void -TAO_BidirectionalPolicy::destroy (CORBA_Environment &) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ -} - - -BiDirPolicy::BidirectionalPolicyValue -TAO_BidirectionalPolicy::value ( - CORBA::Environment &) - ACE_THROW_SPEC (( - CORBA::SystemException)) -{ - return this->value_; -} diff --git a/TAO/tao/Block_Flushing_Strategy.cpp b/TAO/tao/Block_Flushing_Strategy.cpp new file mode 100644 index 00000000000..96a6b3f12d1 --- /dev/null +++ b/TAO/tao/Block_Flushing_Strategy.cpp @@ -0,0 +1,52 @@ +// -*- C++ -*- +// $Id$ + +#include "Block_Flushing_Strategy.h" +#include "Transport.h" +#include "Queued_Message.h" + +ACE_RCSID(tao, Block_Flushing_Strategy, "$Id$") + +int +TAO_Block_Flushing_Strategy::schedule_output (TAO_Transport *transport) +{ + while (!transport->queue_is_empty_i ()) + { + int result = transport->drain_queue_i (); + if (result == -1) + return -1; + } + return 0; +} + +int +TAO_Block_Flushing_Strategy::cancel_output (TAO_Transport *) +{ + return 0; +} + +int +TAO_Block_Flushing_Strategy::flush_message (TAO_Transport *transport, + TAO_Queued_Message *msg, + ACE_Time_Value *) +{ + while (!msg->all_data_sent ()) + { + int result = transport->handle_output (); + if (result == -1) + return -1; + } + return 0; +} + +int +TAO_Block_Flushing_Strategy::flush_transport (TAO_Transport *transport) +{ + while (!transport->queue_is_empty ()) + { + int result = transport->handle_output (); + if (result == -1) + return -1; + } + return 0; +} diff --git a/TAO/tao/Block_Flushing_Strategy.h b/TAO/tao/Block_Flushing_Strategy.h new file mode 100644 index 00000000000..9b41ef8dd17 --- /dev/null +++ b/TAO/tao/Block_Flushing_Strategy.h @@ -0,0 +1,40 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file Block_Flushing_Strategy.h + * + * $Id$ + * + * @author Carlos O'Ryan <coryan@uci.edu> + */ +//============================================================================= + +#ifndef TAO_BLOCK_FLUSHING_STRATEGY_H +#define TAO_BLOCK_FLUSHING_STRATEGY_H +#include "ace/pre.h" + +#include "Flushing_Strategy.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +/** + * @class TAO_Block_Flushing_Strategy + * + * @brief Implement a flushing strategy that blocks on write to flush + */ +class TAO_Export TAO_Block_Flushing_Strategy : public TAO_Flushing_Strategy +{ +public: + virtual int schedule_output (TAO_Transport *transport); + virtual int cancel_output (TAO_Transport *transport); + virtual int flush_message (TAO_Transport *transport, + TAO_Queued_Message *msg, + ACE_Time_Value *max_wait_time); + virtual int flush_transport (TAO_Transport *transport); +}; + +#include "ace/post.h" +#endif /* TAO_BLOCK_FLUSHING_STRATEGY_H */ diff --git a/TAO/tao/Client_Strategy_Factory.cpp b/TAO/tao/Client_Strategy_Factory.cpp index aa28147dd9a..032cfcaca8e 100644 --- a/TAO/tao/Client_Strategy_Factory.cpp +++ b/TAO/tao/Client_Strategy_Factory.cpp @@ -30,12 +30,6 @@ TAO_Client_Strategy_Factory::create_wait_strategy (TAO_Transport *) return 0; } -int -TAO_Client_Strategy_Factory::allow_callback (void) -{ - return 0; -} - ACE_Lock * TAO_Client_Strategy_Factory::create_ft_service_retention_id_lock (void) { diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h index 72916e7d42f..735e48afa26 100644 --- a/TAO/tao/Client_Strategy_Factory.h +++ b/TAO/tao/Client_Strategy_Factory.h @@ -58,9 +58,6 @@ public: /// Create the correct client <wait_for_reply> strategy. virtual TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport); - /// Does the client allow any form of callback? - virtual int allow_callback (void); - /// Create a lock to be used by the TAO_Fault_Tolerant_Service class /// to generate unique retention ids virtual ACE_Lock *create_ft_service_retention_id_lock (void); diff --git a/TAO/tao/Domain/Makefile b/TAO/tao/Domain/Makefile index 8a00d5030ef..db82d6df38d 100644 --- a/TAO/tao/Domain/Makefile +++ b/TAO/tao/Domain/Makefile @@ -50,8 +50,7 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/DomainS.o .obj/DomainS.so .shobj/DomainS.o .shobj/DomainS.so: DomainS.cpp DomainS.h \ - $(ACE_ROOT)/ace/pre.h \ - domain_export.h \ + $(ACE_ROOT)/ace/pre.h domain_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -61,7 +60,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -149,33 +147,18 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -183,50 +166,28 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/OctetSeqC.i \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -234,52 +195,62 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/StringSeqC.h \ $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/PortableServer/PolicyS.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/PolicyS_T.h \ - $(TAO_ROOT)/tao/PortableServer/PolicyS_T.i \ - $(TAO_ROOT)/tao/PortableServer/PolicyS_T.cpp \ - $(TAO_ROOT)/tao/PortableServer/PolicyS.i \ - DomainS_T.h DomainS_T.i DomainS_T.cpp DomainS.i \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ - $(ACE_ROOT)/ace/Map.h \ - $(ACE_ROOT)/ace/Map_T.h \ - $(ACE_ROOT)/ace/Pair.h \ - $(ACE_ROOT)/ace/Pair_T.h \ - $(ACE_ROOT)/ace/Pair_T.i \ - $(ACE_ROOT)/ace/Pair_T.cpp \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -294,49 +265,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Active_Map_Manager.h \ - $(ACE_ROOT)/ace/Active_Map_Manager.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ - $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ - $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ - $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ - $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/TAO_Server_Request.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/Policy_Manager.i \ - $(TAO_ROOT)/tao/Resource_Factory.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/Pluggable.i \ - $(TAO_ROOT)/tao/Protocol_Factory.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ $(TAO_ROOT)/tao/Service_Callbacks.h \ @@ -344,6 +272,14 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ @@ -352,11 +288,20 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -368,6 +313,41 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + DomainS_T.h DomainS_T.i DomainS_T.cpp DomainS.i \ + $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ + $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ + $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ + $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ + $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ + $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.h \ + $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.h \ + $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h \ + $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/Profile.h \ @@ -380,15 +360,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ - $(TAO_ROOT)/tao/RequestInfo_Util.h \ - $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.h \ - $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.h \ - $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.h \ - $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h \ - $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ @@ -400,19 +371,23 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/target_specification.i \ $(TAO_ROOT)/tao/operation_details.i \ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.i \ $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.i \ - $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ - $(ACE_ROOT)/ace/Dynamic_Service.i \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/RequestInfo_Util.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tao/Domain/Makefile.bor b/TAO/tao/Domain/Makefile.bor index 9951fb04250..39b57b69a53 100644 --- a/TAO/tao/Domain/Makefile.bor +++ b/TAO/tao/Domain/Makefile.bor @@ -16,7 +16,7 @@ CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_DOMAIN_CFLAGS) \ CPPDIR = . -INCDIR_NAME = tao\Domain +INCDIR_NAME = tao/Domain INCLUDES = \ *.h *.i diff --git a/TAO/tao/DynamicAny/Makefile b/TAO/tao/DynamicAny/Makefile index df35ecc8f81..97ccb3dffc5 100644 --- a/TAO/tao/DynamicAny/Makefile +++ b/TAO/tao/DynamicAny/Makefile @@ -227,7 +227,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -237,31 +236,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -269,19 +250,29 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ DynamicAnyC.i DynAnyFactory.h .obj/DynAnyFactory.o .obj/DynAnyFactory.so .shobj/DynAnyFactory.o .shobj/DynAnyFactory.so: DynAnyFactory.cpp DynAnyFactory.h \ - $(ACE_ROOT)/ace/pre.h \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h DynamicAny.h \ + dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -445,7 +436,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -455,31 +445,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -487,14 +459,24 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ DynamicAnyC.i DynAny_i.h DynStruct_i.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -508,8 +490,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Auto_Ptr.cpp .obj/DynAny_i.o .obj/DynAny_i.so .shobj/DynAny_i.o .shobj/DynAny_i.so: DynAny_i.cpp DynAny_i.h \ - $(ACE_ROOT)/ace/pre.h \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h DynamicAny.h \ + dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -673,7 +655,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -683,31 +664,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -715,19 +678,29 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ DynamicAnyC.i DynAnyFactory.h .obj/DynStruct_i.o .obj/DynStruct_i.so .shobj/DynStruct_i.o .shobj/DynStruct_i.so: DynStruct_i.cpp DynStruct_i.h \ - $(ACE_ROOT)/ace/pre.h \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h DynamicAny.h \ + dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -891,7 +864,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -901,31 +873,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -933,14 +887,24 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ DynamicAnyC.i \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -976,8 +940,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/OS.i DynamicAny.h \ + dynamicany_export.h \ $(TAO_ROOT)/tao/Object_Loader.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -1117,7 +1081,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -1127,31 +1090,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -1159,14 +1104,24 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ DynamicAnyC.i \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -1178,8 +1133,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Marshal.i .obj/DynEnum_i.o .obj/DynEnum_i.so .shobj/DynEnum_i.o .shobj/DynEnum_i.so: DynEnum_i.cpp DynEnum_i.h \ - $(ACE_ROOT)/ace/pre.h \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h DynamicAny.h \ + dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1343,7 +1298,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -1353,31 +1307,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -1385,14 +1321,24 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ DynamicAnyC.i \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -1402,8 +1348,8 @@ CPPFLAGS += -I$(TAO_ROOT) DynAnyFactory.h .obj/DynArray_i.o .obj/DynArray_i.so .shobj/DynArray_i.o .shobj/DynArray_i.so: DynArray_i.cpp DynArray_i.h \ - $(ACE_ROOT)/ace/pre.h \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h DynamicAny.h \ + dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1567,7 +1513,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -1577,31 +1522,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -1609,14 +1536,24 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ DynamicAnyC.i \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -1628,8 +1565,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Marshal.i .obj/DynUnion_i.o .obj/DynUnion_i.so .shobj/DynUnion_i.o .shobj/DynUnion_i.so: DynUnion_i.cpp DynUnion_i.h \ - $(ACE_ROOT)/ace/pre.h \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h DynamicAny.h \ + dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1793,7 +1730,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -1803,31 +1739,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -1835,14 +1753,24 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ DynamicAnyC.i DynUnion_i_T.h DynUnion_i_T.cpp DynAnyFactory.h \ $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i @@ -2013,7 +1941,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -2023,31 +1950,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -2055,14 +1964,24 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ DynamicAnyC.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tao/DynamicInterface/Makefile b/TAO/tao/DynamicInterface/Makefile index b5b0931a006..c082e7b3a05 100644 --- a/TAO/tao/DynamicInterface/Makefile +++ b/TAO/tao/DynamicInterface/Makefile @@ -196,7 +196,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i @@ -338,7 +337,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ @@ -383,14 +381,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ @@ -449,6 +445,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -508,7 +505,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Message_Queue.i \ $(TAO_ROOT)/tao/Transport.inl \ $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \ - $(TAO_ROOT)/tao/Messaging.h \ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/Asynch_Invocation.i \ Unknown_User_Exception.h dynamicinterface_export.h \ @@ -734,22 +730,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \ - $(TAO_ROOT)/tao/Messaging.h \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ @@ -786,6 +773,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ @@ -812,6 +804,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i @@ -969,34 +962,21 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -1040,6 +1020,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ @@ -1085,6 +1075,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -1228,8 +1219,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -1237,14 +1226,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ @@ -1324,14 +1314,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ @@ -1375,6 +1363,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -1681,34 +1670,21 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -1739,6 +1715,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ @@ -1784,6 +1770,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -1843,7 +1830,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Message_Queue.i \ $(TAO_ROOT)/tao/Transport.inl \ $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \ - $(TAO_ROOT)/tao/Messaging.h \ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/Asynch_Invocation.i \ Unknown_User_Exception.h DII_Reply_Dispatcher.h DII_Invocation.inl \ @@ -2029,7 +2015,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Marshal.i diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index 61fc4bee536..8379a76b583 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -11,16 +11,43 @@ ACE_RCSID(tao, Environment, "$Id$") +#if 0 CORBA_Environment::CORBA_Environment (void) - : exception_ (0) - , previous_ (0) + : exception_ (0), + previous_ (TAO_ORB_Core_instance ()->default_environment ()) +{ + TAO_ORB_Core_instance ()->default_environment (this); +} + +CORBA_Environment::CORBA_Environment (const CORBA_Environment& rhs) + : exception_ (rhs.exception_), + previous_ (TAO_ORB_Core_instance ()->default_environment ()) +{ + TAO_ORB_Core_instance ()->default_environment (this); + exception_->_incr_refcnt (); +} + +CORBA_Environment::CORBA_Environment (TAO_ORB_Core* orb_core) + : exception_ (0), + previous_ (orb_core->default_environment ()) +{ + orb_core->default_environment (this); +} + +#else + +CORBA_Environment::CORBA_Environment (void) + : exception_ (0), + previous_ (0), + refcount_ (1) { // TAO_ORB_Core_instance ()->default_environment (this); } CORBA_Environment::CORBA_Environment (const CORBA_Environment& rhs) - : exception_ (rhs.exception_) - , previous_ (0) + : exception_ (rhs.exception_), + previous_ (0), + refcount_ (1) { // TAO_ORB_Core_instance ()->default_environment (this); if (this->exception_) @@ -28,11 +55,34 @@ CORBA_Environment::CORBA_Environment (const CORBA_Environment& rhs) } CORBA_Environment::CORBA_Environment (TAO_ORB_Core* orb_core) - : exception_ (0) - , previous_ (orb_core->default_environment ()) + : exception_ (0), + previous_ (orb_core->default_environment ()) { orb_core->default_environment (this); } +#endif /* 0 */ + +CORBA::ULong +CORBA_Environment::_incr_refcnt (void) +{ + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); + return refcount_++; +} + +CORBA::ULong +CORBA_Environment::_decr_refcnt (void) +{ + { + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); + + this->refcount_--; + if (this->refcount_ != 0) + return this->refcount_; + } + + delete this; + return 0; +} CORBA_Environment& CORBA_Environment::operator= (const CORBA_Environment& rhs) diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h index 993227d8983..79366961e9f 100644 --- a/TAO/tao/Environment.h +++ b/TAO/tao/Environment.h @@ -100,6 +100,10 @@ public: // = Obtain a default environment to use with TAO. static CORBA_Environment &default_environment (void); + // = Reference counting. + CORBA::ULong _incr_refcnt (void); + CORBA::ULong _decr_refcnt (void); + #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 typedef CORBA_Environment_ptr _ptr_type; typedef CORBA_Environment_var _var_type; @@ -118,6 +122,12 @@ private: /// The previous environment on the "default environment stack". CORBA_Environment *previous_; + + /// Reference counting. + CORBA::ULong refcount_; + + /// Protect the reference count. + TAO_SYNCH_MUTEX refcount_lock_; }; /** diff --git a/TAO/tao/Environment.i b/TAO/tao/Environment.i index 1b03dda71ef..68b8940a38f 100644 --- a/TAO/tao/Environment.i +++ b/TAO/tao/Environment.i @@ -10,9 +10,8 @@ CORBA::is_nil (CORBA::Environment_ptr env) ACE_INLINE void CORBA::release (CORBA::Environment_ptr env) { - if (env == 0) - return; - delete env; + if (env) + env->_decr_refcnt (); } ACE_INLINE CORBA_Exception* @@ -24,9 +23,9 @@ CORBA_Environment::exception (void) const ACE_INLINE CORBA_Environment * CORBA_Environment::_duplicate (CORBA_Environment *x) { - if (x == 0) - return 0; - return new CORBA_Environment (*x); + if (x != 0) + x->_incr_refcnt (); + return x; } ACE_INLINE CORBA_Environment_ptr diff --git a/TAO/tao/Flushing_Strategy.cpp b/TAO/tao/Flushing_Strategy.cpp new file mode 100644 index 00000000000..82a66ec1427 --- /dev/null +++ b/TAO/tao/Flushing_Strategy.cpp @@ -0,0 +1,10 @@ +// -*- C++ -*- +// $Id$ + +#include "Flushing_Strategy.h" + +ACE_RCSID(tao, Flushing_Strategy, "$Id$") + +TAO_Flushing_Strategy::~TAO_Flushing_Strategy (void) +{ +} diff --git a/TAO/tao/Flushing_Strategy.h b/TAO/tao/Flushing_Strategy.h new file mode 100644 index 00000000000..0873936ccf4 --- /dev/null +++ b/TAO/tao/Flushing_Strategy.h @@ -0,0 +1,69 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file Flushing_Strategy.h + * + * $Id$ + * + * @author Carlos O'Ryan <coryan@uci.edu> + */ +//============================================================================= + +#ifndef TAO_FLUSHING_STRATEGY_H +#define TAO_FLUSHING_STRATEGY_H +#include "ace/pre.h" + +#include "corbafwd.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class TAO_Transport; +class TAO_Queued_Message; + +/** + * @class TAO_Flushing_Strategy + * + * @brief Define the interface for the flushing strategy, i.e. the + * algorithm that controls how does the ORB flush outgoing + * data. + * + * Please read the documentation in the TAO_Transport class to find + * out more about the design of the outgoing data path. + * + * Some applications can block the current thread whenever they are + * sending out data. In those cases they can obtain better + * performance by blocking in calls to write() than by participating + * in the Leader/Followers protocol to shared the ORB Reactor. + * + * This strategy controls how does the ORB schedule and cancel + * reactive I/O, if there is no reactive I/O the strategy is just a + * no-op. + * + */ +class TAO_Export TAO_Flushing_Strategy +{ +public: + /// Destructor + virtual ~TAO_Flushing_Strategy (void); + + /// Schedule the transport argument to be flushed + virtual int schedule_output (TAO_Transport *transport) = 0; + + /// Cancel all scheduled output for the transport argument + virtual int cancel_output (TAO_Transport *transport) = 0; + + /// Wait until msg is sent out. Potentially other messages are + /// flushed too, for example, because there are ahead in the queue. + virtual int flush_message (TAO_Transport *transport, + TAO_Queued_Message *msg, + ACE_Time_Value *max_wait_time) = 0; + + /// Wait until the transport has no messages queued. + virtual int flush_transport (TAO_Transport *transport) = 0; +}; + +#include "ace/post.h" +#endif /* TAO_FLUSHING_STRATEGY_H */ diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 7299518bdcb..f8cf0afe7af 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -15,9 +15,7 @@ # include "GIOP_Message_Base.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - GIOP_Message_Base, - "$Id$") +ACE_RCSID(tao, GIOP_Message_Base, "$Id$") TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core, size_t input_cdr_size) @@ -31,18 +29,18 @@ TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core, { #if defined(ACE_HAS_PURIFY) (void) ACE_OS::memset (this->repbuf_, - '\0', - sizeof this->repbuf_); + '\0', + sizeof this->repbuf_); #endif /* ACE_HAS_PURIFY */ ACE_NEW (this->output_, - TAO_OutputCDR (this->repbuf_, - sizeof this->repbuf_, - TAO_ENCAP_BYTE_ORDER, - this->cdr_buffer_alloc_, - this->cdr_dblock_alloc_, - orb_core->orb_params ()->cdr_memcpy_tradeoff (), - orb_core->to_iso8859 (), - orb_core->to_unicode ())); + TAO_OutputCDR (this->repbuf_, + sizeof this->repbuf_, + TAO_ENCAP_BYTE_ORDER, + this->cdr_buffer_alloc_, + this->cdr_dblock_alloc_, + orb_core->orb_params ()->cdr_memcpy_tradeoff (), + orb_core->to_iso8859 (), + orb_core->to_unicode ())); } @@ -65,11 +63,11 @@ TAO_GIOP_Message_Base::~TAO_GIOP_Message_Base (void) void TAO_GIOP_Message_Base::init (CORBA::Octet major, - CORBA::Octet minor) + CORBA::Octet minor) { // Set the state this->set_state (major, - minor); + minor); } @@ -89,24 +87,24 @@ TAO_GIOP_Message_Base::generate_request_header ( { // Write the GIOP header first if (!this->write_protocol_header (TAO_GIOP_REQUEST, - cdr)) + cdr)) { if (TAO_debug_level > 3) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) Error in writing GIOP header \n")), - -1); + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("(%P|%t) Error in writing GIOP header \n")), + -1); } // Now call the implementation for the rest of the header if (!this->generator_parser_->write_request_header (op, - spec, - cdr)) + spec, + cdr)) { if (TAO_debug_level > 4) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) Error in writing request header \n")), - -1); + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("(%P|%t) Error in writing request header \n")), + -1); } return 0; @@ -121,12 +119,12 @@ TAO_GIOP_Message_Base::generate_locate_request_header ( { // Write the GIOP header first if (!this->write_protocol_header (TAO_GIOP_LOCATEREQUEST, - cdr)) + cdr)) { if (TAO_debug_level > 3) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) Error in writing GIOP header \n")), - -1); + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("(%P|%t) Error in writing GIOP header \n")), + -1); } @@ -137,9 +135,9 @@ TAO_GIOP_Message_Base::generate_locate_request_header ( cdr)) { if (TAO_debug_level > 4) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) Error in writing locate request header \n")), - -1); + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("(%P|%t) Error in writing locate request header \n")), + -1); } return 0; @@ -151,22 +149,22 @@ TAO_GIOP_Message_Base::generate_reply_header (TAO_OutputCDR &cdr, { // Write the GIOP header first if (!this->write_protocol_header (TAO_GIOP_REPLY, - cdr)) + cdr)) { if (TAO_debug_level > 3) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) Error in writing GIOP header \n")), - -1); + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("(%P|%t) Error in writing GIOP header \n")), + -1); } // Now call the implementation for the rest of the header if (!this->generator_parser_->write_reply_header (cdr, - params)) + params)) { if (TAO_debug_level > 4) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) Error in writing reply header \n")), - -1); + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("(%P|%t) Error in writing reply header \n")), + -1); } return 0; @@ -175,15 +173,13 @@ TAO_GIOP_Message_Base::generate_reply_header (TAO_OutputCDR &cdr, int TAO_GIOP_Message_Base::read_message (TAO_Transport *transport, - int /*block */, - ACE_Time_Value * /*max_wait_time*/) + int /*block */, + ACE_Time_Value * /*max_wait_time*/) { // Call the handler to read and do a simple parse of the header of // the message. - int retval = this->message_handler_.read_parse_message (transport); - - if (retval < 1) - return retval; + if (this->message_handler_.read_parse_message (transport) == -1) + return -1; // Get the message state TAO_GIOP_Message_State &state = @@ -191,9 +187,9 @@ TAO_GIOP_Message_Base::read_message (TAO_Transport *transport, // Set the state internally for parsing and generating messages this->set_state (state.giop_version.major, - state.giop_version.minor); + state.giop_version.minor); - retval = this->message_handler_.is_message_ready (transport); + int retval = this->message_handler_.is_message_ready (transport); return retval; } @@ -219,15 +215,15 @@ TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream) #if !defined (ACE_ENABLE_SWAP_ON_WRITE) *ACE_reinterpret_cast (CORBA::ULong *, buf + - TAO_GIOP_MESSAGE_SIZE_OFFSET) = bodylen; + TAO_GIOP_MESSAGE_SIZE_OFFSET) = bodylen; #else if (!stream.do_byte_swap ()) *ACE_reinterpret_cast (CORBA::ULong *, - buf + TAO_GIOP_MESSAGE_SIZE_OFFSET) = bodylen; + buf + TAO_GIOP_MESSAGE_SIZE_OFFSET) = bodylen; else ACE_CDR::swap_4 (ACE_reinterpret_cast (char *, - &bodylen), - buf + TAO_GIOP_MESSAGE_SIZE_OFFSET); + &bodylen), + buf + TAO_GIOP_MESSAGE_SIZE_OFFSET); #endif /* ACE_ENABLE_SWAP_ON_WRITE */ if (TAO_debug_level > 2) @@ -237,16 +233,16 @@ TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream) // dumped ACE_Message_Block* consolidated_block = 0; if (stream.begin()->cont () != 0) - { - consolidated_block = new ACE_Message_Block; - ACE_CDR::consolidate (consolidated_block, stream.begin ()); - buf = (char *) (consolidated_block->rd_ptr ()); - } + { + consolidated_block = new ACE_Message_Block; + ACE_CDR::consolidate (consolidated_block, stream.begin ()); + buf = (char *) (consolidated_block->rd_ptr ()); + } /// this->dump_msg ("send", - ACE_reinterpret_cast (u_char *, - buf), - total_len); + ACE_reinterpret_cast (u_char *, + buf), + total_len); // delete consolidated_block; @@ -278,9 +274,9 @@ TAO_GIOP_Message_Base::message_type (void) case TAO_GIOP_FRAGMENT: // Never happens: why?? default: - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) %N:%l message_type : ") - ACE_TEXT ("wrong message.\n"))); + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("TAO (%P|%t) %N:%l message_type : ") + ACE_TEXT ("wrong message.\n"))); } return TAO_PLUGGABLE_MESSAGE_MESSAGERROR; @@ -288,7 +284,7 @@ TAO_GIOP_Message_Base::message_type (void) int TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport, - TAO_ORB_Core *orb_core) + TAO_ORB_Core *orb_core) { // Set the upcall thread orb_core->leader_follower ().set_upcall_thread (); @@ -320,8 +316,8 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport, // Steal the input CDR from the message block TAO_InputCDR input_cdr (&msg_block, - this->message_handler_.message_state ().byte_order, - orb_core); + this->message_handler_.message_state ().byte_order, + orb_core); // input_cdr.skip_bytes (TAO_GIOP_MESSAGE_HEADER_LEN); @@ -342,13 +338,13 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport, // could raise an exception or write things in the output CDR // stream return this->process_request (transport, - orb_core, - input_cdr); + orb_core, + input_cdr); case TAO_GIOP_LOCATEREQUEST: return this->process_locate_request (transport, - orb_core, - input_cdr); + orb_core, + input_cdr); default: return -1; } @@ -388,13 +384,13 @@ TAO_GIOP_Message_Base::process_reply_message ( case TAO_GIOP_REPLY: // Should be taken care by the state specific parsing return this->generator_parser_->parse_reply (input_cdr, - params); + params); case TAO_GIOP_LOCATEREPLY: return this->generator_parser_->parse_locate_reply (input_cdr, - params); + params); default: - return -1; + return -1; } } @@ -411,7 +407,7 @@ TAO_GIOP_Message_Base::generate_exception_reply (TAO_OutputCDR &cdr, { // Make the GIOP & reply header. this->generate_reply_header (cdr, - params); + params); x._tao_encode (cdr, ACE_TRY_ENV); ACE_TRY_CHECK; } @@ -422,8 +418,8 @@ TAO_GIOP_Message_Base::generate_exception_reply (TAO_OutputCDR &cdr, // Close the handle. ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t|%N|%l) cannot marshal exception, ") - ACE_TEXT ("generate_exception_reply ()"))); + ACE_TEXT ("(%P|%t|%N|%l) cannot marshal exception, ") + ACE_TEXT ("generate_exception_reply ()"))); return -1; } ACE_ENDTRY; @@ -472,16 +468,16 @@ TAO_GIOP_Message_Base::write_protocol_header (TAO_GIOP_Message_Type t, int TAO_GIOP_Message_Base::process_request (TAO_Transport *transport, - TAO_ORB_Core *orb_core, - TAO_InputCDR &cdr) + TAO_ORB_Core *orb_core, + TAO_InputCDR &cdr) { // This will extract the request header, set <response_required> // and <sync_with_server> as appropriate. TAO_ServerRequest request (this, - cdr, - *this->output_, - transport, - orb_core); + cdr, + *this->output_, + transport, + orb_core); CORBA::ULong request_id = 0; CORBA::Boolean response_required = 0; @@ -492,12 +488,12 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport, ACE_TRY { parse_error = - this->generator_parser_->parse_request_header (request); + this->generator_parser_->parse_request_header (request); // Throw an exception if the if (parse_error != 0) - ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, - CORBA::COMPLETED_NO)); + ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + CORBA::COMPLETED_NO)); request_id = request.request_id (); response_required = request.response_expected (); @@ -506,44 +502,44 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport, // Do this before the reply is sent. orb_core->adapter_registry ()->dispatch (request.object_key (), - request, - 0, - forward_to, - ACE_TRY_ENV); + request, + 0, + forward_to, + ACE_TRY_ENV); ACE_TRY_CHECK; if (!CORBA::is_nil (forward_to.in ())) - { - // We should forward to another object... - TAO_Pluggable_Reply_Params reply_params (orb_core); - reply_params.request_id_ = request_id; - reply_params.reply_status_ = TAO_GIOP_LOCATION_FORWARD; - reply_params.svc_ctx_.length (0); - - // Send back the reply service context. - reply_params.service_context_notowned (&request.reply_service_info ()); - - // Make the GIOP header and Reply header - this->generate_reply_header (*this->output_, - reply_params); - - *this->output_ << forward_to.in (); - - int result = transport->send_message (*this->output_); - if (result == -1) - { - if (TAO_debug_level > 0) - { - // No exception but some kind of error, yet a - // response is required. - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ") - ACE_TEXT ("cannot send reply\n"), - ACE_TEXT ("TAO_GIOP::process_server_message"))); - } - } - return result; - } + { + // We should forward to another object... + TAO_Pluggable_Reply_Params reply_params (orb_core); + reply_params.request_id_ = request_id; + reply_params.reply_status_ = TAO_GIOP_LOCATION_FORWARD; + reply_params.svc_ctx_.length (0); + + // Send back the reply service context. + reply_params.service_context_notowned (&request.reply_service_info ()); + + // Make the GIOP header and Reply header + this->generate_reply_header (*this->output_, + reply_params); + + *this->output_ << forward_to.in (); + + int result = transport->send_message (*this->output_); + if (result == -1) + { + if (TAO_debug_level > 0) + { + // No exception but some kind of error, yet a + // response is required. + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ") + ACE_TEXT ("cannot send reply\n"), + ACE_TEXT ("TAO_GIOP::process_server_message"))); + } + } + return result; + } } // Only CORBA exceptions are caught here. ACE_CATCHANY @@ -551,42 +547,42 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport, int result = 0; if (response_required) - { - result = this->send_reply_exception (transport, - orb_core, - request_id, - &request.reply_service_info (), - &ACE_ANY_EXCEPTION); - if (result == -1) - { - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ") - ACE_TEXT ("cannot send exception\n"), - ACE_TEXT ("process_connector_request ()"))); - } - - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "TAO: "); - } - - } + { + result = this->send_reply_exception (transport, + orb_core, + request_id, + &request.reply_service_info (), + &ACE_ANY_EXCEPTION); + if (result == -1) + { + if (TAO_debug_level > 0) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ") + ACE_TEXT ("cannot send exception\n"), + ACE_TEXT ("process_connector_request ()"))); + } + + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "TAO: "); + } + + } else if (TAO_debug_level > 0) - { - // It is unfotunate that an exception (probably a system - // exception) was thrown by the upcall code (even by the - // user) when the client was not expecting a response. - // However, in this case, we cannot close the connection - // down, since it really isn't the client's fault. + { + // It is unfotunate that an exception (probably a system + // exception) was thrown by the upcall code (even by the + // user) when the client was not expecting a response. + // However, in this case, we cannot close the connection + // down, since it really isn't the client's fault. - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) exception thrown ") - ACE_TEXT ("but client is not waiting a response\n"))); + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("(%P|%t) exception thrown ") + ACE_TEXT ("but client is not waiting a response\n"))); - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "TAO: "); - } + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "TAO: "); + } return result; } @@ -603,40 +599,40 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport, int result = 0; if (response_required) - { - CORBA::UNKNOWN exception (CORBA::SystemException::_tao_minor_code + { + CORBA::UNKNOWN exception (CORBA::SystemException::_tao_minor_code (TAO_UNHANDLED_SERVER_CXX_EXCEPTION, 0), CORBA::COMPLETED_MAYBE); - result = this->send_reply_exception (transport, - orb_core, - request_id, - &request.reply_service_info (), - &exception); - if (result == -1) - { - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ") - ACE_TEXT ("cannot send exception\n"), - ACE_TEXT ("process_connector_request ()"))); - } - - ACE_PRINT_EXCEPTION (exception, "TAO: "); - } - } + result = this->send_reply_exception (transport, + orb_core, + request_id, + &request.reply_service_info (), + &exception); + if (result == -1) + { + if (TAO_debug_level > 0) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ") + ACE_TEXT ("cannot send exception\n"), + ACE_TEXT ("process_connector_request ()"))); + } + + ACE_PRINT_EXCEPTION (exception, "TAO: "); + } + } else if (TAO_debug_level > 0) - { - // It is unfotunate that an exception (probably a system - // exception) was thrown by the upcall code (even by the - // user) when the client was not expecting a response. - // However, in this case, we cannot close the connection - // down, since it really isn't the client's fault. - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t|%N|%l) exception thrown ") - ACE_TEXT ("but client is not waiting a response\n"))); - } + { + // It is unfotunate that an exception (probably a system + // exception) was thrown by the upcall code (even by the + // user) when the client was not expecting a response. + // However, in this case, we cannot close the connection + // down, since it really isn't the client's fault. + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("(%P|%t|%N|%l) exception thrown ") + ACE_TEXT ("but client is not waiting a response\n"))); + } return result; } @@ -649,13 +645,13 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport, int TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, - TAO_ORB_Core* orb_core, - TAO_InputCDR &input) + TAO_ORB_Core* orb_core, + TAO_InputCDR &input) { // This will extract the request header, set <response_required> as // appropriate. TAO_GIOP_Locate_Request_Header locate_request (input, - orb_core); + orb_core); TAO_GIOP_Locate_Status_Msg status_info; @@ -668,25 +664,25 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, ACE_TRY { int parse_error = - this->generator_parser_->parse_locate_header (locate_request); + this->generator_parser_->parse_locate_header (locate_request); if (parse_error != 0) - { - ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, - CORBA::COMPLETED_NO)); - } + { + ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + CORBA::COMPLETED_NO)); + } // Execute a fake request to find out if the object is there or // if the POA can activate it on demand... char repbuf[ACE_CDR::DEFAULT_BUFSIZE]; TAO_OutputCDR dummy_output (repbuf, - sizeof repbuf); + sizeof repbuf); // This output CDR is not used! TAO_ObjectKey tmp_key (locate_request.object_key ().length (), - locate_request.object_key ().length (), - locate_request.object_key ().get_buffer (), - 0); + locate_request.object_key ().length (), + locate_request.object_key ().get_buffer (), + 0); // Set it to an error state parse_error = 1; @@ -696,64 +692,64 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, // the reply CORBA::Boolean deferred_reply = 1; TAO_ServerRequest server_request (this, - req_id, - response_required, - deferred_reply, - tmp_key, - "_non_existent", - dummy_output, - transport, - orb_core, - parse_error); + req_id, + response_required, + deferred_reply, + tmp_key, + "_non_existent", + dummy_output, + transport, + orb_core, + parse_error); if (parse_error != 0) - { - ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, - CORBA::COMPLETED_NO)); - } + { + ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + CORBA::COMPLETED_NO)); + } CORBA::Object_var forward_to; orb_core->adapter_registry ()->dispatch (server_request.object_key (), - server_request, - 0, - forward_to, - ACE_TRY_ENV); + server_request, + 0, + forward_to, + ACE_TRY_ENV); ACE_TRY_CHECK; if (!CORBA::is_nil (forward_to.in ())) - { - status_info.status = TAO_GIOP_OBJECT_FORWARD; - status_info.forward_location_var = forward_to; - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("handle_locate has been called: forwarding\n"))); - } + { + status_info.status = TAO_GIOP_OBJECT_FORWARD; + status_info.forward_location_var = forward_to; + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("handle_locate has been called: forwarding\n"))); + } else if (server_request.exception_type () == TAO_GIOP_NO_EXCEPTION) - { - // We got no exception, so the object is here. - status_info.status = TAO_GIOP_OBJECT_HERE; - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO: (%P|%t) handle_locate() : found\n"))); - } + { + // We got no exception, so the object is here. + status_info.status = TAO_GIOP_OBJECT_HERE; + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO: (%P|%t) handle_locate() : found\n"))); + } else - { - status_info.forward_location_var = server_request.forward_location (); - - if (!CORBA::is_nil (status_info.forward_location_var.in ())) - { - status_info.status = TAO_GIOP_OBJECT_FORWARD; - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("handle_locate has been called: forwarding\n"))); - } - else - { - // Normal exception, so the object is not here - status_info.status = TAO_GIOP_UNKNOWN_OBJECT; - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("handle_locate has been called: not here\n"))); - } - } + { + status_info.forward_location_var = server_request.forward_location (); + + if (!CORBA::is_nil (status_info.forward_location_var.in ())) + { + status_info.status = TAO_GIOP_OBJECT_FORWARD; + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("handle_locate has been called: forwarding\n"))); + } + else + { + // Normal exception, so the object is not here + status_info.status = TAO_GIOP_UNKNOWN_OBJECT; + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("handle_locate has been called: not here\n"))); + } + } } ACE_CATCHANY @@ -761,9 +757,9 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, // Normal exception, so the object is not here status_info.status = TAO_GIOP_UNKNOWN_OBJECT; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) TAO_GIOP::process_server_locate - ") - ACE_TEXT ("CORBA exception raised\n"))); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO (%P|%t) TAO_GIOP::process_server_locate - ") + ACE_TEXT ("CORBA exception raised\n"))); } #if defined (TAO_HAS_EXCEPTIONS) ACE_CATCHALL @@ -771,16 +767,16 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, // Normal exception, so the object is not here status_info.status = TAO_GIOP_UNKNOWN_OBJECT; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) TAO_GIOP::process_server_locate - ") - ACE_TEXT ("C++ exception raised\n"))); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO (%P|%t) TAO_GIOP::process_server_locate - ") + ACE_TEXT ("C++ exception raised\n"))); } #endif /* TAO_HAS_EXCEPTIONS */ ACE_ENDTRY; return this->make_send_locate_reply (transport, - locate_request, - status_info); + locate_request, + status_info); } int @@ -792,12 +788,12 @@ TAO_GIOP_Message_Base::make_send_locate_reply (TAO_Transport *transport, // different from the reply header made by the make_reply () call.. // Make the GIOP message header this->write_protocol_header (TAO_GIOP_LOCATEREPLY, - *this->output_); + *this->output_); // This writes the header & body this->generator_parser_->write_locate_reply_mesg (*this->output_, - request.request_id (), - status_info); + request.request_id (), + status_info); // Send the message int result = transport->send_message (*this->output_); @@ -806,11 +802,11 @@ TAO_GIOP_Message_Base::make_send_locate_reply (TAO_Transport *transport, if (result == -1) { if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO: (%P|%t) %p: cannot send reply\n"), - ACE_TEXT ("TAO_GIOP::process_server_message"))); - } + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("TAO: (%P|%t) %p: cannot send reply\n"), + ACE_TEXT ("TAO_GIOP::process_server_message"))); + } } return result; @@ -841,29 +837,30 @@ TAO_GIOP_Message_Base::send_error (TAO_Transport *transport) }; // @@ Q: How does this works with GIOP lite? - // A: It doesn't + // A: It doesn't this->dump_msg ("send_error", - (const u_char *) error_message, - TAO_GIOP_MESSAGE_HEADER_LEN); + (const u_char *) error_message, + TAO_GIOP_MESSAGE_HEADER_LEN); ACE_Data_Block data_block (TAO_GIOP_MESSAGE_HEADER_LEN, - ACE_Message_Block::MB_DATA, - error_message, - 0, - 0, - ACE_Message_Block::DONT_DELETE, - 0); + ACE_Message_Block::MB_DATA, + error_message, + 0, + 0, + ACE_Message_Block::DONT_DELETE, + 0); ACE_Message_Block message_block(&data_block); message_block.wr_ptr (TAO_GIOP_MESSAGE_HEADER_LEN); - int result = transport->send (&message_block); + size_t bt; + int result = transport->send_message_block_chain (&message_block, bt); if (result == -1) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%N|%l|%P|%t) error sending error to transport %lu\n"), - transport->id ())); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO (%N|%l|%P|%t) error sending error to transport %lu\n"), + transport->id ())); } return result; @@ -871,7 +868,7 @@ TAO_GIOP_Message_Base::send_error (TAO_Transport *transport) void TAO_GIOP_Message_Base::set_state (CORBA::Octet def_major, - CORBA::Octet def_minor) + CORBA::Octet def_minor) { // @@Bala Need to find a better way // @@ Bala: what about a table: @@ -888,22 +885,22 @@ TAO_GIOP_Message_Base::set_state (CORBA::Octet def_major, { case 1: switch (def_minor) - { - case 0: - this->generator_parser_ = - &this->tao_giop_impl_.tao_giop_10; - break; - case 1: - this->generator_parser_ = - &this->tao_giop_impl_.tao_giop_11; - break; - case 2: - this->generator_parser_ = - &this->tao_giop_impl_.tao_giop_12; - break; - default: - break; - } + { + case 0: + this->generator_parser_ = + &this->tao_giop_impl_.tao_giop_10; + break; + case 1: + this->generator_parser_ = + &this->tao_giop_impl_.tao_giop_11; + break; + case 2: + this->generator_parser_ = + &this->tao_giop_impl_.tao_giop_12; + break; + default: + break; + } break; default: break; @@ -929,8 +926,8 @@ TAO_GIOP_Message_Base::set_state (CORBA::Octet def_major, void TAO_GIOP_Message_Base:: send_close_connection (const TAO_GIOP_Version &version, - TAO_Transport *transport, - void *) + TAO_Transport *transport, + void *) { // static CORBA::Octet @@ -958,8 +955,8 @@ TAO_GIOP_Message_Base:: // that this won't block (long) since we never set SO_LINGER this->dump_msg ("send_close_connection", - (const u_char *) close_message, - TAO_GIOP_MESSAGE_HEADER_LEN); + (const u_char *) close_message, + TAO_GIOP_MESSAGE_HEADER_LEN); #if 0 // @@CJC I don't think we need this check b/c the transport's send() @@ -973,35 +970,37 @@ TAO_GIOP_Message_Base:: if (which == ACE_INVALID_HANDLE) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) TAO_GIOP::send_close_connection -" - " connection already closed\n")); + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) TAO_GIOP::send_close_connection -" + " connection already closed\n")); return; } #endif ACE_Data_Block data_block (TAO_GIOP_MESSAGE_HEADER_LEN, - ACE_Message_Block::MB_DATA, - close_message, - 0, - 0, - ACE_Message_Block::DONT_DELETE, - 0); + ACE_Message_Block::MB_DATA, + close_message, + 0, + 0, + ACE_Message_Block::DONT_DELETE, + 0); ACE_Message_Block message_block(&data_block); message_block.wr_ptr (TAO_GIOP_MESSAGE_HEADER_LEN); - if (transport->send (&message_block) == -1 && errno != ENOENT) + size_t bt; + int result = transport->send_message_block_chain (&message_block, bt); + if (result == -1) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, - "(%P|%t) error closing connection %lu, errno = %d\n", - transport->id (), errno)); + ACE_ERROR ((LM_ERROR, + "(%P|%t) error closing connection %lu, errno = %d\n", + transport->id (), errno)); } transport->close_connection (); ACE_DEBUG ((LM_DEBUG, - "(%P|%t) shut down transport, handle %d\n", - transport-> id ())); + "(%P|%t) shut down transport, handle %d\n", + transport-> id ())); } @@ -1019,17 +1018,17 @@ TAO_GIOP_Message_Base::send_reply_exception ( char repbuf[ACE_CDR::DEFAULT_BUFSIZE]; #if defined(ACE_HAS_PURIFY) (void) ACE_OS::memset (repbuf, - '\0', - sizeof repbuf); + '\0', + sizeof repbuf); #endif /* ACE_HAS_PURIFY */ TAO_OutputCDR output (repbuf, - sizeof repbuf, - TAO_ENCAP_BYTE_ORDER, - orb_core->output_cdr_buffer_allocator (), - orb_core->output_cdr_dblock_allocator (), - orb_core->orb_params ()->cdr_memcpy_tradeoff (), - orb_core->to_iso8859 (), - orb_core->to_unicode ()); + sizeof repbuf, + TAO_ENCAP_BYTE_ORDER, + orb_core->output_cdr_buffer_allocator (), + orb_core->output_cdr_dblock_allocator (), + orb_core->orb_params ()->cdr_memcpy_tradeoff (), + orb_core->to_iso8859 (), + orb_core->to_unicode ()); TAO_Pluggable_Reply_Params reply_params (orb_core); reply_params.request_id_ = request_id; @@ -1050,8 +1049,8 @@ TAO_GIOP_Message_Base::send_reply_exception ( } if (this->generate_exception_reply (output, - reply_params, - *x) == -1) + reply_params, + *x) == -1) return -1; return transport->send_message (output); @@ -1059,8 +1058,8 @@ TAO_GIOP_Message_Base::send_reply_exception ( void TAO_GIOP_Message_Base::dump_msg (const char *label, - const u_char *ptr, - size_t len) + const u_char *ptr, + size_t len) { if (TAO_debug_level >= 5) @@ -1068,21 +1067,21 @@ TAO_GIOP_Message_Base::dump_msg (const char *label, static const char digits[] = "0123456789ABCD"; static const char *names[] = { - "Request", - "Reply", - "CancelRequest", - "LocateRequest", - "LocateReply", - "CloseConnection", + "Request", + "Reply", + "CancelRequest", + "LocateRequest", + "LocateReply", + "CloseConnection", "MessageError", - "Fragment" + "Fragment" }; // Message name. const char *message_name = "UNKNOWN MESSAGE"; u_long slot = ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET]; if (slot < sizeof (names) / sizeof (names[0])) - message_name = names[slot]; + message_name = names[slot]; // Byte order. int byte_order = ptr[TAO_GIOP_MESSAGE_FLAGS_OFFSET] & 0x01; @@ -1092,39 +1091,39 @@ TAO_GIOP_Message_Base::dump_msg (const char *label, CORBA::ULong *id = &tmp; if (ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REQUEST || - ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REPLY) - { - // @@ Only works if ServiceContextList is empty.... - if (this->generator_parser_->minor_version () < 2) - { - id = ACE_reinterpret_cast (CORBA::ULong *, - (char * ) (ptr + TAO_GIOP_MESSAGE_HEADER_LEN + 4)); - - } - else - { - id = ACE_reinterpret_cast (CORBA::ULong *, - (char * ) (ptr + TAO_GIOP_MESSAGE_HEADER_LEN)); - } - } + ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REPLY) + { + // @@ Only works if ServiceContextList is empty.... + if (this->generator_parser_->minor_version () < 2) + { + id = ACE_reinterpret_cast (CORBA::ULong *, + (char * ) (ptr + TAO_GIOP_MESSAGE_HEADER_LEN + 4)); + + } + else + { + id = ACE_reinterpret_cast (CORBA::ULong *, + (char * ) (ptr + TAO_GIOP_MESSAGE_HEADER_LEN)); + } + } // Print. ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P | %t): %s GIOP v%c.%c msg, ") - ACE_TEXT ("%d data bytes, %s endian, %s = %u\n"), - label, - digits[ptr[TAO_GIOP_VERSION_MAJOR_OFFSET]], - digits[ptr[TAO_GIOP_VERSION_MINOR_OFFSET]], - len - TAO_GIOP_MESSAGE_HEADER_LEN , - (byte_order == TAO_ENCAP_BYTE_ORDER) ? "my" : "other", - message_name, - *id)); + ACE_TEXT ("(%P | %t): %s GIOP v%c.%c msg, ") + ACE_TEXT ("%d data bytes, %s endian, %s = %u\n"), + label, + digits[ptr[TAO_GIOP_VERSION_MAJOR_OFFSET]], + digits[ptr[TAO_GIOP_VERSION_MINOR_OFFSET]], + len - TAO_GIOP_MESSAGE_HEADER_LEN , + (byte_order == TAO_ENCAP_BYTE_ORDER) ? "my" : "other", + message_name, + *id)); if (TAO_debug_level >= 10) - ACE_HEX_DUMP ((LM_DEBUG, - (const char *) ptr, - len, - ACE_TEXT ("GIOP message"))); + ACE_HEX_DUMP ((LM_DEBUG, + (const char *) ptr, + len, + ACE_TEXT ("GIOP message"))); } } @@ -1160,7 +1159,7 @@ TAO_GIOP_Message_Base::more_messages (void) // Set the state internally for parsing and generating messages this->set_state (state.giop_version.major, - state.giop_version.minor); + state.giop_version.minor); // retval = this->message_handler_.is_message_ready (); diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp index 71e3cf4ab2b..9fe9c00df50 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp @@ -326,6 +326,8 @@ TAO_GIOP_Message_Generator_Parser_10::parse_request_header ( hdr_status = this->unmarshall_object_key (request.object_key (), input); + ACE_CString operation_name; + if (input.char_translator () == 0) { CORBA::ULong length = 0; @@ -336,12 +338,10 @@ TAO_GIOP_Message_Generator_Parser_10::parse_request_header ( // Do not include NULL character at the end. // @@ This is not getting demarshaled using the codeset // translators! - - // Notice that there are no memory allocations involved - // here! - request.operation (input.rd_ptr (), - length - 1, - 0 /* TAO_ServerRequest does NOT own string */); + operation_name.set (input.rd_ptr (), + length - 1, + 0); + request.operation (operation_name); hdr_status = input.skip_bytes (length); } } @@ -354,10 +354,8 @@ TAO_GIOP_Message_Generator_Parser_10::parse_request_header ( // ISO8859-1. CORBA::String_var tmp; hdr_status = hdr_status && input.read_string (tmp.inout ()); - - request.operation (tmp._retn (), - 0, - 1 /* TAO_ServerRequest owns string */); + operation_name.set (tmp._retn (), 1); + request.operation (operation_name); } if (hdr_status) diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp index b8fdb450584..26fceb041dc 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp @@ -1,31 +1,29 @@ // $Id$ -#include "GIOP_Message_Generator_Parser_12.h" -#include "GIOP_Utils.h" -#include "GIOP_Message_State.h" - -#include "GIOP_Message_Locate_Header.h" - -#include "operation_details.h" -#include "CDR.h" -#include "Any.h" -#include "debug.h" -#include "OctetSeqC.h" -#include "Pluggable_Messaging_Utils.h" -#include "TAO_Server_Request.h" -#include "TAOC.h" -#include "Service_Context.h" -#include "Pluggable.h" -#include "ORB_Core.h" +#include "tao/GIOP_Message_Generator_Parser_12.h" +#include "tao/GIOP_Utils.h" +#include "tao/GIOP_Message_State.h" + +#include "tao/GIOP_Message_Locate_Header.h" + +#include "tao/operation_details.h" +#include "tao/CDR.h" +#include "tao/Any.h" +#include "tao/debug.h" +#include "tao/OctetSeqC.h" +#include "tao/Pluggable_Messaging_Utils.h" +#include "tao/TAO_Server_Request.h" +#include "tao/TAOC.h" +#include "tao/Service_Context.h" +#include "tao/Pluggable.h" +#include "tao/ORB_Core.h" #include "Transport.h" #if !defined (__ACE_INLINE__) -# include "GIOP_Message_Generator_Parser_12.inl" +# include "tao/GIOP_Message_Generator_Parser_12.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - GIOP_Message_Gen_Parser_12, - "$Id$") +ACE_RCSID(tao, GIOP_Message_Gen_Parser_12, "$Id$") // This is used by GIOP1.2. This is to align the message body on a // 8-octet boundary. This is declared static so that it is in file @@ -308,6 +306,8 @@ TAO_GIOP_Message_Generator_Parser_12::parse_request_header ( } } + ACE_CString operation_name; + if (input.char_translator () == 0) { CORBA::ULong length = 0; @@ -318,13 +318,10 @@ TAO_GIOP_Message_Generator_Parser_12::parse_request_header ( // Do not include NULL character at the end. // @@ This is not getting demarshaled using the codeset // translators! - - // Notice that there are no memory allocations involved - // here! - - request.operation (input.rd_ptr (), - length - 1, - 0 /* TAO_ServerRequest does NOT own string */); + operation_name.set (input.rd_ptr (), + length - 1, + 0); + request.operation (operation_name); hdr_status = input.skip_bytes (length); } } @@ -337,10 +334,8 @@ TAO_GIOP_Message_Generator_Parser_12::parse_request_header ( // ISO8859-1. CORBA::String_var tmp; hdr_status = hdr_status && input.read_string (tmp.inout ()); - - request.operation (tmp._retn (), - 0, - 1 /* TAO_ServerRequest owns string */); + operation_name.set (tmp._retn (), 1); + request.operation (operation_name); } // Tear out the service context ... we currently ignore it, but it diff --git a/TAO/tao/GIOP_Message_Handler.cpp b/TAO/tao/GIOP_Message_Handler.cpp index 63cab8f864b..3443e7d8273 100644 --- a/TAO/tao/GIOP_Message_Handler.cpp +++ b/TAO/tao/GIOP_Message_Handler.cpp @@ -35,10 +35,9 @@ TAO_GIOP_Message_Handler::TAO_GIOP_Message_Handler (TAO_ORB_Core * orb_core, int TAO_GIOP_Message_Handler::read_parse_message (TAO_Transport *transport) { - int retval = this->read_messages (transport); + if (this->read_messages (transport) == -1) + return -1; - if (retval < 1) - return retval; // Check what message are we waiting for and take suitable action if (this->message_status_ == TAO_GIOP_WAITING_FOR_HEADER) @@ -50,7 +49,7 @@ TAO_GIOP_Message_Handler::read_parse_message (TAO_Transport *transport) } } - return retval; + return 0; } int @@ -173,7 +172,8 @@ TAO_GIOP_Message_Handler::parse_magic_bytes (void) // For the present... if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) bad header, magic word [%c%c%c%c]\n"), + ACE_TEXT ("TAO (%P|%t) bad header, " + "magic word [%2.2x,%2.2x,%2.2x,%2.2x]\n"), buf[0], buf[1], buf[2], @@ -310,8 +310,7 @@ TAO_GIOP_Message_Handler::is_message_ready (TAO_Transport *transport) "Recv msg", ACE_reinterpret_cast (u_char *, buf), - this->message_state_.message_size + - TAO_GIOP_MESSAGE_HEADER_LEN); + len + TAO_GIOP_MESSAGE_HEADER_LEN); this->supp_buffer_.data_block ( this->current_buffer_.data_block ()->clone ()); @@ -488,11 +487,27 @@ TAO_GIOP_Message_Handler::read_messages (TAO_Transport *transport) // Now we have a succesful read. First adjust the write pointer this->current_buffer_.wr_ptr (n); - if (TAO_debug_level > 8) + if (TAO_debug_level == 2) { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - GIOP_Message_Handler::read_messages" + " received %d bytes\n", + n)); + + size_t len; + for (size_t offset = 0; offset < size_t(n); offset += len) + { + len = n - offset; + if (len > 512) + len = 512; + ACE_HEX_DUMP ((LM_DEBUG, + this->current_buffer_.wr_ptr () + offset, + len, + "TAO (%P|%t) - read_messages ")); + } ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - received %d bytes \n", n)); } - // Success - return 1; + return 0; + } diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index ecd875cd198..ef76d216aac 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -16,6 +16,8 @@ # include "tao/GIOP_Message_Lite.i" #endif /* __ACE_INLINE__ */ +ACE_RCSID(tao, GIOP_Message_Lite, "$Id$") + static const size_t TAO_GIOP_LITE_HEADER_LEN = 5; static const size_t TAO_GIOP_LITE_MESSAGE_SIZE_OFFSET = 0; static const size_t TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET = 4; @@ -1165,6 +1167,8 @@ TAO_GIOP_Message_Lite::parse_request_header (TAO_ServerRequest &request) input.skip_bytes (key_length); } + ACE_CString operation_name; + if (input.char_translator () == 0) { CORBA::ULong length = 0; @@ -1175,14 +1179,10 @@ TAO_GIOP_Message_Lite::parse_request_header (TAO_ServerRequest &request) // Do not include NULL character at the end. // @@ This is not getting demarshaled using the codeset // translators! - - // Notice that there are no memory allocations involved - // here! - - request.operation (input.rd_ptr (), - length - 1, - 0 /* TAO_ServerRequest does NOT own string */); - + operation_name.set (input.rd_ptr (), + length - 1, + 0); + request.operation (operation_name); hdr_status = input.skip_bytes (length); } } @@ -1195,10 +1195,8 @@ TAO_GIOP_Message_Lite::parse_request_header (TAO_ServerRequest &request) // ISO8859-1. CORBA::String_var tmp; hdr_status = hdr_status && input.read_string (tmp.inout ()); - - request.operation (tmp._retn (), - 0, - 1 /* TAO_ServerRequest owns string */); + operation_name.set (tmp._retn (), 1); + request.operation (operation_name); } return hdr_status ? 0 : -1; @@ -1369,7 +1367,9 @@ TAO_GIOP_Message_Lite::send_error (TAO_Transport *transport) ACE_Message_Block message_block(&data_block); message_block.wr_ptr (TAO_GIOP_LITE_HEADER_LEN); - int result = transport->send (&message_block); + size_t bt; + int result = transport->send_message_block_chain (&message_block, + bt); if (result == -1) { if (TAO_debug_level > 0) diff --git a/TAO/tao/IFR_Client/Makefile b/TAO/tao/IFR_Client/Makefile index 43c48e0fd01..264fe9759b3 100644 --- a/TAO/tao/IFR_Client/Makefile +++ b/TAO/tao/IFR_Client/Makefile @@ -56,6 +56,8 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/IFR_BaseC.o .obj/IFR_BaseC.so .shobj/IFR_BaseC.o .shobj/IFR_BaseC.so: IFR_BaseC.cpp IFR_BaseC.h \ $(ACE_ROOT)/ace/pre.h \ ifr_client_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -63,28 +65,21 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/CDR.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -102,36 +97,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ @@ -139,215 +124,140 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Unbounded_Set.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/CDR_Base.inl \ + $(ACE_ROOT)/ace/Message_Block_T.i \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ - $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.i \ - $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Profile.i \ - $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(TAO_ROOT)/tao/params.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ - $(TAO_ROOT)/tao/Parser_Registry.i \ $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ - $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ - $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(ACE_ROOT)/ace/Array_Base.inl \ $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(TAO_ROOT)/tao/Stub.i \ + $(ACE_ROOT)/ace/Singleton.i \ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ - $(TAO_ROOT)/tao/Priority_Mapping.i \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ - $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/target_specification.i \ - $(TAO_ROOT)/tao/operation_details.i \ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ - $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ - $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - IFR_BaseC.i \ - $(TAO_ROOT)/tao/RequestInfo_Util.h + $(TAO_ROOT)/tao/RequestInfo_Util.h \ + IFR_BaseC.i .obj/IFR_BasicC.o .obj/IFR_BasicC.so .shobj/IFR_BasicC.o .shobj/IFR_BasicC.so: IFR_BasicC.cpp IFR_BasicC.h \ - $(ACE_ROOT)/ace/pre.h \ - IFR_BaseC.h ifr_client_export.h \ + $(ACE_ROOT)/ace/pre.h IFR_BaseC.h \ + ifr_client_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -355,28 +265,21 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/CDR.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -394,36 +297,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ @@ -431,215 +324,140 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Unbounded_Set.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/CDR_Base.inl \ + $(ACE_ROOT)/ace/Message_Block_T.i \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ - $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.i \ - $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Profile.i \ - $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(TAO_ROOT)/tao/params.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ - $(TAO_ROOT)/tao/Parser_Registry.i \ $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ - $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ - $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(ACE_ROOT)/ace/Array_Base.inl \ $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(TAO_ROOT)/tao/Stub.i \ + $(ACE_ROOT)/ace/Singleton.i \ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ - $(TAO_ROOT)/tao/Priority_Mapping.i \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ - $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/target_specification.i \ - $(TAO_ROOT)/tao/operation_details.i \ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ - $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ - $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - IFR_BaseC.i IFR_BasicC.i \ - $(TAO_ROOT)/tao/RequestInfo_Util.h + $(TAO_ROOT)/tao/RequestInfo_Util.h \ + IFR_BasicC.i .obj/IFR_ExtendedC.o .obj/IFR_ExtendedC.so .shobj/IFR_ExtendedC.o .shobj/IFR_ExtendedC.so: IFR_ExtendedC.cpp IFR_ExtendedC.h \ - $(ACE_ROOT)/ace/pre.h \ - IFR_BasicC.h IFR_BaseC.h ifr_client_export.h \ + $(ACE_ROOT)/ace/pre.h IFR_BasicC.h \ + IFR_BaseC.h ifr_client_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -647,28 +465,21 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/CDR.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -686,36 +497,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ @@ -723,215 +524,140 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Unbounded_Set.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/CDR_Base.inl \ + $(ACE_ROOT)/ace/Message_Block_T.i \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ - $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.i \ - $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Profile.i \ - $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(TAO_ROOT)/tao/params.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ - $(TAO_ROOT)/tao/Parser_Registry.i \ $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ - $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ - $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(ACE_ROOT)/ace/Array_Base.inl \ $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(TAO_ROOT)/tao/Stub.i \ + $(ACE_ROOT)/ace/Singleton.i \ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ - $(TAO_ROOT)/tao/Priority_Mapping.i \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ - $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/target_specification.i \ - $(TAO_ROOT)/tao/operation_details.i \ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ - $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ - $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - IFR_BaseC.i IFR_BasicC.i IFR_ExtendedC.i \ - $(TAO_ROOT)/tao/RequestInfo_Util.h + $(TAO_ROOT)/tao/RequestInfo_Util.h \ + IFR_ExtendedC.i .obj/IFR_ComponentsC.o .obj/IFR_ComponentsC.so .shobj/IFR_ComponentsC.o .shobj/IFR_ComponentsC.so: IFR_ComponentsC.cpp IFR_ComponentsC.h \ $(ACE_ROOT)/ace/pre.h \ ifr_client_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -939,29 +665,22 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ IFR_ExtendedC.h IFR_BasicC.h IFR_BaseC.h \ $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/CDR.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -979,36 +698,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ @@ -1016,211 +725,134 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Unbounded_Set.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/CDR_Base.inl \ + $(ACE_ROOT)/ace/Message_Block_T.i \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ - $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.i \ - $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Profile.i \ - $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(TAO_ROOT)/tao/params.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ - $(TAO_ROOT)/tao/Parser_Registry.i \ $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ - $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ - $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(ACE_ROOT)/ace/Array_Base.inl \ $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(TAO_ROOT)/tao/Stub.i \ + $(ACE_ROOT)/ace/Singleton.i \ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ - $(TAO_ROOT)/tao/Priority_Mapping.i \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ - $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/target_specification.i \ - $(TAO_ROOT)/tao/operation_details.i \ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ - $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ - $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - IFR_BaseC.i IFR_BasicC.i IFR_ExtendedC.i IFR_ComponentsC.i \ - $(TAO_ROOT)/tao/RequestInfo_Util.h + $(TAO_ROOT)/tao/RequestInfo_Util.h \ + IFR_ComponentsC.i .obj/IFR_Client_Adapter_Impl.o .obj/IFR_Client_Adapter_Impl.so .shobj/IFR_Client_Adapter_Impl.o .shobj/IFR_Client_Adapter_Impl.so: IFR_Client_Adapter_Impl.cpp \ IFR_Client_Adapter_Impl.h \ @@ -1228,6 +860,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1235,24 +869,17 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -1270,36 +897,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ @@ -1307,213 +924,135 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Unbounded_Set.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/CDR_Base.inl \ + $(ACE_ROOT)/ace/Message_Block_T.i \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ ifr_client_export.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ IFR_ExtendedC.h IFR_BasicC.h IFR_BaseC.h \ $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ - $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.i \ - $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Profile.i \ - $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Map_Manager.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ - $(TAO_ROOT)/tao/Parser_Registry.i \ $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ - $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ - $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(ACE_ROOT)/ace/Array_Base.inl \ $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(TAO_ROOT)/tao/Stub.i \ + $(ACE_ROOT)/ace/Singleton.i \ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ - $(TAO_ROOT)/tao/Priority_Mapping.i \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ - $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/target_specification.i \ - $(TAO_ROOT)/tao/operation_details.i \ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ - $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ - $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - IFR_BaseC.i IFR_BasicC.i IFR_ExtendedC.i + $(TAO_ROOT)/tao/StringSeqC.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tao/IFR_Client/Makefile.bor b/TAO/tao/IFR_Client/Makefile.bor index 084e9bd7b94..31287dc6bc8 100644 --- a/TAO/tao/IFR_Client/Makefile.bor +++ b/TAO/tao/IFR_Client/Makefile.bor @@ -20,7 +20,7 @@ CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_IFR_CLIENT_CFLAGS) \ CPPDIR = . -INCDIR_NAME = tao\IFR_Client +INCDIR_NAME = tao/IFR_Client INCLUDES = \ *.h *.i diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index 0ee060fa2e4..da8540561a5 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -1,6 +1,5 @@ // $Id$ - #include "tao/IIOP_Connection_Handler.h" #include "tao/Timeprobe.h" #include "tao/debug.h" @@ -20,8 +19,6 @@ ACE_RCSID(tao, IIOP_Connect, "$Id$") - - TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (ACE_Thread_Manager *t) : TAO_IIOP_SVC_HANDLER (t, 0 , 0), TAO_Connection_Handler (0), @@ -58,22 +55,8 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core TAO_IIOP_Connection_Handler::~TAO_IIOP_Connection_Handler (void) { - if (this->transport () != 0) { - // If the socket has not already been closed. - if (this->get_handle () != ACE_INVALID_HANDLE) - { - // Cannot deal with errors, and therefore they are ignored. - this->transport ()->send_buffered_messages (); - } - else - { - // Dequeue messages and delete message blocks. - this->transport ()->dequeue_all (); - } - } } - int TAO_IIOP_Connection_Handler::open (void*) { @@ -237,9 +220,6 @@ TAO_IIOP_Connection_Handler::handle_close (ACE_HANDLE handle, // Close the handle.. if (this->get_handle () != ACE_INVALID_HANDLE) { - // Send the buffered messages first - this->transport ()->send_buffered_messages (); - // Mark the entry as invalid this->transport ()->mark_invalid (); @@ -247,11 +227,13 @@ TAO_IIOP_Connection_Handler::handle_close (ACE_HANDLE handle, // a reference to it. This will eventually call // TAO_Transport::release (). this->transport (0); + + this->peer ().close (); } // Follow usual Reactor-style lifecycle semantics and commit // suicide. - this->destroy (); + delete this; } return 0; @@ -263,28 +245,26 @@ TAO_IIOP_Connection_Handler::fetch_handle (void) return this->get_handle (); } - int TAO_IIOP_Connection_Handler::handle_timeout (const ACE_Time_Value &, const void *) { - // This method is called when buffering timer expires. - // - ACE_Time_Value *max_wait_time = 0; - - TAO_Stub *stub = 0; - int has_timeout; - this->orb_core ()->call_timeout_hook (stub, - has_timeout, - *max_wait_time); - // Cannot deal with errors, and therefore they are ignored. - this->transport ()->send_buffered_messages (max_wait_time); + if (this->transport ()->handle_output () == -1) + { + return -1; + } return 0; } int +TAO_IIOP_Connection_Handler::handle_output (ACE_HANDLE) +{ + return this->transport ()->handle_output (); +} + +int TAO_IIOP_Connection_Handler::add_transport_to_cache (void) { ACE_INET_Addr addr; diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h index 97d91734ab7..4a14d8a5d2d 100644 --- a/TAO/tao/IIOP_Connection_Handler.h +++ b/TAO/tao/IIOP_Connection_Handler.h @@ -1,4 +1,5 @@ // This may look like C, but it's really -*- C++ -*- + // =================================================================== /** * @file IIOP_Connection_Handler.h @@ -114,11 +115,15 @@ public: virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0); + /// Documented in ACE_Event_Handler + virtual int handle_output (ACE_HANDLE); + /// Add ourselves to Cache. int add_transport_to_cache (void); /// Process the <listen_list> int process_listen_point_list (IIOP::ListenPointList &listen_list); + protected: /// = Event Handler overloads diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp index bbac4ef3f30..5b194b5d20b 100644 --- a/TAO/tao/IIOP_Endpoint.cpp +++ b/TAO/tao/IIOP_Endpoint.cpp @@ -3,12 +3,10 @@ #include "tao/IIOP_Endpoint.h" -#include "tao/IIOP_Connection_Handler.h" #include "tao/debug.h" ACE_RCSID(tao, IIOP_Endpoint, "$Id$") - #if !defined (__ACE_INLINE__) # include "tao/IIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp index 4799b62a1e5..d927938164d 100644 --- a/TAO/tao/IIOP_Transport.cpp +++ b/TAO/tao/IIOP_Transport.cpp @@ -1,5 +1,4 @@ // This may look like C, but it's really -*- C++ -*- -// // $Id$ #include "tao/IIOP_Transport.h" @@ -23,9 +22,7 @@ # include "tao/IIOP_Transport.i" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (TAO, - IIOP_Transport, - "$Id$") +ACE_RCSID (tao, IIOP_Transport, "$Id$") TAO_IIOP_Transport::TAO_IIOP_Transport (TAO_IIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core, @@ -54,14 +51,6 @@ TAO_IIOP_Transport::~TAO_IIOP_Transport (void) delete this->messaging_object_; } -#if 0 -ACE_HANDLE -TAO_IIOP_Transport::handle (void) -{ - return this->connection_handler_->get_handle (); -} -#endif - ACE_Event_Handler * TAO_IIOP_Transport::event_handler_i (void) { @@ -75,14 +64,16 @@ TAO_IIOP_Transport::messaging_object (void) } ssize_t -TAO_IIOP_Transport::send_i (const ACE_Message_Block *message_block, - const ACE_Time_Value *max_wait_time, - size_t *bytes_transferred) +TAO_IIOP_Transport::send_i (iovec *iov, int iovcnt, + size_t &bytes_transferred, + const ACE_Time_Value *max_wait_time) { - return ACE::send_n (this->connection_handler_->get_handle (), - message_block, - max_wait_time, - bytes_transferred); + ssize_t retval = this->connection_handler_->peer ().sendv (iov, iovcnt, + max_wait_time); + if (retval > 0) + bytes_transferred = retval; + + return retval; } ssize_t @@ -135,6 +126,21 @@ TAO_IIOP_Transport::read_process_message (ACE_Time_Value *max_wait_time, int TAO_IIOP_Transport::register_handler_i (void) { + if (TAO_debug_level > 4) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - IIOP_Transport::register_handler %d\n", + this->id ())); + } + if (this->connection_handler_->is_registered ()) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - IIOP_Transport::register_handler %d" + ", already registered\n", + this->id ())); + return 0; + } + // @@ It seems like this method should go away, the right reactor is // picked at object creation time. ACE_Reactor *r = this->orb_core_->reactor (); @@ -187,7 +193,7 @@ TAO_IIOP_Transport::send_message (TAO_OutputCDR &stream, return -1; // This guarantees to send all data (bytes) or return an error. - ssize_t n = this->send_or_buffer (stub, + ssize_t n = this->send_message_i (stub, twoway, stream.begin (), max_wait_time); @@ -203,17 +209,6 @@ TAO_IIOP_Transport::send_message (TAO_OutputCDR &stream, return -1; } - // EOF. - if (n == 0) - { - if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO: (%P|%t|%N|%l) send_message () \n") - ACE_TEXT ("EOF, closing transport %d\n"), - this->id ())); - return -1; - } - return 1; } @@ -274,7 +269,6 @@ TAO_IIOP_Transport::tear_listen_point_list (TAO_InputCDR &cdr) return this->connection_handler_->process_listen_point_list (listen_list); } - int TAO_IIOP_Transport::process_message (void) { @@ -521,11 +515,3 @@ TAO_IIOP_Transport::transition_handler_state_i (void) { this->connection_handler_ = 0; } - -#if 0 -TAO_Connection_Handler* -TAO_IIOP_Transport::connection_handler (void) const -{ - return this->connection_handler_; -} -#endif diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h index 6190c9b353e..940ab085b2e 100644 --- a/TAO/tao/IIOP_Transport.h +++ b/TAO/tao/IIOP_Transport.h @@ -64,33 +64,24 @@ public: protected: /** @name Overridden Template Methods * - * These are implementations of template methods declared by TAO_Transport. + * Please check the documentation in "tao/Transport.h" for more + * details. */ //@{ - /// Access connection_handler_ as an <code>ACE_Event_Handler</code>. - /// Must be called with transport's lock held. virtual ACE_Event_Handler *event_handler_i (void); /// Access the underlying messaging object virtual TAO_Pluggable_Messaging *messaging_object (void); - /// Write the complete Message_Block chain to the connection. - /// Must be called with transport's lock held. - virtual ssize_t send_i (const ACE_Message_Block *mblk, - const ACE_Time_Value *s = 0, - size_t *bytes_transferred = 0); + virtual ssize_t send_i (iovec *iov, int iovcnt, + size_t &bytes_transferred, + const ACE_Time_Value *timeout = 0); - - /// Read len bytes from into buf. - /// Must be called with transport's lock held. virtual ssize_t recv_i (char *buf, size_t len, const ACE_Time_Value *s = 0); - /// Read and process the message from the connection. The processing - /// of the message is done by delegating the work to the underlying - /// messaging object virtual int read_process_message (ACE_Time_Value *max_time_value = 0, int block =0); @@ -118,11 +109,9 @@ public: TAO_Target_Specification &spec, TAO_OutputCDR &msg); - /// Initialising the messaging object virtual int messaging_init (CORBA::Octet major, CORBA::Octet minor); - /// Open the service context list and process it. virtual int tear_listen_point_list (TAO_InputCDR &cdr); //@} diff --git a/TAO/tao/IORManipulation/Makefile b/TAO/tao/IORManipulation/Makefile index 16a00b69fcb..f2548fcea69 100644 --- a/TAO/tao/IORManipulation/Makefile +++ b/TAO/tao/IORManipulation/Makefile @@ -181,8 +181,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - IORC.h \ - $(TAO_ROOT)/tao/Object.h \ + IORC.h $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ @@ -212,7 +211,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i @@ -342,8 +340,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - IORC.h \ - $(TAO_ROOT)/tao/Object.h \ + IORC.h $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ @@ -526,7 +523,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ @@ -565,14 +561,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ @@ -616,6 +610,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ diff --git a/TAO/tao/IORManipulation/Makefile.bor b/TAO/tao/IORManipulation/Makefile.bor index 85d6e12e3e7..ff4f4750b8d 100644 --- a/TAO/tao/IORManipulation/Makefile.bor +++ b/TAO/tao/IORManipulation/Makefile.bor @@ -14,7 +14,7 @@ CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_IORMANIP_CFLAGS) \ CPPDIR = . -INCDIR_NAME = tao\IORManipulation +INCDIR_NAME = tao/IORManipulation INCLUDES = \ *.h *.i diff --git a/TAO/tao/IORTable/Makefile b/TAO/tao/IORTable/Makefile index 19a4f53da30..5793c7a5ce7 100644 --- a/TAO/tao/IORTable/Makefile +++ b/TAO/tao/IORTable/Makefile @@ -198,7 +198,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -208,31 +207,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -240,14 +221,24 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ IORTableC.i Table_Adapter.h \ $(TAO_ROOT)/tao/Adapter.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -414,7 +405,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -424,31 +414,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -456,14 +428,24 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ iortable_export.h IORTableC.i .obj/Table_Adapter.o .obj/Table_Adapter.so .shobj/Table_Adapter.o .shobj/Table_Adapter.so: Table_Adapter.cpp Table_Adapter.h \ @@ -632,7 +614,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -642,31 +623,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -674,14 +637,24 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ IORTableC.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -701,6 +674,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ @@ -727,6 +710,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -884,7 +868,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -894,31 +877,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -926,14 +891,24 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ IORTableC.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ diff --git a/TAO/tao/IORTable/Makefile.bor b/TAO/tao/IORTable/Makefile.bor index d6156da1bd2..3b8998c5791 100644 --- a/TAO/tao/IORTable/Makefile.bor +++ b/TAO/tao/IORTable/Makefile.bor @@ -15,7 +15,7 @@ CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_IORTABLE_CFLAGS) \ CPPDIR = . -INCDIR_NAME = tao\IORTable +INCDIR_NAME = tao/IORTable INCLUDES = \ *.h *.i \ IORTable.pidl diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp index 6be0f121bc8..57681cae07a 100644 --- a/TAO/tao/Invocation.cpp +++ b/TAO/tao/Invocation.cpp @@ -31,9 +31,7 @@ # include "Invocation.i" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (TAO, - Invocation, - "$Id$") +ACE_RCSID(tao, Invocation, "$Id$") #if defined (ACE_ENABLE_TIMEPROBES) @@ -390,7 +388,7 @@ TAO_GIOP_Invocation::prepare_header (CORBA::Octet response_flags, // Send request. int -TAO_GIOP_Invocation::invoke (CORBA::Boolean is_roundtrip, +TAO_GIOP_Invocation::invoke (CORBA::Boolean is_synchronous, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -402,18 +400,11 @@ TAO_GIOP_Invocation::invoke (CORBA::Boolean is_roundtrip, TAO_INVOKE_EXCEPTION); } - // @@ Alex: the <is_roundtrip> flag will be tricky when we move to - // AMI: now it is used both to indicate the the CORBA request in - // a twoway and that the send_request() operation should block. - // Even for oneways: with AMI it is possible to wait for a - // response (empty) for oneways, just to make sure that they - // arrive, there are policies to control that. - int result = this->transport_->send_request (this->stub_, this->orb_core_, this->out_stream_, - is_roundtrip, + is_synchronous, this->max_wait_time_); // @@ -623,8 +614,7 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request, } // Just send the request, without trying to wait for the reply. - int retval = TAO_GIOP_Invocation::invoke (1, - ACE_TRY_ENV); + int retval = TAO_GIOP_Invocation::invoke (1, ACE_TRY_ENV); ACE_CHECK_RETURN (retval); if (retval != TAO_INVOKE_OK) @@ -662,7 +652,8 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request, CORBA::ULong msecs = this->max_wait_time_->msec (); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) Timeout on recv is <%u>\n"), + "TAO (%P|%t) - Synch_Invocation::invoke_i, " + "timeout on recv is <%u>\n", msecs)); } @@ -676,7 +667,8 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request, CORBA::ULong msecs = this->max_wait_time_->msec (); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) Timeout after recv is <%u> status <%d>\n"), + "TAO (%P|%t) Synch_Invocation::invoke_i, " + "timeout after recv is <%u> status <%d>\n", msecs, reply_error)); } @@ -853,8 +845,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts, { TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_INVOCATION_INVOKE_START); - int retval = this->invoke_i (0, - ACE_TRY_ENV); + int retval = this->invoke_i (0, ACE_TRY_ENV); ACE_CHECK_RETURN (retval); // A TAO_INVOKE_EXCEPTION status, but no exception raised means that @@ -946,7 +937,7 @@ TAO_GIOP_Oneway_Invocation::TAO_GIOP_Oneway_Invocation ( sync_scope_ (TAO::SYNC_WITH_TRANSPORT) { int has_synchronization = 0; - int scope = 0; + int scope = this->sync_scope_; this->orb_core_->call_sync_scope_hook (this->stub_, has_synchronization, scope); @@ -967,18 +958,19 @@ int TAO_GIOP_Oneway_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - if (this->sync_scope_ == TAO::SYNC_WITH_TRANSPORT - || this->sync_scope_ == TAO::SYNC_NONE + if (this->sync_scope_ == TAO::SYNC_NONE || this->sync_scope_ == TAO::SYNC_EAGER_BUFFERING || this->sync_scope_ == TAO::SYNC_DELAYED_BUFFERING) { - return TAO_GIOP_Invocation::invoke (0, - ACE_TRY_ENV); + return TAO_GIOP_Invocation::invoke (0, ACE_TRY_ENV); + } + if (this->sync_scope_ == TAO::SYNC_WITH_TRANSPORT) + { + return TAO_GIOP_Invocation::invoke (1, ACE_TRY_ENV); } - int retval = this->invoke_i (0, - ACE_TRY_ENV); - ACE_CHECK_RETURN (retval); + int retval = this->invoke_i (0, ACE_TRY_ENV); + ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION); // A TAO_INVOKE_EXCEPTION status, but no exception raised means that // we have a user exception. @@ -1033,8 +1025,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV) TAO_INVOKE_EXCEPTION); } - CORBA::ULong locate_status = this->invoke_i (1, - ACE_TRY_ENV); + CORBA::ULong locate_status = this->invoke_i (1, ACE_TRY_ENV); ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION); switch (locate_status) diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h index c6b6cc9f334..66d08ee9cbd 100644 --- a/TAO/tao/Invocation.h +++ b/TAO/tao/Invocation.h @@ -178,12 +178,16 @@ protected: /** * Returns TAO_INVOKE_RESTART if the write call failed and the * request must be re-attempted. - * @par + * + * @param is_synchronous If set invoke() does not return until the + * message is completely delivered to the underlying + * transport mechanism, or an error is detected. + * * Notice that the same profile is tried again because it may be * that the server closed the connection simply to release * resources. */ - int invoke (CORBA::Boolean is_roundtrip, + int invoke (CORBA::Boolean is_synchronous, CORBA_Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h index 1f03b12f26d..45869b4780a 100644 --- a/TAO/tao/Leader_Follower.h +++ b/TAO/tao/Leader_Follower.h @@ -72,7 +72,7 @@ public: int elect_new_leader (void); /// Node structure for the queue of followers - struct TAO_Export TAO_Follower_Node + struct TAO_Follower_Node { /// Constructor TAO_Follower_Node (TAO_SYNCH_CONDITION* follower_ptr); @@ -137,7 +137,7 @@ private: ACE_Reverse_Lock<TAO_SYNCH_MUTEX> reverse_lock_; /// Queue to store the followers. - struct TAO_Export TAO_Follower_Queue + struct TAO_Follower_Queue { /// Constructor TAO_Follower_Queue (void); diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp index 45843769958..87e479d5867 100644 --- a/TAO/tao/LocalObject.cpp +++ b/TAO/tao/LocalObject.cpp @@ -2,19 +2,18 @@ // $Id$ // -#include "LocalObject.h" -#include "Stub.h" -#include "IFR_Client_Adapter.h" +#include "tao/LocalObject.h" +#include "tao/Stub.h" +#include "tao/IFR_Client_Adapter.h" +#include "ace/Auto_Ptr.h" #include "ace/Dynamic_Service.h" #if !defined (__ACE_INLINE__) -# include "LocalObject.i" +# include "tao/LocalObject.i" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (tao, - LocalObject, - "$Id$") +ACE_RCSID(tao, LocalObject, "$Id$") CORBA_LocalObject::~CORBA_LocalObject (void) { @@ -36,17 +35,11 @@ CORBA_LocalObject::_remove_ref (void) // create hash tables. CORBA::ULong -CORBA_LocalObject::_hash (CORBA::ULong maximum, - CORBA_Environment & /* ACE_TRY_ENV */) +CORBA_LocalObject::_hash (CORBA::ULong /* maximum */, + CORBA_Environment &ACE_TRY_ENV) { - // Note that we reinterpret_cast to an "unsigned long" instead of - // CORBA::ULong since we need to first cast to an integer large - // enough to hold an address to avoid compile-time warnings on some - // 64-bit platforms. - - CORBA::ULong hash = ACE_reinterpret_cast (unsigned long, this); - - return hash % maximum; + // @@ We need a different hash function here. + ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } // Compare two object references to see if they point to the same @@ -57,8 +50,8 @@ CORBA_LocalObject::_hash (CORBA::ULong maximum, CORBA::Boolean CORBA_LocalObject::_is_equivalent (CORBA_Object_ptr other_obj, - CORBA_Environment &) - ACE_THROW_SPEC (()) + CORBA_Environment &) + ACE_THROW_SPEC (()) { return (other_obj == this) ? 1 : 0; } @@ -68,9 +61,7 @@ CORBA_LocalObject::_is_equivalent (CORBA_Object_ptr other_obj, TAO_ObjectKey * CORBA_LocalObject::_key (CORBA_Environment &ACE_TRY_ENV) { - ACE_ERROR((LM_ERROR, - ACE_TEXT ("(%P|%t) Cannot get _key froma LocalObject!!!\n"))); - + ACE_ERROR((LM_ERROR, ACE_TEXT ("(%P|%t) Cannot get _key froma LocalObject!!!\n"))); ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index f665706a896..7c489d410ba 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -238,7 +238,14 @@ ORB_CORE_FILES = \ CodecFactory_ORBInitializer \ CDR_Encaps_Codec \ Endpoint_Selector_Factory \ - RT_Endpoint_Selector_Factory + RT_Endpoint_Selector_Factory \ + Flushing_Strategy \ + Block_Flushing_Strategy \ + Reactive_Flushing_Strategy \ + Queued_Message \ + Synch_Queued_Message \ + Asynch_Queued_Message \ + Transport_Timer DYNAMIC_ANY_FILES = @@ -611,7 +618,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ GIOP_Message_State.h \ GIOP_Message_State.i \ @@ -656,14 +662,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -722,6 +726,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -736,7 +741,6 @@ realclean: ORB_Core.i \ Client_Strategy_Factory.h \ Wait_Strategy.h \ - Wait_Strategy.inl \ Transport_Mux_Strategy.h \ debug.h \ target_specification.h \ @@ -944,26 +948,25 @@ realclean: Object_Proxy_Impl.h \ Object.i \ CurrentC.i \ - TAO_Export.h Encodable.h Environment.h Sequence.h CDR.h \ + Encodable.h \ + Exception.h \ + CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ - Policy_Manager.h \ + Environment.h Policy_Manager.h \ LocalObject.h \ LocalObject.i \ PolicyC.h \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ - Typecode.h \ - Exception.h \ - Typecode.i \ IOPC.h \ Any.h \ - CDR.h \ Any.i \ IOPC.i \ Pluggable.i \ @@ -979,16 +982,16 @@ realclean: TAO_Singleton.h \ TAO_Singleton_Manager.h \ Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \ - DynamicC.h DynamicC.i MessagingC.h orbconf.h ValueBase.h \ + DynamicC.h DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - Any.h TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i IOPC.h PollableC.h PollableC.i MessagingC.i CurrentC.h \ - PortableInterceptorC.i \ + TimeBaseC.h \ + TimeBaseC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -1001,12 +1004,11 @@ realclean: Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \ Interceptor_List.h Interceptor_List.inl RT_Policy_i.h \ RTCORBAC.h \ - TimeBaseC.h \ - Encodable.h \ RTCORBAC.i \ RT_Policy_i.i \ - Protocols_Hooks.h RTCORBAC.h ORB_Core.i Client_Strategy_Factory.h \ - Wait_Strategy.h Wait_Strategy.inl Transport_Mux_Strategy.h Stub.h \ + Protocols_Hooks.h RTCORBAC.h BiDir_Adapter.h ORB_Core.i \ + Client_Strategy_Factory.h TAO_Export.h Wait_Strategy.h \ + Transport_Mux_Strategy.h Stub.h \ MProfile.h \ Profile.h \ Tagged_Components.h \ @@ -1036,12 +1038,7 @@ realclean: $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/SOCK.i \ - Connection_Handler.inl \ - Pluggable_Messaging.h \ - Pluggable_Messaging_Utils.h \ - Pluggable_Messaging_Utils.i \ - Pluggable_Messaging.i \ - debug.h + Connection_Handler.inl .obj/Profile.o .obj/Profile.so .shobj/Profile.o .shobj/Profile.so: Profile.cpp Profile.h \ $(ACE_ROOT)/ace/pre.h corbafwd.h \ @@ -1174,32 +1171,23 @@ realclean: PolicyC.h \ CurrentC.h \ CurrentC.i \ - TAO_Export.h Encodable.h Exception.h Environment.h Sequence.h CDR.h \ - Remote_Object_Proxy_Impl.h \ + Encodable.h \ PolicyC.i \ GIOP_Message_State.h \ GIOP_Message_State.i \ Profile.i Object_KeyC.h \ Object_KeyC.i \ - MessagingC.h orbconf.h ValueBase.h \ + MessagingC.h Remote_Object_Proxy_Impl.h \ + ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - Any.h TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i IOPC.h PollableC.h PollableC.i MessagingC.i Stub.h \ + TimeBaseC.h \ + TimeBaseC.i \ + PolicyC.h \ + PollableC.h \ + PollableC.i \ + MessagingC.i Stub.h \ Pluggable.h \ Pluggable.i \ MProfile.h \ @@ -1210,7 +1198,6 @@ realclean: Services.i \ CORBA_String.h \ CORBA_String.inl \ - PolicyC.h \ ORB.i \ ORB_Core.h \ Policy_Manager.h \ @@ -1228,6 +1215,16 @@ realclean: $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ Adapter.h \ Adapter.i \ PolicyFactory_Registry.h \ @@ -1286,11 +1283,10 @@ realclean: Interceptor_List.inl \ RT_Policy_i.h \ RTCORBAC.h \ - TimeBaseC.h \ - Encodable.h \ RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -1303,8 +1299,7 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Stub.i \ - debug.h + Stub.i debug.h .obj/Endpoint.o .obj/Endpoint.so .shobj/Endpoint.o .shobj/Endpoint.so: Endpoint.cpp \ Endpoint.h \ @@ -1549,7 +1544,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -1579,14 +1573,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -1645,6 +1637,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -1883,7 +1876,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -1892,8 +1886,6 @@ realclean: Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ - Typecode.h \ - Typecode.i \ IOPC.h \ Any.h \ Any.i \ @@ -1914,14 +1906,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -1946,6 +1936,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ ORB_Core.i \ Server_Strategy_Factory.h \ debug.h \ @@ -2095,7 +2086,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ GIOP_Message_State.h \ GIOP_Message_State.i \ @@ -2133,14 +2123,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -2199,6 +2187,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -2768,7 +2757,6 @@ realclean: $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ Wait_Strategy.h \ - Wait_Strategy.inl \ Connection_Handler.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/Addr.h \ @@ -2811,7 +2799,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -2833,14 +2820,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -2865,6 +2850,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ ORB_Core.i \ ORB_Table.h \ ORB_Table.inl \ @@ -3103,7 +3089,6 @@ realclean: $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ Wait_Strategy.h \ - Wait_Strategy.inl \ Connection_Handler.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/Addr.h \ @@ -3146,7 +3131,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -3168,14 +3152,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -3200,6 +3182,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ ORB_Core.i \ ORB_Table.h \ ORB_Table.inl \ @@ -3227,7 +3210,8 @@ realclean: $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i -.obj/IIOP_Profile.o .obj/IIOP_Profile.so .shobj/IIOP_Profile.o .shobj/IIOP_Profile.so: IIOP_Profile.cpp IIOP_Profile.h \ +.obj/IIOP_Profile.o .obj/IIOP_Profile.so .shobj/IIOP_Profile.o .shobj/IIOP_Profile.so: IIOP_Profile.cpp \ + IIOP_Profile.h \ $(ACE_ROOT)/ace/pre.h \ Profile.h \ corbafwd.h \ @@ -3360,7 +3344,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ GIOP_Message_State.h \ GIOP_Message_State.i \ @@ -3382,7 +3365,8 @@ realclean: $(ACE_ROOT)/ace/INET_Addr.i \ IIOP_Endpoint.i \ IIOP_Profile.i \ - CDR.h Environment.h ORB.h ORB_Core.h corbafwd.h Policy_Manager.h \ + ORB_Core.h \ + Policy_Manager.h \ LocalObject.h \ LocalObject.i \ Policy_Manager.i \ @@ -3404,24 +3388,29 @@ realclean: TAO_Singleton.h \ TAO_Singleton.inl \ TAO_Singleton.cpp \ - TAO_Singleton.h \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \ - DynamicC.h DynamicC.i MessagingC.h orbconf.h ValueBase.h \ + Adapter.h \ + Adapter.i \ + PolicyFactory_Registry.h \ + PortableInterceptorC.h \ + DynamicC.h \ + DynamicC.i \ + MessagingC.h \ + Remote_Object_Proxy_Impl.h \ + ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - TAO_Export.h Any.h Remote_Object_Proxy_Impl.h TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i IOPC.h PolicyC.h PollableC.h PollableC.i MessagingC.i \ - CurrentC.h PortableInterceptorC.i \ + TimeBaseC.h \ + TimeBaseC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i \ + PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -3464,13 +3453,16 @@ realclean: $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ - Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \ - Interceptor_List.inl RT_Policy_i.h \ + Cleanup_Func_Registry.inl \ + Object_Ref_Table.h \ + Interceptor_List.h \ + Interceptor_List.inl \ + RT_Policy_i.h \ RTCORBAC.h \ - TimeBaseC.h \ RTCORBAC.i \ RT_Policy_i.i \ - Protocols_Hooks.h RTCORBAC.h \ + Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -3482,7 +3474,10 @@ realclean: $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ - ORB_Core.i debug.h iiop_endpoints.h iiop_endpoints.i + ORB_Core.i \ + debug.h \ + iiop_endpoints.h \ + iiop_endpoints.i .obj/IIOP_Transport.o .obj/IIOP_Transport.so .shobj/IIOP_Transport.o .shobj/IIOP_Transport.so: IIOP_Transport.cpp \ IIOP_Transport.h \ @@ -3712,7 +3707,6 @@ realclean: $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ Wait_Strategy.h \ - Wait_Strategy.inl \ Connection_Handler.h \ Connection_Handler.inl \ IIOP_Connection_Handler.i \ @@ -3742,7 +3736,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -3765,14 +3758,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -3797,6 +3788,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ ORB_Core.i \ ORB_Table.h \ ORB_Table.inl \ @@ -4106,7 +4098,6 @@ realclean: $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ Wait_Strategy.h \ - Wait_Strategy.inl \ Connection_Handler.h \ Transport.h \ Transport_Descriptor_Interface.h \ @@ -4134,7 +4125,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ GIOP_Message_State.h \ GIOP_Message_State.i \ @@ -4172,14 +4162,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -4201,6 +4189,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ ORB_Core.i \ Client_Strategy_Factory.h \ $(ACE_ROOT)/ace/Auto_Ptr.h \ @@ -4424,7 +4413,6 @@ realclean: $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ Wait_Strategy.h \ - Wait_Strategy.inl \ Connection_Handler.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/Addr.h \ @@ -4467,7 +4455,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -4490,14 +4477,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -4522,6 +4507,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ ORB_Core.i \ ORB_Table.h \ ORB_Table.inl \ @@ -4740,7 +4726,6 @@ realclean: TAO_Export.h \ corbafwd.i \ Wait_Strategy.h \ - Wait_Strategy.inl \ Connection_Handler.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/Addr.h \ @@ -4802,7 +4787,8 @@ realclean: Object.i \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -4811,8 +4797,6 @@ realclean: Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ - Typecode.h \ - Typecode.i \ IOPC.h \ Any.h \ Any.i \ @@ -4833,14 +4817,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -4865,6 +4847,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ ORB_Core.i \ Messaging_Policy_i.h \ Messaging_Policy_i.i \ @@ -5004,7 +4987,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ $(ACE_ROOT)/ace/INET_Addr.h \ @@ -5100,7 +5084,6 @@ realclean: $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ Wait_Strategy.h \ - Wait_Strategy.inl \ Connection_Handler.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/IPC_SAP.h \ @@ -5404,7 +5387,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -5413,8 +5397,6 @@ realclean: Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ - Typecode.h \ - Typecode.i \ IOPC.h \ Any.h \ Any.i \ @@ -5440,14 +5422,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -5491,6 +5471,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -5505,7 +5486,6 @@ realclean: ORB_Core.i \ Wait_On_Read.h \ Wait_Strategy.h \ - Wait_Strategy.inl \ Wait_On_Reactor.h \ Wait_On_Leader_Follower.h \ Exclusive_TMS.h \ @@ -5665,7 +5645,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -5674,8 +5655,6 @@ realclean: Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ - Typecode.h \ - Typecode.i \ IOPC.h \ Any.h \ Any.i \ @@ -5701,14 +5680,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -5752,6 +5729,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -5927,7 +5905,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -5953,14 +5930,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -6004,6 +5979,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -6496,7 +6472,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Marshal.i \ @@ -6638,7 +6613,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Marshal.i @@ -6779,7 +6753,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Marshal.i \ @@ -6912,7 +6885,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i @@ -7052,7 +7026,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Marshal.i \ @@ -7093,14 +7066,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -7159,6 +7130,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -7521,7 +7493,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ ORB_Core.h \ @@ -7561,14 +7532,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -7627,6 +7596,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -7878,7 +7848,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -7891,8 +7862,6 @@ realclean: $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ Pluggable.h \ - Typecode.h \ - Typecode.i \ IOPC.h \ Any.h \ Any.i \ @@ -7921,14 +7890,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -7987,6 +7954,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -8137,7 +8105,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ GIOP_Message_State.h \ GIOP_Message_State.i \ @@ -8182,14 +8149,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -8248,6 +8213,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -8293,7 +8259,8 @@ realclean: $(ACE_ROOT)/ace/Dynamic_Service.i \ $(ACE_ROOT)/ace/Dynamic_Service.cpp -.obj/LocalObject.o .obj/LocalObject.so .shobj/LocalObject.o .shobj/LocalObject.so: LocalObject.cpp LocalObject.h \ +.obj/LocalObject.o .obj/LocalObject.so .shobj/LocalObject.o .shobj/LocalObject.so: LocalObject.cpp \ + LocalObject.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -8431,7 +8398,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ GIOP_Message_State.h \ GIOP_Message_State.i \ @@ -8445,7 +8411,6 @@ realclean: ORB.i \ ORB_Core.h \ Policy_Manager.h \ - LocalObject.h \ Policy_Manager.i \ Resource_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -8475,14 +8440,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -8541,6 +8504,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -8555,6 +8519,9 @@ realclean: ORB_Core.i \ Stub.i \ IFR_Client_Adapter.h \ + $(ACE_ROOT)/ace/Auto_Ptr.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ $(ACE_ROOT)/ace/Dynamic_Service.i \ @@ -8691,7 +8658,6 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Any.h \ @@ -8818,14 +8784,16 @@ realclean: Object_Proxy_Impl.h \ Object.i \ CurrentC.i \ - TAO_Export.h Encodable.h Environment.h Sequence.h CDR.h \ + Encodable.h \ + Exception.h \ + CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ - ORB.i \ - ORB_Table.h \ + ORB.i ORB_Table.h \ TAO_Singleton.h \ TAO_Singleton.inl \ TAO_Singleton.cpp \ @@ -8869,12 +8837,8 @@ realclean: ORB_Table.inl \ Connector_Registry.h \ Pluggable.h \ - Typecode.h \ - Exception.h \ - Typecode.i \ IOPC.h \ Any.h \ - CDR.h \ Any.i \ IOPC.i \ Pluggable.i \ @@ -8913,15 +8877,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - Remote_Object_Proxy_Impl.h \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -8953,10 +8914,10 @@ realclean: Interceptor_List.inl \ RT_Policy_i.h \ RTCORBAC.h \ - Encodable.h \ RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -8969,43 +8930,10 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Stub.i \ - ORB_Core.h Server_Strategy_Factory.h debug.h TAO_Internal.h NVList.h \ - NVList.i \ - Dynamic_Adapter.h MProfile.h RT_ORB.h \ - Thread_Pool.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - Thread_Pool.i \ + Stub.i ORB_Core.h \ + Server_Strategy_Factory.h debug.h TAO_Internal.h TAO_Export.h \ + NVList.h NVList.i \ + Dynamic_Adapter.h CDR.h MProfile.h RT_ORB.h \ RT_ORB.i \ Priority_Mapping_Manager.h \ Priority_Mapping.h \ @@ -9014,15 +8942,13 @@ realclean: RT_Current.h \ RT_Current.i \ ORBInitInfo.h PortableInterceptorC.h LocalObject.h StringSeqC.h \ - StringSeqC.i CodecFactory.h IOPC.h ORBInitializer_Registry.h \ - TAO_Singleton.h \ + Sequence.h StringSeqC.i CodecFactory.h IOPC.h \ + ORBInitializer_Registry.h TAO_Singleton.h \ ORBInitializer_Registry.inl \ CodecFactory_ORBInitializer.h TypeCodeFactory_Adapter.h \ RT_ORBInitializer.h \ RT_PolicyFactory.h \ - Messaging_ORBInitializer.h \ - Messaging_PolicyFactory.h \ - ValueFactory_Map.h \ + Messaging_ORBInitializer.h ValueFactory_Map.h \ ValueFactory_Map.i \ Object_KeyC.h \ Object_KeyC.i \ @@ -9030,6 +8956,10 @@ realclean: $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ $(ACE_ROOT)/ace/Dynamic_Service.i \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ $(ACE_ROOT)/ace/SOCK.h \ @@ -9152,7 +9082,8 @@ realclean: TAO_Export.h \ corbafwd.i -.obj/PolicyC.o .obj/PolicyC.so .shobj/PolicyC.o .shobj/PolicyC.so: PolicyC.cpp PolicyC.h \ +.obj/PolicyC.o .obj/PolicyC.so .shobj/PolicyC.o .shobj/PolicyC.so: PolicyC.cpp \ + PolicyC.h \ $(ACE_ROOT)/ace/pre.h \ CurrentC.h \ Object.h \ @@ -9255,35 +9186,31 @@ realclean: Object_Proxy_Impl.h \ Object.i \ CurrentC.i \ - TAO_Export.h Encodable.h Exception.h \ + Encodable.h \ + Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ Exception.i \ - Environment.h \ - Environment.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ Sequence.i \ Sequence_T.h \ - Sequence.h \ Sequence_T.i \ Sequence_T.cpp \ Environment.h \ + Environment.i \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ Stub.h \ Pluggable.h \ - Typecode.h \ - Exception.h \ - Typecode.i \ IOPC.h \ Any.h \ - CDR.h \ Any.i \ IOPC.i \ Pluggable.i \ @@ -9293,7 +9220,6 @@ realclean: CONV_FRAMEC.h \ CONV_FRAMEC.i \ Tagged_Components.i \ - PolicyC.h \ GIOP_Message_State.h \ GIOP_Message_State.i \ Profile.i \ @@ -9337,15 +9263,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - Remote_Object_Proxy_Impl.h \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -9401,10 +9324,10 @@ realclean: Interceptor_List.inl \ RT_Policy_i.h \ RTCORBAC.h \ - Encodable.h \ RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -9438,14 +9361,7 @@ realclean: operation_details.i \ Invocation_Endpoint_Selectors.h \ Invocation_Endpoint_Selectors.i \ - Invocation.i \ - PortableInterceptor.h \ - PortableInterceptor.i \ - ClientRequestInfo.h \ - StringSeqC.h \ - StringSeqC.i \ - ClientRequestInfo.inl \ - RequestInfo_Util.h + Invocation.i .obj/Encodable.o .obj/Encodable.so .shobj/Encodable.o .shobj/Encodable.so: Encodable.cpp \ Encodable.h \ @@ -10133,9 +10049,6 @@ realclean: ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -10194,6 +10107,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -10235,8 +10149,8 @@ realclean: $(ACE_ROOT)/ace/Dynamic_Service.cpp .obj/DomainC.o .obj/DomainC.so .shobj/DomainC.o .shobj/DomainC.so: DomainC.cpp DomainC.h \ - $(ACE_ROOT)/ace/pre.h \ - corba.h \ + $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -10245,8 +10159,6 @@ realclean: $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -10332,33 +10244,19 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - Exception.i \ - Typecode.i \ - Any.h \ - CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - CDR.i \ - Environment.h \ - Environment.i \ + PolicyC.h \ + CurrentC.h \ Object.h \ + corbafwd.h \ Object_Proxy_Broker.h \ Object_Proxy_Impl.h \ Object.i \ - Any.i \ - NVList.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - NVList.i \ - LocalObject.h \ - LocalObject.i \ - Principal.h \ - OctetSeqC.h \ + CurrentC.i \ + Encodable.h \ + Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -10366,68 +10264,35 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ - OctetSeqC.i \ - Principal.i \ - ORB.h \ - Services.h \ - Services.i \ - CORBA_String.h \ - CORBA_String.inl \ - PolicyC.h \ - CurrentC.h \ - CurrentC.i \ - Encodable.h \ - Remote_Object_Proxy_Impl.h \ + Environment.h \ + Environment.i \ + CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + CDR.i \ + Typecode.h \ + Typecode.i \ PolicyC.i \ - ORB.i \ - BoundsC.h \ - BoundsC.i \ + ClientRequestInfo.h PortableInterceptorC.h DynamicC.h \ + Any.h \ + Any.i DynamicC.i \ + MessagingC.h Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - DomainC.h \ - WrongTransactionC.h \ - Object_KeyC.h \ - Object_KeyC.i \ - ObjectIDList.h \ - ObjectIDList.i \ - PortableInterceptor.h \ - PortableInterceptorC.h \ - DynamicC.h \ - DynamicC.i \ - MessagingC.h \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ + PolicyC.h \ IOPC.h \ IOPC.i \ PollableC.h \ PollableC.i \ - MessagingC.i \ - PortableInterceptorC.i \ - Interceptor_List.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - Interceptor_List.inl \ - PortableInterceptor.i \ - StringSeqC.h \ - StringSeqC.i \ - TAO_Export.h PolicyC.h DomainC.i \ - Stub.h \ + MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i LocalObject.h \ + LocalObject.i \ + StringSeqC.h Sequence.h StringSeqC.i Service_Context.h \ + Service_Context.inl \ + ClientRequestInfo.inl DomainC.i Stub.h \ Pluggable.h \ Pluggable.i \ MProfile.h \ @@ -10440,8 +10305,15 @@ realclean: GIOP_Message_State.i \ Profile.i \ MProfile.i \ + ORB.h \ + Services.h \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ + ORB.i \ ORB_Core.h \ Policy_Manager.h \ + LocalObject.h \ Policy_Manager.i \ Resource_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -10450,10 +10322,24 @@ realclean: $(ACE_ROOT)/ace/Service_Object.i \ Protocol_Factory.h \ params.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ Adapter.h \ Adapter.i \ PolicyFactory_Registry.h \ + PortableInterceptorC.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -10495,13 +10381,19 @@ realclean: Cache_Entries.inl \ Transport_Cache_Manager.inl \ Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ Cleanup_Func_Registry.inl \ Object_Ref_Table.h \ + Interceptor_List.h \ + Interceptor_List.inl \ RT_Policy_i.h \ RTCORBAC.h \ RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -10515,8 +10407,7 @@ realclean: $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ Stub.i \ - Invocation.h \ - Synch_Reply_Dispatcher.h \ + Invocation.h CDR.h Any.h Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ TAOC.h \ @@ -10524,27 +10415,30 @@ realclean: Priority_Mapping.h \ Priority_Mapping.i \ Priority_Mapping_Manager.i \ - TAOC.i \ - operation_details.h \ + TAOC.i operation_details.h \ Service_Context.h \ - Service_Context.inl \ target_specification.h \ + Object_KeyC.h \ + Object_KeyC.i \ target_specification.i \ operation_details.i \ - Invocation_Endpoint_Selectors.h \ + target_specification.h Invocation_Endpoint_Selectors.h \ Invocation_Endpoint_Selectors.i \ - Invocation.i \ - ClientRequestInfo.h \ - ClientRequestInfo.inl \ - RequestInfo_Util.h \ + Invocation.i Exception.h \ IFR_Client_Adapter.h \ + ORB_Core.h \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ $(ACE_ROOT)/ace/Dynamic_Service.i \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + PortableInterceptor.h Interceptor_List.h PortableInterceptor.i \ + RequestInfo_Util.h -.obj/TimeBaseC.o .obj/TimeBaseC.so .shobj/TimeBaseC.o .shobj/TimeBaseC.so: TimeBaseC.cpp TimeBaseC.h \ +.obj/TimeBaseC.o .obj/TimeBaseC.so .shobj/TimeBaseC.o .shobj/TimeBaseC.so: TimeBaseC.cpp \ + TimeBaseC.h \ $(ACE_ROOT)/ace/pre.h \ + Any.h \ + CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ @@ -10640,11 +10534,9 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Any.h \ Environment.h \ Environment.i \ Object.h \ @@ -10658,175 +10550,7 @@ realclean: Exception.i \ Typecode.i \ Any.i \ - TAO_Export.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i \ - Stub.h \ - Pluggable.h \ - Sequence.h \ - Managed_Types.h \ - Managed_Types.i \ - Sequence.i \ - Sequence_T.h \ - Sequence_T.i \ - Sequence_T.cpp \ - IOPC.h \ - IOPC.i \ - Pluggable.i \ - MProfile.h \ - Profile.h \ - Tagged_Components.h \ - CONV_FRAMEC.h \ - CONV_FRAMEC.i \ - Tagged_Components.i \ - PolicyC.h \ - CurrentC.h \ - CurrentC.i \ - Encodable.h \ - Remote_Object_Proxy_Impl.h \ - PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ - Profile.i \ - MProfile.i \ - ORB.h \ - Services.h \ - Services.i \ - CORBA_String.h \ - CORBA_String.inl \ - ORB.i \ - ORB_Core.h \ - Policy_Manager.h \ - LocalObject.h \ - LocalObject.i \ - Policy_Manager.i \ - Resource_Factory.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - Protocol_Factory.h \ - params.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - params.i \ - Adapter.h \ - Adapter.i \ - PolicyFactory_Registry.h \ - PortableInterceptorC.h \ - DynamicC.h \ - DynamicC.i \ - MessagingC.h \ - ValueBase.h \ - ValueBase.i \ - ValueFactory.h \ - ValueFactory.i \ - TimeBaseC.h \ - PollableC.h \ - PollableC.i \ - MessagingC.i \ - PortableInterceptorC.i \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - Parser_Registry.h \ - Parser_Registry.i \ - Service_Callbacks.h \ - Service_Callbacks.i \ - Fault_Tolerance_Service.h \ - Fault_Tolerance_Service.i \ - Transport_Cache_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - Cache_Entries.h \ - Transport_Descriptor_Interface.h \ - Endpoint.h \ - Endpoint.i \ - Transport_Descriptor_Interface.inl \ - Cache_Entries.inl \ - Transport_Cache_Manager.inl \ - Cleanup_Func_Registry.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - Cleanup_Func_Registry.inl \ - Object_Ref_Table.h \ - Interceptor_List.h \ - Interceptor_List.inl \ - RT_Policy_i.h \ - RTCORBAC.h \ - RTCORBAC.i \ - RT_Policy_i.i \ - Protocols_Hooks.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - ORB_Core.i \ - Stub.i \ - Invocation.h \ - Synch_Reply_Dispatcher.h \ - Reply_Dispatcher.h \ - Reply_Dispatcher.i \ - TAOC.h \ - Priority_Mapping_Manager.h \ - Priority_Mapping.h \ - Priority_Mapping.i \ - Priority_Mapping_Manager.i \ - TAOC.i \ - operation_details.h \ - Service_Context.h \ - Service_Context.inl \ - target_specification.h \ - Object_KeyC.h \ - Object_KeyC.i \ - target_specification.i \ - operation_details.i \ - Invocation_Endpoint_Selectors.h \ - Invocation_Endpoint_Selectors.i \ - Invocation.i \ - RequestInfo_Util.h + TimeBaseC.i .obj/Principal.o .obj/Principal.so .shobj/Principal.o .shobj/Principal.so: Principal.cpp \ Principal.h \ @@ -11184,7 +10908,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ GIOP_Message_State.h \ GIOP_Message_State.i \ @@ -11290,8 +11013,7 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - Endpoint.i \ - Stub.h \ + Endpoint.i Stub.h \ Pluggable.h \ Sequence.h \ Managed_Types.h \ @@ -11331,7 +11053,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ GIOP_Message_State.h \ GIOP_Message_State.i \ @@ -11376,14 +11097,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -11441,6 +11160,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -11453,8 +11173,8 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Stub.i \ - Sequence.h Object.h Invocation.h CDR.h Any.h Synch_Reply_Dispatcher.h \ + Stub.i Sequence.h \ + Object.h Invocation.h CDR.h Any.h Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ TAOC.h \ @@ -11462,13 +11182,15 @@ realclean: Priority_Mapping.h \ Priority_Mapping.i \ Priority_Mapping_Manager.i \ - TAOC.i operation_details.h corbafwd.h Service_Context.h \ + TAOC.i operation_details.h \ + Service_Context.h \ Service_Context.inl \ target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ - target_specification.i operation_details.i \ - Invocation_Endpoint_Selectors.h \ + target_specification.i \ + operation_details.i \ + target_specification.h Invocation_Endpoint_Selectors.h \ Invocation_Endpoint_Selectors.i \ Invocation.i Asynch_Invocation.h \ Invocation.h \ @@ -11497,7 +11219,6 @@ realclean: $(ACE_ROOT)/ace/Message_Queue.i \ Transport.inl \ Asynch_Timeout_Handler.h \ - Messaging.h \ Asynch_Reply_Dispatcher.i \ Asynch_Invocation.i \ ORB_Core.h Client_Strategy_Factory.h TAO_Export.h Sync_Strategies.h \ @@ -11650,7 +11371,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Marshal.i \ @@ -11783,7 +11503,8 @@ realclean: Object.i \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ ORB_Core.h \ @@ -11797,8 +11518,6 @@ realclean: $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ Pluggable.h \ - Typecode.h \ - Typecode.i \ IOPC.h \ Any.h \ Any.i \ @@ -11827,14 +11546,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -11893,6 +11610,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -12178,7 +11896,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i @@ -12312,7 +12031,8 @@ realclean: Object.i \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -12325,8 +12045,6 @@ realclean: $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ Pluggable.h \ - Typecode.h \ - Typecode.i \ IOPC.h \ Any.h \ Any.i \ @@ -12355,14 +12073,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -12421,6 +12137,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -12791,8 +12508,8 @@ realclean: TAO_Export.h \ corbafwd.i \ RTCORBAC.h \ - corbafwd.h \ - IOPC.h TAO_Export.h Any.h \ + corbafwd.h IOPC.h \ + TAO_Export.h Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -12809,8 +12526,8 @@ realclean: $(ACE_ROOT)/ace/SString.i \ Exception.i \ Typecode.i \ - Any.i \ - Object.h Exception.h CDR.h Sequence.h \ + Any.i Object.h \ + Exception.h CDR.h Sequence.h \ Managed_Types.h \ Managed_Types.i \ Sequence.i \ @@ -12818,29 +12535,14 @@ realclean: Sequence.h \ Sequence_T.i \ Sequence_T.cpp \ - IOPC.i \ - PolicyC.h \ + IOPC.i PolicyC.h \ CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ - TimeBaseC.h \ - Any.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i RTCORBAC.i \ + TimeBaseC.h Any.h \ + TimeBaseC.i \ + RTCORBAC.i \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -12950,8 +12652,8 @@ realclean: TAO_Export.h \ corbafwd.i \ RTCORBAC.h \ - corbafwd.h \ - IOPC.h TAO_Export.h Any.h \ + corbafwd.h IOPC.h \ + TAO_Export.h Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -12968,8 +12670,8 @@ realclean: $(ACE_ROOT)/ace/SString.i \ Exception.i \ Typecode.i \ - Any.i \ - Object.h Exception.h CDR.h Sequence.h \ + Any.i Object.h \ + Exception.h CDR.h Sequence.h \ Managed_Types.h \ Managed_Types.i \ Sequence.i \ @@ -12977,29 +12679,14 @@ realclean: Sequence.h \ Sequence_T.i \ Sequence_T.cpp \ - IOPC.i \ - PolicyC.h \ + IOPC.i PolicyC.h \ CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ - TimeBaseC.h \ - Any.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i RTCORBAC.i \ + TimeBaseC.h Any.h \ + TimeBaseC.i \ + RTCORBAC.i \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -13165,7 +12852,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ GIOP_Message_State.h \ GIOP_Message_State.i \ @@ -13210,14 +12896,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -13276,6 +12960,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -13297,15 +12982,18 @@ realclean: Priority_Mapping.h \ Priority_Mapping.i \ Priority_Mapping_Manager.i \ - TAOC.i operation_details.h corbafwd.h Service_Context.h \ + TAOC.i operation_details.h \ + Service_Context.h \ Service_Context.inl \ target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ - target_specification.i operation_details.i \ - Invocation_Endpoint_Selectors.h \ + target_specification.i \ + operation_details.i \ + target_specification.h Invocation_Endpoint_Selectors.h \ Invocation_Endpoint_Selectors.i \ - Invocation.i Principal.h OctetSeqC.h Sequence.h OctetSeqC.i \ + Invocation.i Principal.h corbafwd.h OctetSeqC.h Sequence.h \ + OctetSeqC.i \ Principal.i \ Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ @@ -13334,8 +13022,7 @@ realclean: $(ACE_ROOT)/ace/Message_Queue.i \ Transport.inl Pluggable.h Connector_Registry.h \ Connector_Registry.i \ - Wait_Strategy.h Wait_Strategy.inl Transport_Mux_Strategy.h \ - Bind_Dispatcher_Guard.h \ + Wait_Strategy.h Transport_Mux_Strategy.h Bind_Dispatcher_Guard.h \ Bind_Dispatcher_Guard.i \ Transport_Mux_Strategy.h \ Endpoint.h RT_Policy_i.h Base_Transport_Property.h \ @@ -13348,7 +13035,6 @@ realclean: GIOP_Utils.i \ ORB_Core.h Pluggable_Messaging_Utils.h \ Pluggable_Messaging_Utils.i \ - Endpoint_Selector_Factory.h \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ $(ACE_ROOT)/ace/Dynamic_Service.i \ @@ -13489,7 +13175,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ GIOP_Message_State.h \ GIOP_Message_State.i \ @@ -13539,14 +13224,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -13605,6 +13288,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -13777,7 +13461,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ GIOP_Message_State.h \ GIOP_Message_State.i \ @@ -13829,14 +13512,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -13895,6 +13576,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -14068,7 +13750,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ GIOP_Message_State.h \ GIOP_Message_State.i \ @@ -14113,14 +13794,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -14179,6 +13858,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -14237,7 +13917,6 @@ realclean: $(ACE_ROOT)/ace/Message_Queue.i \ Transport.inl \ Asynch_Timeout_Handler.h \ - Messaging.h \ Asynch_Reply_Dispatcher.i \ Asynch_Invocation.i \ Timeprobe.h \ @@ -14377,8 +14056,10 @@ realclean: target_specification.i \ operation_details.i -.obj/PortableInterceptor.o .obj/PortableInterceptor.so .shobj/PortableInterceptor.o .shobj/PortableInterceptor.so: PortableInterceptor.cpp PortableInterceptor.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ +.obj/PortableInterceptor.o .obj/PortableInterceptor.so .shobj/PortableInterceptor.o .shobj/PortableInterceptor.so: PortableInterceptor.cpp \ + PortableInterceptor.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -14473,8 +14154,8 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - PortableInterceptorC.h DynamicC.h \ - corbafwd.h \ + PortableInterceptorC.h \ + DynamicC.h \ Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -14500,41 +14181,32 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ - DynamicC.i MessagingC.h orbconf.h ValueBase.h \ + DynamicC.i \ + MessagingC.h \ + Remote_Object_Proxy_Impl.h \ + ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - TAO_Export.h Any.h CDR.h Remote_Object_Proxy_Impl.h TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i IOPC.h Object.h Exception.h Sequence.h IOPC.i PolicyC.h \ + TimeBaseC.h \ + TimeBaseC.i \ + PolicyC.h \ CurrentC.h \ CurrentC.i \ - Encodable.h Environment.h \ + Encodable.h \ PolicyC.i \ - PollableC.h PollableC.i MessagingC.i CurrentC.h \ - PortableInterceptorC.i Interceptor_List.h \ + IOPC.h \ + IOPC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i \ + PortableInterceptorC.i \ + Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ - Interceptor_List.inl PortableInterceptor.i ClientRequestInfo.h \ - LocalObject.h \ - LocalObject.i \ - StringSeqC.h StringSeqC.i Service_Context.h \ - IOPC.h \ - Service_Context.inl \ - ClientRequestInfo.inl + Interceptor_List.inl \ + PortableInterceptor.i .obj/ClientRequestInfo.o .obj/ClientRequestInfo.so .shobj/ClientRequestInfo.o .shobj/ClientRequestInfo.so: ClientRequestInfo.cpp ClientRequestInfo.h \ $(ACE_ROOT)/ace/pre.h corbafwd.h \ @@ -14659,36 +14331,27 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ - DynamicC.i MessagingC.h orbconf.h ValueBase.h \ + DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - TAO_Export.h Any.h CDR.h Remote_Object_Proxy_Impl.h TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i IOPC.h Object.h Exception.h Sequence.h IOPC.i PolicyC.h \ + TimeBaseC.h \ + TimeBaseC.i \ + PolicyC.h \ CurrentC.h \ CurrentC.i \ - Encodable.h Environment.h \ + Encodable.h \ PolicyC.i \ - PollableC.h PollableC.i MessagingC.i CurrentC.h \ - PortableInterceptorC.i LocalObject.h \ - LocalObject.i \ - StringSeqC.h StringSeqC.i Service_Context.h \ IOPC.h \ + IOPC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i LocalObject.h \ + LocalObject.i \ + StringSeqC.h Sequence.h StringSeqC.i Service_Context.h \ Service_Context.inl \ - ClientRequestInfo.inl Invocation.h Stub.h \ + ClientRequestInfo.inl Invocation.h CDR.h Stub.h \ Pluggable.h \ Pluggable.i \ MProfile.h \ @@ -14697,7 +14360,6 @@ realclean: CONV_FRAMEC.h \ CONV_FRAMEC.i \ Tagged_Components.i \ - PolicyC.h \ GIOP_Message_State.h \ GIOP_Message_State.i \ Profile.i \ @@ -14723,6 +14385,16 @@ realclean: $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ Adapter.h \ Adapter.i \ PolicyFactory_Registry.h \ @@ -14777,11 +14449,10 @@ realclean: Interceptor_List.inl \ RT_Policy_i.h \ RTCORBAC.h \ - TimeBaseC.h \ - Encodable.h \ RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -14794,7 +14465,7 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Stub.i \ + Stub.i Any.h \ Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ @@ -14803,13 +14474,16 @@ realclean: Priority_Mapping.h \ Priority_Mapping.i \ Priority_Mapping_Manager.i \ - TAOC.i operation_details.h target_specification.h \ + TAOC.i operation_details.h \ + Service_Context.h \ + target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ - target_specification.i operation_details.i \ - Invocation_Endpoint_Selectors.h \ + target_specification.i \ + operation_details.i \ + target_specification.h Invocation_Endpoint_Selectors.h \ Invocation_Endpoint_Selectors.i \ - Invocation.i Tagged_Components.h debug.h + Invocation.i Tagged_Components.h .obj/RequestInfo_Util.o .obj/RequestInfo_Util.so .shobj/RequestInfo_Util.o .shobj/RequestInfo_Util.so: RequestInfo_Util.cpp RequestInfo_Util.h \ $(ACE_ROOT)/ace/pre.h corbafwd.h \ @@ -15060,31 +14734,23 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ - DynamicC.i MessagingC.h orbconf.h ValueBase.h \ + DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - TAO_Export.h Any.h CDR.h Remote_Object_Proxy_Impl.h TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i IOPC.h Object.h Exception.h Sequence.h IOPC.i PolicyC.h \ + TimeBaseC.h \ + TimeBaseC.i \ + PolicyC.h \ CurrentC.h \ CurrentC.i \ - Encodable.h Environment.h \ + Encodable.h \ PolicyC.i \ - PollableC.h PollableC.i MessagingC.i CurrentC.h \ - PortableInterceptorC.i CORBA_String.h \ + IOPC.h \ + IOPC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i CORBA_String.h \ CORBA_String.inl .obj/DynamicC.o .obj/DynamicC.so .shobj/DynamicC.o .shobj/DynamicC.so: DynamicC.cpp DynamicC.h \ @@ -15336,125 +15002,7 @@ realclean: Exception.i \ Typecode.i \ Any.i CDR.h \ - Typecode.h ORB_Core.h ORB.h Exception.h Services.h \ - Services.i \ - CORBA_String.h \ - CORBA_String.inl \ - PolicyC.h \ - CurrentC.h \ - CurrentC.i \ - TAO_Export.h Encodable.h Environment.h Remote_Object_Proxy_Impl.h \ - PolicyC.i \ - ORB.i \ - Policy_Manager.h \ - LocalObject.h \ - LocalObject.i \ - PolicyC.h \ - Policy_Manager.i \ - Resource_Factory.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - Pluggable.h \ - IOPC.h \ - Any.h \ - IOPC.i \ - Pluggable.i \ - Protocol_Factory.h \ - params.h \ - CORBA_String.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - params.i \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - TAO_Singleton.h \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \ - DynamicC.h DynamicC.i MessagingC.h orbconf.h ValueBase.h \ - ValueBase.i \ - ValueFactory.h \ - ValueFactory.i \ - TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i IOPC.h PollableC.h PollableC.i MessagingC.i CurrentC.h \ - PortableInterceptorC.i \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - Parser_Registry.h \ - Parser_Registry.i \ - Service_Callbacks.h \ - Service_Callbacks.i \ - Fault_Tolerance_Service.h \ - Fault_Tolerance_Service.i \ - Transport_Cache_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - Cache_Entries.h \ - Transport_Descriptor_Interface.h \ - Endpoint.h \ - Endpoint.i \ - Transport_Descriptor_Interface.inl \ - Cache_Entries.inl \ - Transport_Cache_Manager.inl \ - Cleanup_Func_Registry.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \ - Interceptor_List.inl RT_Policy_i.h \ - RTCORBAC.h \ - TimeBaseC.h \ - Encodable.h \ - RTCORBAC.i \ - RT_Policy_i.i \ - Protocols_Hooks.h RTCORBAC.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - ORB_Core.i + Typecode.h .obj/StringSeqC.o .obj/StringSeqC.so .shobj/StringSeqC.o .shobj/StringSeqC.so: StringSeqC.cpp StringSeqC.h \ $(ACE_ROOT)/ace/pre.h corbafwd.h \ @@ -15676,8 +15224,8 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - ORB.h Exception.h \ + corbafwd.i ORB.h \ + Exception.h \ corbafwd.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ @@ -15702,14 +15250,17 @@ realclean: Object_Proxy_Impl.h \ Object.i \ CurrentC.i \ - TAO_Export.h Encodable.h Environment.h Sequence.h CDR.h \ + Encodable.h \ + Exception.h \ + CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ - Policy_Manager.h \ + Environment.h Policy_Manager.h \ LocalObject.h \ LocalObject.i \ PolicyC.h \ @@ -15720,12 +15271,8 @@ realclean: $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ Pluggable.h \ - Typecode.h \ - Exception.h \ - Typecode.i \ IOPC.h \ Any.h \ - CDR.h \ Any.i \ IOPC.i \ Pluggable.i \ @@ -15749,16 +15296,16 @@ realclean: $(ACE_ROOT)/ace/Managed_Object.cpp \ TAO_Singleton_Manager.h \ Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \ - DynamicC.h DynamicC.i MessagingC.h orbconf.h ValueBase.h \ + DynamicC.h DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - Any.h TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i IOPC.h PollableC.h PollableC.i MessagingC.i CurrentC.h \ - PortableInterceptorC.i \ + TimeBaseC.h \ + TimeBaseC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -15806,11 +15353,9 @@ realclean: Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \ Interceptor_List.inl RT_Policy_i.h \ RTCORBAC.h \ - TimeBaseC.h \ - Encodable.h \ RTCORBAC.i \ RT_Policy_i.i \ - Protocols_Hooks.h RTCORBAC.h \ + Protocols_Hooks.h RTCORBAC.h BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -15824,7 +15369,7 @@ realclean: $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i ORB_Table.h \ ORB_Table.inl \ - TAO_Internal.h default_client.h \ + TAO_Internal.h TAO_Export.h default_client.h \ Client_Strategy_Factory.h \ default_client.i \ default_server.h \ @@ -15842,8 +15387,7 @@ realclean: GIOP_Message_State.h \ GIOP_Message_State.i \ Profile.i \ - MProfile.i \ - Stub.h \ + MProfile.i Stub.h \ MProfile.h \ ORB.h \ ORB_Core.h \ @@ -15899,20 +15443,22 @@ realclean: $(ACE_ROOT)/ace/Dynamic_Service.i \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(ACE_ROOT)/ace/Arg_Shifter.h \ - Services_Activate.h Invocation.h Synch_Reply_Dispatcher.h \ + Services_Activate.h Invocation.h CDR.h Any.h Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ - TAOC.h operation_details.h Service_Context.h \ + TAOC.h operation_details.h \ + Service_Context.h \ Service_Context.inl \ target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ - target_specification.i operation_details.i \ - Invocation_Endpoint_Selectors.h \ + target_specification.i \ + operation_details.i \ + target_specification.h Invocation_Endpoint_Selectors.h \ Invocation_Endpoint_Selectors.i \ - Invocation.i BiDir_Adapter.h Endpoint_Selector_Factory.h \ - RT_Endpoint_Selector_Factory.h \ - Endpoint_Selector_Factory.h \ + Invocation.i RT_Invocation_Endpoint_Selectors.h \ + Invocation_Endpoint_Selectors.h \ + RT_Invocation_Endpoint_Selectors.i \ IORInfo.h LocalObject.h .obj/ORB_Table.o .obj/ORB_Table.so .shobj/ORB_Table.o .shobj/ORB_Table.so: ORB_Table.cpp ORB_Table.h \ @@ -16054,8 +15600,8 @@ realclean: try_macros.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ - corbafwd.i \ - ORB.h Exception.h \ + corbafwd.i ORB.h \ + Exception.h \ corbafwd.h \ Exception.i \ Services.h \ @@ -16078,26 +15624,25 @@ realclean: Object_Proxy_Impl.h \ Object.i \ CurrentC.i \ - TAO_Export.h Encodable.h Environment.h Sequence.h CDR.h \ + Encodable.h \ + Exception.h \ + CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ - Policy_Manager.h \ + Environment.h Policy_Manager.h \ LocalObject.h \ LocalObject.i \ PolicyC.h \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ - Typecode.h \ - Exception.h \ - Typecode.i \ IOPC.h \ Any.h \ - CDR.h \ Any.i \ IOPC.i \ Pluggable.i \ @@ -16107,16 +15652,16 @@ realclean: params.i \ TAO_Singleton_Manager.h TAO_Singleton.h Adapter.h Adapter.i \ PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h DynamicC.i \ - MessagingC.h orbconf.h ValueBase.h \ + MessagingC.h Remote_Object_Proxy_Impl.h \ + ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - Any.h TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i IOPC.h PollableC.h PollableC.i MessagingC.i CurrentC.h \ - PortableInterceptorC.i \ + TimeBaseC.h \ + TimeBaseC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -16141,11 +15686,9 @@ realclean: Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \ Interceptor_List.inl RT_Policy_i.h \ RTCORBAC.h \ - TimeBaseC.h \ - Encodable.h \ RTCORBAC.i \ RT_Policy_i.i \ - Protocols_Hooks.h RTCORBAC.h \ + Protocols_Hooks.h RTCORBAC.h BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -16287,7 +15830,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -16300,8 +15844,6 @@ realclean: $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ Pluggable.h \ - Typecode.h \ - Typecode.i \ IOPC.h \ Any.h \ Any.i \ @@ -16330,14 +15872,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -16396,6 +15936,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -16767,7 +16308,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -16796,14 +16336,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -16862,6 +16400,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -17170,8 +16709,6 @@ realclean: Object.i \ CurrentC.i \ Encodable.h \ - Environment.h \ - Environment.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -17179,25 +16716,18 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ + Environment.h \ + Environment.i \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ TimeBaseC.h \ Any.h \ - Typecode.h \ - Typecode.i \ Any.i \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ Priority_Mapping_Manager.h \ Priority_Mapping.h \ @@ -17239,6 +16769,11 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ Adapter.h \ Adapter.i \ PolicyFactory_Registry.h \ @@ -17246,6 +16781,7 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -17271,6 +16807,7 @@ realclean: RT_Policy_i.h \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ ORB_Core.i \ Stub.i @@ -17451,8 +16988,10 @@ realclean: FILE_Parser.i DLL_Parser.h DLL_Parser.i Object_Loader.h \ Object_Loader.i -.obj/TAO_Server_Request.o .obj/TAO_Server_Request.so .shobj/TAO_Server_Request.o .shobj/TAO_Server_Request.so: TAO_Server_Request.cpp TAO_Server_Request.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ +.obj/TAO_Server_Request.o .obj/TAO_Server_Request.so .shobj/TAO_Server_Request.o .shobj/TAO_Server_Request.so: TAO_Server_Request.cpp \ + TAO_Server_Request.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -17553,7 +17092,6 @@ realclean: IOPC.h \ Any.h \ CDR.h \ - corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ @@ -17581,24 +17119,28 @@ realclean: Object_KeyC.i \ GIOPC.i \ Tagged_Profile.i \ - OctetSeqC.h Sequence.h OctetSeqC.i Service_Context.h \ + OctetSeqC.h \ + OctetSeqC.i \ + Service_Context.h \ Service_Context.inl \ - Object.h TAO_Server_Request.i CDR.h Environment.h Principal.h \ + TAO_Server_Request.i \ + Principal.h \ Principal.i \ - ORB_Core.h ORB.h Exception.h Services.h \ + ORB_Core.h \ + ORB.h \ + Services.h \ Services.i \ CORBA_String.h \ CORBA_String.inl \ PolicyC.h \ CurrentC.h \ CurrentC.i \ - TAO_Export.h Encodable.h Remote_Object_Proxy_Impl.h \ + Encodable.h \ PolicyC.i \ ORB.i \ Policy_Manager.h \ LocalObject.h \ LocalObject.i \ - PolicyC.h \ Policy_Manager.i \ Resource_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -17609,7 +17151,6 @@ realclean: Pluggable.i \ Protocol_Factory.h \ params.h \ - CORBA_String.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ @@ -17619,23 +17160,28 @@ realclean: TAO_Singleton.h \ TAO_Singleton.inl \ TAO_Singleton.cpp \ - TAO_Singleton.h \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \ - DynamicC.h DynamicC.i MessagingC.h orbconf.h ValueBase.h \ + Adapter.h \ + Adapter.i \ + PolicyFactory_Registry.h \ + PortableInterceptorC.h \ + DynamicC.h \ + DynamicC.i \ + MessagingC.h \ + Remote_Object_Proxy_Impl.h \ + ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - Any.h TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i IOPC.h PollableC.h PollableC.i MessagingC.i CurrentC.h \ + TimeBaseC.h \ + TimeBaseC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i \ PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ @@ -17681,14 +17227,16 @@ realclean: $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ - Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \ - Interceptor_List.inl RT_Policy_i.h \ + Cleanup_Func_Registry.inl \ + Object_Ref_Table.h \ + Interceptor_List.h \ + Interceptor_List.inl \ + RT_Policy_i.h \ RTCORBAC.h \ - TimeBaseC.h \ - Encodable.h \ RTCORBAC.i \ RT_Policy_i.i \ - Protocols_Hooks.h RTCORBAC.h \ + Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -17700,16 +17248,18 @@ realclean: $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ - ORB_Core.i Timeprobe.h \ + ORB_Core.i \ + Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ - debug.h Pluggable_Messaging_Utils.h \ + debug.h \ + Pluggable_Messaging_Utils.h \ Pluggable_Messaging_Utils.i \ Pluggable_Messaging.h \ - Pluggable_Messaging_Utils.h \ Pluggable_Messaging.i \ GIOP_Utils.h \ GIOP_Utils.i \ - Transport.h Transport_Descriptor_Interface.h \ + Transport.h corbafwd.h Exception.h Transport_Descriptor_Interface.h \ + Transport_Cache_Manager.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ @@ -17862,54 +17412,24 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Object_KeyC.h \ Object_KeyC.i \ DomainC.h \ - corba.h \ + ClientRequestInfo.h \ + PortableInterceptorC.h \ + DynamicC.h \ Any.h \ Any.i \ - NVList.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - NVList.i \ - LocalObject.h \ - LocalObject.i \ - Principal.h \ - OctetSeqC.h \ - OctetSeqC.i \ - Principal.i \ - BoundsC.h \ - BoundsC.i \ + DynamicC.i \ + MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - WrongTransactionC.h \ - ObjectIDList.h \ - ObjectIDList.i \ - PortableInterceptor.h \ - PortableInterceptorC.h \ - DynamicC.h \ - DynamicC.i \ - MessagingC.h \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ IOPC.h \ IOPC.i \ @@ -17917,20 +17437,26 @@ realclean: PollableC.i \ MessagingC.i \ PortableInterceptorC.i \ - Interceptor_List.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - Interceptor_List.inl \ - PortableInterceptor.i \ + LocalObject.h \ + LocalObject.i \ StringSeqC.h \ StringSeqC.i \ - DomainC.i + Service_Context.h \ + Service_Context.inl \ + ClientRequestInfo.inl \ + DomainC.i \ + WrongTransactionC.h \ + NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + NVList.i \ + BoundsC.h \ + BoundsC.i .obj/TypeCodeFactory_Adapter.o .obj/TypeCodeFactory_Adapter.so .shobj/TypeCodeFactory_Adapter.o .shobj/TypeCodeFactory_Adapter.so: TypeCodeFactory_Adapter.cpp \ TypeCodeFactory_Adapter.h \ $(ACE_ROOT)/ace/pre.h \ - Exception.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ @@ -18026,14 +17552,15 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - Exception.i \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ Typecode.h \ + Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ Typecode.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ @@ -18172,7 +17699,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -18185,8 +17713,6 @@ realclean: $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ Pluggable.h \ - Typecode.h \ - Typecode.i \ IOPC.h \ Any.h \ Any.i \ @@ -18215,14 +17741,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -18281,6 +17805,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -18393,8 +17918,7 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - Wait_Strategy.inl + corbafwd.i .obj/Wait_On_Read.o .obj/Wait_On_Read.so .shobj/Wait_On_Read.o .shobj/Wait_On_Read.so: Wait_On_Read.cpp \ Wait_On_Read.h \ @@ -18495,7 +18019,6 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - Wait_Strategy.inl \ Transport.h corbafwd.h Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ @@ -18680,7 +18203,6 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - Wait_Strategy.inl \ ORB_Core.h \ ORB.h \ Exception.h \ @@ -18712,7 +18234,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -18725,8 +18248,6 @@ realclean: $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ Pluggable.h \ - Typecode.h \ - Typecode.i \ IOPC.h \ Any.h \ Any.i \ @@ -18755,14 +18276,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -18821,6 +18340,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -18957,7 +18477,6 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - Wait_Strategy.inl \ ORB_Core.h \ ORB.h \ Exception.h \ @@ -18989,7 +18508,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -19002,8 +18522,6 @@ realclean: $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ Pluggable.h \ - Typecode.h \ - Typecode.i \ IOPC.h \ Any.h \ Any.i \ @@ -19032,14 +18550,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -19098,6 +18614,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -19958,7 +19475,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -19995,14 +19511,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -20061,6 +19575,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -20074,7 +19589,6 @@ realclean: $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ Wait_Strategy.h \ - Wait_Strategy.inl \ Pluggable_Messaging_Utils.h \ Pluggable_Messaging_Utils.i \ Transport.h corbafwd.h Exception.h Transport_Descriptor_Interface.h \ @@ -20310,22 +19824,13 @@ realclean: IOPC.i \ Reply_Dispatcher.i \ Asynch_Timeout_Handler.h \ - Messaging.h \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - Remote_Object_Proxy_Impl.h \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PolicyC.h \ CurrentC.h \ @@ -20355,6 +19860,11 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ Adapter.h \ Adapter.i \ PolicyFactory_Registry.h \ @@ -20381,6 +19891,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ ORB_Core.i \ Leader_Follower.h \ Leader_Follower.i \ @@ -20594,22 +20105,13 @@ realclean: Sequence_T.cpp \ IOPC.i \ Reply_Dispatcher.i \ - Messaging.h \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - Remote_Object_Proxy_Impl.h \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PolicyC.h \ CurrentC.h \ @@ -20623,8 +20125,7 @@ realclean: Transport_Mux_Strategy.h .obj/IOPC.o .obj/IOPC.so .shobj/IOPC.o .shobj/IOPC.so: IOPC.cpp IOPC.h \ - $(ACE_ROOT)/ace/pre.h \ - TAO_Export.h \ + $(ACE_ROOT)/ace/pre.h TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -20632,8 +20133,8 @@ realclean: $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - Any.h CDR.h \ + $(ACE_ROOT)/ace/OS_Errno.inl Any.h \ + CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -20736,8 +20237,8 @@ realclean: $(ACE_ROOT)/ace/SString.i \ Exception.i \ Typecode.i \ - Any.i \ - Object.h Exception.h CDR.h Sequence.h \ + Any.i Object.h \ + Exception.h CDR.h Sequence.h \ Managed_Types.h \ Managed_Types.i \ Sequence.i \ @@ -20855,8 +20356,7 @@ realclean: CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - CDR.i \ - PollableC.i \ + CDR.i PollableC.i \ Stub.h \ Pluggable.h \ Sequence.h \ @@ -20885,7 +20385,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ GIOP_Message_State.h \ GIOP_Message_State.i \ @@ -20930,14 +20429,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ MessagingC.i \ @@ -20995,6 +20492,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -21288,7 +20786,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ GIOP_Message_State.h \ GIOP_Message_State.i \ @@ -21334,14 +20831,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -21400,6 +20895,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -21896,8 +21392,6 @@ realclean: $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ Exception.i \ - Environment.h \ - Environment.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -21905,30 +21399,18 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ + Environment.h \ + Environment.i \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ TimeBaseC.h \ Any.h \ - Typecode.h \ - Typecode.i \ Any.i \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ Priority_Mapping_Manager.h \ Priority_Mapping.h \ @@ -22378,7 +21860,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ DLL_ORB.inl \ @@ -22521,7 +22004,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -22530,8 +22014,6 @@ realclean: Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ - Typecode.h \ - Typecode.i \ IOPC.h \ Any.h \ Any.i \ @@ -22558,14 +22040,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -22624,6 +22104,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -22878,7 +22359,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i .obj/Parser_Registry.o .obj/Parser_Registry.so .shobj/Parser_Registry.o .shobj/Parser_Registry.so: Parser_Registry.cpp \ @@ -23017,7 +22497,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -23026,8 +22507,6 @@ realclean: Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ - Typecode.h \ - Typecode.i \ IOPC.h \ Any.h \ Any.i \ @@ -23056,14 +22535,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -23120,6 +22597,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -23546,7 +23024,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ $(ACE_ROOT)/ace/Read_Buffer.h \ @@ -23697,25 +23176,24 @@ realclean: Object_Proxy_Impl.h \ Object.i \ CurrentC.i \ - TAO_Export.h Encodable.h Environment.h Sequence.h CDR.h \ + Encodable.h \ + CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ - Policy_Manager.h \ + Environment.h Policy_Manager.h \ LocalObject.h \ LocalObject.i \ PolicyC.h \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ - Typecode.h \ - Typecode.i \ IOPC.h \ Any.h \ - CDR.h \ Any.i \ IOPC.i \ Pluggable.i \ @@ -23736,16 +23214,16 @@ realclean: $(ACE_ROOT)/ace/Managed_Object.cpp \ TAO_Singleton_Manager.h \ Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \ - DynamicC.h DynamicC.i MessagingC.h orbconf.h ValueBase.h \ + DynamicC.h DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - Any.h TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i IOPC.h PollableC.h PollableC.i MessagingC.i CurrentC.h \ - PortableInterceptorC.i \ + TimeBaseC.h \ + TimeBaseC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -23778,11 +23256,9 @@ realclean: Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \ Interceptor_List.inl RT_Policy_i.h \ RTCORBAC.h \ - TimeBaseC.h \ - Encodable.h \ RTCORBAC.i \ RT_Policy_i.i \ - Protocols_Hooks.h RTCORBAC.h \ + Protocols_Hooks.h RTCORBAC.h BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -23807,8 +23283,8 @@ realclean: MProfile.i \ ORB.h \ ORB_Core.h \ - Stub.i \ - MProfile.h Connector_Registry.h \ + Stub.i MProfile.h \ + Connector_Registry.h \ params.h \ Connector_Registry.i @@ -23973,7 +23449,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ GIOP_Message_State.h \ GIOP_Message_State.i \ @@ -24011,14 +23486,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -24062,6 +23535,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -24083,13 +23557,15 @@ realclean: Priority_Mapping.h \ Priority_Mapping.i \ Priority_Mapping_Manager.i \ - TAOC.i operation_details.h corbafwd.h Service_Context.h \ + TAOC.i operation_details.h \ + Service_Context.h \ Service_Context.inl \ target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ - target_specification.i operation_details.i \ - Invocation_Endpoint_Selectors.h \ + target_specification.i \ + operation_details.i \ + target_specification.h Invocation_Endpoint_Selectors.h \ Invocation_Endpoint_Selectors.i \ Invocation.i @@ -24370,7 +23846,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -24403,14 +23878,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -24465,6 +23938,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -24606,33 +24080,20 @@ realclean: Sequence_T.cpp \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - Remote_Object_Proxy_Impl.h \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ - IOPC.h \ - IOPC.i \ PolicyC.h \ CurrentC.h \ CurrentC.i \ Encodable.h \ PolicyC.i \ + IOPC.h \ + IOPC.i \ PollableC.h \ PollableC.i \ MessagingC.i \ @@ -24767,40 +24228,32 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ - DynamicC.i MessagingC.h orbconf.h ValueBase.h \ + DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - TAO_Export.h Any.h CDR.h Remote_Object_Proxy_Impl.h TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i IOPC.h Object.h Exception.h Sequence.h IOPC.i PolicyC.h \ + TimeBaseC.h \ + TimeBaseC.i \ + PolicyC.h \ CurrentC.h \ CurrentC.i \ - Encodable.h Environment.h \ + Encodable.h \ PolicyC.i \ - PollableC.h PollableC.i MessagingC.i CurrentC.h \ - PortableInterceptorC.i LocalObject.h \ + IOPC.h \ + IOPC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i LocalObject.h \ LocalObject.i \ - StringSeqC.h StringSeqC.i CodecFactory.h ORB_Core.h ORB.h Services.h \ + StringSeqC.h Sequence.h StringSeqC.i CodecFactory.h TAO_Export.h \ + ORB_Core.h ORB.h Exception.h Services.h \ Services.i \ CORBA_String.h \ CORBA_String.inl \ - ORB.i \ - Policy_Manager.h \ + PolicyC.h ORB.i \ + Environment.h Policy_Manager.h \ LocalObject.h \ - PolicyC.h \ Policy_Manager.i \ Resource_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -24808,7 +24261,6 @@ realclean: $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ Pluggable.h \ - IOPC.h \ Pluggable.i \ Protocol_Factory.h \ params.h \ @@ -24817,8 +24269,19 @@ realclean: $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ params.i \ - TAO_Singleton_Manager.h TAO_Singleton.h Adapter.h Adapter.i \ - PolicyFactory_Registry.h \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + TAO_Singleton.h \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + TAO_Singleton_Manager.h \ + Adapter.h Adapter.i PolicyFactory_Registry.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -24866,11 +24329,9 @@ realclean: Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \ Interceptor_List.inl RT_Policy_i.h \ RTCORBAC.h \ - TimeBaseC.h \ - Encodable.h \ RTCORBAC.i \ RT_Policy_i.i \ - Protocols_Hooks.h RTCORBAC.h \ + Protocols_Hooks.h RTCORBAC.h BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -24886,8 +24347,7 @@ realclean: .obj/ORBInitializer_Registry.o .obj/ORBInitializer_Registry.so .shobj/ORBInitializer_Registry.o .shobj/ORBInitializer_Registry.so: ORBInitializer_Registry.cpp \ ORBInitializer_Registry.h \ - $(ACE_ROOT)/ace/pre.h \ - TAO_Export.h \ + $(ACE_ROOT)/ace/pre.h TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -25010,16 +24470,26 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ - DynamicC.i MessagingC.h orbconf.h ValueBase.h \ + DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - Any.h CDR.h Remote_Object_Proxy_Impl.h TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ + TimeBaseC.h \ + TimeBaseC.i \ + PolicyC.h \ + CurrentC.h \ + CurrentC.i \ + Encodable.h \ + PolicyC.i \ + IOPC.h \ + IOPC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i TAO_Singleton.h \ TAO_Singleton.inl \ TAO_Singleton.cpp \ + TAO_Singleton.h \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ @@ -25027,23 +24497,15 @@ realclean: $(ACE_ROOT)/ace/Managed_Object.cpp \ TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i IOPC.h Object.h Exception.h Sequence.h IOPC.i PolicyC.h \ - CurrentC.h \ - CurrentC.i \ - Encodable.h Environment.h \ - PolicyC.i \ - PollableC.h PollableC.i MessagingC.i CurrentC.h \ - PortableInterceptorC.i TAO_Singleton.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ ORBInitializer_Registry.inl \ - ORB.h Services.h \ + ORB.h Exception.h Services.h \ Services.i \ CORBA_String.h \ CORBA_String.inl \ - ORB.i \ + PolicyC.h ORB.i \ TAO_Singleton_Manager.h .obj/PolicyFactory_Registry.o .obj/PolicyFactory_Registry.so .shobj/PolicyFactory_Registry.o .shobj/PolicyFactory_Registry.so: PolicyFactory_Registry.cpp \ @@ -25170,31 +24632,23 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ - DynamicC.i MessagingC.h orbconf.h ValueBase.h \ + DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - TAO_Export.h Any.h CDR.h Remote_Object_Proxy_Impl.h TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i IOPC.h Object.h Exception.h Sequence.h IOPC.i PolicyC.h \ + TimeBaseC.h \ + TimeBaseC.i \ + PolicyC.h \ CurrentC.h \ CurrentC.i \ - Encodable.h Environment.h \ + Encodable.h \ PolicyC.i \ - PollableC.h PollableC.i MessagingC.i CurrentC.h \ - PortableInterceptorC.i \ + IOPC.h \ + IOPC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i PolicyC.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -25716,7 +25170,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -25725,8 +25180,6 @@ realclean: Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ - Typecode.h \ - Typecode.i \ IOPC.h \ Any.h \ Any.i \ @@ -25747,14 +25200,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -25779,6 +25230,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ ORB_Core.i .obj/Cleanup_Func_Registry.o .obj/Cleanup_Func_Registry.so .shobj/Cleanup_Func_Registry.o .shobj/Cleanup_Func_Registry.so: Cleanup_Func_Registry.cpp \ @@ -26108,40 +25560,30 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ - DynamicC.i MessagingC.h orbconf.h ValueBase.h \ + DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - TAO_Export.h Any.h CDR.h Remote_Object_Proxy_Impl.h TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i IOPC.h Object.h Exception.h Sequence.h IOPC.i PolicyC.h \ + TimeBaseC.h \ + TimeBaseC.i \ + PolicyC.h \ CurrentC.h \ CurrentC.i \ - Encodable.h Environment.h \ + Encodable.h \ PolicyC.i \ - PollableC.h PollableC.i MessagingC.i CurrentC.h \ - PortableInterceptorC.i LocalObject.h \ + IOPC.h \ + IOPC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i LocalObject.h \ LocalObject.i \ - MProfile.h \ + PolicyC.h MProfile.h \ Profile.h \ Tagged_Components.h \ - IOPC.h \ CONV_FRAMEC.h \ CONV_FRAMEC.i \ Tagged_Components.i \ - PolicyC.h \ GIOP_Message_State.h \ GIOP_Message_State.i \ Profile.i \ @@ -26291,7 +25733,6 @@ realclean: .obj/BiDir_Adapter.o .obj/BiDir_Adapter.so .shobj/BiDir_Adapter.o .shobj/BiDir_Adapter.so: BiDir_Adapter.cpp \ BiDir_Adapter.h \ $(ACE_ROOT)/ace/pre.h \ - Exception.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ @@ -26387,21 +25828,13 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - Exception.i \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ - $(ACE_ROOT)/ace/Dynamic_Service.i \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp + $(ACE_ROOT)/ace/Service_Object.i .obj/CodecFactory.o .obj/CodecFactory.so .shobj/CodecFactory.o .shobj/CodecFactory.so: CodecFactory.cpp CodecFactory.h \ - $(ACE_ROOT)/ace/pre.h \ - TAO_Export.h \ + $(ACE_ROOT)/ace/pre.h TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -26409,9 +25842,8 @@ realclean: $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - IOPC.h Any.h \ - CDR.h \ + $(ACE_ROOT)/ace/OS_Errno.inl IOPC.h \ + Any.h CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -26514,8 +25946,8 @@ realclean: $(ACE_ROOT)/ace/SString.i \ Exception.i \ Typecode.i \ - Any.i \ - Object.h Exception.h CDR.h Sequence.h \ + Any.i Object.h \ + Exception.h CDR.h Sequence.h \ Managed_Types.h \ Managed_Types.i \ Sequence.i \ @@ -26529,8 +25961,7 @@ realclean: .obj/CodecFactory_ORBInitializer.o .obj/CodecFactory_ORBInitializer.so .shobj/CodecFactory_ORBInitializer.o .shobj/CodecFactory_ORBInitializer.so: CodecFactory_ORBInitializer.cpp \ CodecFactory_ORBInitializer.h \ - $(ACE_ROOT)/ace/pre.h \ - TAO_Export.h \ + $(ACE_ROOT)/ace/pre.h TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -26653,31 +26084,23 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ - DynamicC.i MessagingC.h orbconf.h ValueBase.h \ + DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - Any.h CDR.h Remote_Object_Proxy_Impl.h TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i IOPC.h Object.h Exception.h Sequence.h IOPC.i PolicyC.h \ + TimeBaseC.h \ + TimeBaseC.i \ + PolicyC.h \ CurrentC.h \ CurrentC.i \ - Encodable.h Environment.h \ + Encodable.h \ PolicyC.i \ - PollableC.h PollableC.i MessagingC.i CurrentC.h \ - PortableInterceptorC.i LocalObject.h \ + IOPC.h \ + IOPC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i LocalObject.h \ LocalObject.i \ CodecFactory.h @@ -26780,8 +26203,8 @@ realclean: corbafwd.i \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - CDR.i \ - OctetSeqC.h corbafwd.h Sequence.h \ + CDR.i OctetSeqC.h \ + corbafwd.h Sequence.h \ Managed_Types.h \ Managed_Types.i \ Sequence.i \ @@ -26803,8 +26226,8 @@ realclean: $(ACE_ROOT)/ace/SString.i \ Exception.i \ Typecode.i \ - Any.i \ - Typecode.h Marshal.h \ + Any.i Typecode.h \ + Marshal.h \ Principal.h \ OctetSeqC.h \ Principal.i \ @@ -26818,7 +26241,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Marshal.i \ @@ -26826,579 +26248,6 @@ realclean: LocalObject.h \ LocalObject.i -.obj/Endpoint_Selector_Factory.o .obj/Endpoint_Selector_Factory.so .shobj/Endpoint_Selector_Factory.o .shobj/Endpoint_Selector_Factory.so: Endpoint_Selector_Factory.cpp \ - Endpoint_Selector_Factory.h \ - $(ACE_ROOT)/ace/pre.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/CDR_Base.inl \ - try_macros.h \ - orbconf.h \ - $(ACE_ROOT)/ace/CORBA_macros.h \ - varbase.h \ - TAO_Export.h \ - corbafwd.i \ - Invocation.h \ - CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - CDR.i \ - Stub.h \ - Pluggable.h \ - Sequence.h \ - Managed_Types.h \ - Managed_Types.i \ - Sequence.i \ - Sequence_T.h \ - Sequence_T.i \ - Sequence_T.cpp \ - Environment.h \ - Environment.i \ - Typecode.h \ - Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - Exception.i \ - Typecode.i \ - IOPC.h \ - Any.h \ - Object.h \ - Object_Proxy_Broker.h \ - Object_Proxy_Impl.h \ - Object.i \ - Any.i \ - IOPC.i \ - Pluggable.i \ - MProfile.h \ - Profile.h \ - Tagged_Components.h \ - CONV_FRAMEC.h \ - CONV_FRAMEC.i \ - Tagged_Components.i \ - PolicyC.h \ - CurrentC.h \ - CurrentC.i \ - Encodable.h \ - Remote_Object_Proxy_Impl.h \ - PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ - Profile.i \ - MProfile.i \ - ORB.h \ - Services.h \ - Services.i \ - CORBA_String.h \ - CORBA_String.inl \ - ORB.i \ - ORB_Core.h \ - Policy_Manager.h \ - LocalObject.h \ - LocalObject.i \ - Policy_Manager.i \ - Resource_Factory.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - Protocol_Factory.h \ - params.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - params.i \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - Adapter.h \ - Adapter.i \ - PolicyFactory_Registry.h \ - PortableInterceptorC.h \ - DynamicC.h \ - DynamicC.i \ - MessagingC.h \ - ValueBase.h \ - ValueBase.i \ - ValueFactory.h \ - ValueFactory.i \ - TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i \ - PollableC.h \ - PollableC.i \ - MessagingC.i \ - PortableInterceptorC.i \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - Parser_Registry.h \ - Parser_Registry.i \ - Service_Callbacks.h \ - Service_Callbacks.i \ - Fault_Tolerance_Service.h \ - Fault_Tolerance_Service.i \ - Transport_Cache_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - Cache_Entries.h \ - Transport_Descriptor_Interface.h \ - Endpoint.h \ - Endpoint.i \ - Transport_Descriptor_Interface.inl \ - Cache_Entries.inl \ - Transport_Cache_Manager.inl \ - Cleanup_Func_Registry.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - Cleanup_Func_Registry.inl \ - Object_Ref_Table.h \ - Interceptor_List.h \ - Interceptor_List.inl \ - RT_Policy_i.h \ - RTCORBAC.h \ - RTCORBAC.i \ - RT_Policy_i.i \ - Protocols_Hooks.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - ORB_Core.i \ - Stub.i \ - Synch_Reply_Dispatcher.h \ - Reply_Dispatcher.h \ - Reply_Dispatcher.i \ - TAOC.h \ - Priority_Mapping_Manager.h \ - Priority_Mapping.h \ - Priority_Mapping.i \ - Priority_Mapping_Manager.i \ - TAOC.i \ - operation_details.h \ - Service_Context.h \ - Service_Context.inl \ - target_specification.h \ - Object_KeyC.h \ - Object_KeyC.i \ - target_specification.i \ - operation_details.i \ - Invocation_Endpoint_Selectors.h \ - Invocation_Endpoint_Selectors.i \ - Invocation.i - -.obj/RT_Endpoint_Selector_Factory.o .obj/RT_Endpoint_Selector_Factory.so .shobj/RT_Endpoint_Selector_Factory.o .shobj/RT_Endpoint_Selector_Factory.so: RT_Endpoint_Selector_Factory.cpp \ - RT_Endpoint_Selector_Factory.h \ - $(ACE_ROOT)/ace/pre.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/CDR_Base.inl \ - try_macros.h \ - orbconf.h \ - $(ACE_ROOT)/ace/CORBA_macros.h \ - varbase.h \ - TAO_Export.h \ - corbafwd.i \ - Endpoint_Selector_Factory.h \ - RT_Invocation_Endpoint_Selectors.h \ - MProfile.h \ - Profile.h \ - Tagged_Components.h \ - IOPC.h \ - Any.h \ - CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - CDR.i \ - Environment.h \ - Environment.i \ - Object.h \ - Object_Proxy_Broker.h \ - Object_Proxy_Impl.h \ - Object.i \ - Typecode.h \ - Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - Exception.i \ - Typecode.i \ - Any.i \ - Sequence.h \ - Managed_Types.h \ - Managed_Types.i \ - Sequence.i \ - Sequence_T.h \ - Sequence_T.i \ - Sequence_T.cpp \ - IOPC.i \ - CONV_FRAMEC.h \ - CONV_FRAMEC.i \ - Tagged_Components.i \ - PolicyC.h \ - CurrentC.h \ - CurrentC.i \ - Encodable.h \ - Remote_Object_Proxy_Impl.h \ - PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ - Profile.i \ - MProfile.i \ - Invocation_Endpoint_Selectors.h \ - Invocation_Endpoint_Selectors.i \ - RT_Invocation_Endpoint_Selectors.i \ - Client_Priority_Policy.h \ - Client_Priority_Policy.i \ - Invocation.h \ - Stub.h \ - Pluggable.h \ - Pluggable.i \ - ORB.h \ - Services.h \ - Services.i \ - CORBA_String.h \ - CORBA_String.inl \ - ORB.i \ - ORB_Core.h \ - Policy_Manager.h \ - LocalObject.h \ - LocalObject.i \ - Policy_Manager.i \ - Resource_Factory.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - Protocol_Factory.h \ - params.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - params.i \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - Adapter.h \ - Adapter.i \ - PolicyFactory_Registry.h \ - PortableInterceptorC.h \ - DynamicC.h \ - DynamicC.i \ - MessagingC.h \ - ValueBase.h \ - ValueBase.i \ - ValueFactory.h \ - ValueFactory.i \ - TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i \ - PollableC.h \ - PollableC.i \ - MessagingC.i \ - PortableInterceptorC.i \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - Parser_Registry.h \ - Parser_Registry.i \ - Service_Callbacks.h \ - Service_Callbacks.i \ - Fault_Tolerance_Service.h \ - Fault_Tolerance_Service.i \ - Transport_Cache_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - Cache_Entries.h \ - Transport_Descriptor_Interface.h \ - Endpoint.h \ - Endpoint.i \ - Transport_Descriptor_Interface.inl \ - Cache_Entries.inl \ - Transport_Cache_Manager.inl \ - Cleanup_Func_Registry.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - Cleanup_Func_Registry.inl \ - Object_Ref_Table.h \ - Interceptor_List.h \ - Interceptor_List.inl \ - RT_Policy_i.h \ - RTCORBAC.h \ - RTCORBAC.i \ - RT_Policy_i.i \ - Protocols_Hooks.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - ORB_Core.i \ - Stub.i \ - Synch_Reply_Dispatcher.h \ - Reply_Dispatcher.h \ - Reply_Dispatcher.i \ - TAOC.h \ - Priority_Mapping_Manager.h \ - Priority_Mapping.h \ - Priority_Mapping.i \ - Priority_Mapping_Manager.i \ - TAOC.i \ - operation_details.h \ - Service_Context.h \ - Service_Context.inl \ - target_specification.h \ - Object_KeyC.h \ - Object_KeyC.i \ - target_specification.i \ - operation_details.i \ - Invocation.i - .obj/Services.o .obj/Services.so .shobj/Services.o .shobj/Services.so: Services.cpp \ Services.h \ $(ACE_ROOT)/ace/pre.h \ @@ -27660,7 +26509,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ BoundsC.h \ @@ -28014,7 +26862,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -28023,8 +26872,6 @@ realclean: Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ - Typecode.h \ - Typecode.i \ IOPC.h \ Any.h \ Any.i \ @@ -28053,14 +26900,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -28119,6 +26964,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -28137,7 +26983,8 @@ realclean: $(ACE_ROOT)/ace/Dynamic_Service.cpp .obj/MessagingC.o .obj/MessagingC.so .shobj/MessagingC.o .shobj/MessagingC.so: MessagingC.cpp MessagingC.h \ - $(ACE_ROOT)/ace/pre.h orbconf.h \ + $(ACE_ROOT)/ace/pre.h \ + orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -28160,7 +27007,9 @@ realclean: $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i corbafwd.h \ + $(ACE_ROOT)/ace/OS.i \ + Remote_Object_Proxy_Impl.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -28227,17 +27076,16 @@ realclean: $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/CDR_Base.inl \ try_macros.h \ - orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ corbafwd.i \ + Object_Proxy_Impl.h \ ValueBase.h \ - corbafwd.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - TAO_Export.h Any.h \ + Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -28246,7 +27094,6 @@ realclean: Environment.i \ Object.h \ Object_Proxy_Broker.h \ - Object_Proxy_Impl.h \ Object.i \ Typecode.h \ Exception.h \ @@ -28254,39 +27101,28 @@ realclean: $(ACE_ROOT)/ace/SString.i \ Exception.i \ Typecode.i \ - Any.i CDR.h \ - Remote_Object_Proxy_Impl.h TimeBaseC.h \ - Any.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i IOPC.h Object.h Exception.h Sequence.h \ + Any.i \ + TimeBaseC.h \ + TimeBaseC.i \ + PolicyC.h \ + CurrentC.h \ + CurrentC.i \ + Encodable.h \ + Sequence.h \ Managed_Types.h \ Managed_Types.i \ Sequence.i \ Sequence_T.h \ - Sequence.h \ Sequence_T.i \ Sequence_T.cpp \ - IOPC.i PolicyC.h \ - CurrentC.h \ - CurrentC.i \ - Encodable.h Environment.h \ PolicyC.i \ - PollableC.h PollableC.i MessagingC.i \ + IOPC.h \ + IOPC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i \ Stub.h \ Pluggable.h \ - IOPC.h \ Pluggable.i \ MProfile.h \ Profile.h \ @@ -28294,7 +27130,6 @@ realclean: CONV_FRAMEC.h \ CONV_FRAMEC.i \ Tagged_Components.i \ - PolicyC.h \ GIOP_Message_State.h \ GIOP_Message_State.i \ Profile.i \ @@ -28321,6 +27156,16 @@ realclean: $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ Adapter.h \ Adapter.i \ PolicyFactory_Registry.h \ @@ -28379,11 +27224,10 @@ realclean: Interceptor_List.inl \ RT_Policy_i.h \ RTCORBAC.h \ - TimeBaseC.h \ - Encodable.h \ RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -28417,12 +27261,7 @@ realclean: operation_details.i \ Invocation_Endpoint_Selectors.h \ Invocation_Endpoint_Selectors.i \ - Invocation.i \ - ClientRequestInfo.h \ - StringSeqC.h \ - StringSeqC.i \ - ClientRequestInfo.inl \ - RequestInfo_Util.h + Invocation.i .obj/Policy_Manager.o .obj/Policy_Manager.so .shobj/Policy_Manager.o .shobj/Policy_Manager.so: Policy_Manager.cpp \ Policy_Manager.h \ @@ -28536,8 +27375,6 @@ realclean: $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ Exception.i \ - Environment.h \ - Environment.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -28545,11 +27382,14 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ + Environment.h \ + Environment.i \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ Policy_Manager.i \ ORB_Core.h \ @@ -28565,8 +27405,6 @@ realclean: $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ Pluggable.h \ - Typecode.h \ - Typecode.i \ IOPC.h \ Any.h \ Any.i \ @@ -28595,14 +27433,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -28661,6 +27497,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -28714,6 +27551,7 @@ realclean: $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -28785,6 +27623,7 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ + Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -28798,7 +27637,6 @@ realclean: Environment.i \ Object.h \ Object_Proxy_Broker.h \ - Object_Proxy_Impl.h \ Object.i \ Typecode.h \ Exception.h \ @@ -28807,23 +27645,12 @@ realclean: Exception.i \ Typecode.i \ Any.i \ - Remote_Object_Proxy_Impl.h \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ - IOPC.h \ + PolicyC.h \ + CurrentC.h \ + CurrentC.i \ + Encodable.h \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -28831,12 +27658,9 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ - IOPC.i \ - PolicyC.h \ - CurrentC.h \ - CurrentC.i \ - Encodable.h \ PolicyC.i \ + IOPC.h \ + IOPC.i \ PollableC.h \ PollableC.i \ MessagingC.i \ @@ -28876,6 +27700,16 @@ realclean: $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ Adapter.h \ Adapter.i \ PolicyFactory_Registry.h \ @@ -28936,6 +27770,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -29091,8 +27926,6 @@ realclean: $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ Exception.i \ - Environment.h \ - Environment.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -29100,30 +27933,18 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ + Environment.h \ + Environment.i \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ TimeBaseC.h \ Any.h \ - Typecode.h \ - Typecode.i \ Any.i \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ Priority_Mapping_Manager.h \ Priority_Mapping.h \ @@ -29265,33 +28086,20 @@ realclean: Sequence_T.cpp \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - Remote_Object_Proxy_Impl.h \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ - IOPC.h \ - IOPC.i \ PolicyC.h \ CurrentC.h \ CurrentC.i \ Encodable.h \ PolicyC.i \ + IOPC.h \ + IOPC.i \ PollableC.h \ PollableC.i \ MessagingC.i \ @@ -29440,33 +28248,20 @@ realclean: Sequence_T.cpp \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - Remote_Object_Proxy_Impl.h \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ - IOPC.h \ - IOPC.i \ PolicyC.h \ CurrentC.h \ CurrentC.i \ Encodable.h \ PolicyC.i \ + IOPC.h \ + IOPC.i \ PollableC.h \ PollableC.i \ MessagingC.i \ @@ -29498,6 +28293,16 @@ realclean: $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ Adapter.h \ Adapter.i \ PolicyFactory_Registry.h \ @@ -29554,6 +28359,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -29697,22 +28503,8 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ RTCORBAC.i \ Priority_Mapping.i @@ -29848,22 +28640,8 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ RTCORBAC.i \ Priority_Mapping.i \ @@ -30001,22 +28779,8 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ RTCORBAC.i \ LocalObject.h \ @@ -30055,6 +28819,16 @@ realclean: $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ Adapter.h \ Adapter.i \ PolicyFactory_Registry.h \ @@ -30062,6 +28836,7 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -30121,6 +28896,7 @@ realclean: RT_Policy_i.h \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -30267,59 +29043,29 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ RTCORBAC.i \ LocalObject.h \ LocalObject.i \ RT_ORB.h \ - Thread_Pool.h \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -30334,43 +29080,6 @@ realclean: $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - ORB.h \ - Services.h \ - Services.i \ - CORBA_String.h \ - CORBA_String.inl \ - ORB.i \ - Thread_Pool.i \ RT_ORB.i .obj/RT_Policy_i.o .obj/RT_Policy_i.so .shobj/RT_Policy_i.o .shobj/RT_Policy_i.so: RT_Policy_i.cpp \ @@ -30503,22 +29212,8 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ RTCORBAC.i \ LocalObject.h \ @@ -30546,6 +29241,16 @@ realclean: $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ Adapter.h \ Adapter.i \ PolicyFactory_Registry.h \ @@ -30553,6 +29258,7 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -30610,6 +29316,7 @@ realclean: Interceptor_List.h \ Interceptor_List.inl \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -30753,242 +29460,28 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ RTCORBAC.i \ LocalObject.h \ LocalObject.i \ - Thread_Pool.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - ORB.h \ - Services.h \ - Services.i \ - CORBA_String.h \ - CORBA_String.inl \ - ORB.i \ - Thread_Pool.i \ - RT_ORB.i \ - RT_Policy_i.h \ - RT_Policy_i.i \ - RT_Mutex.h - -.obj/Thread_Pool.o .obj/Thread_Pool.so .shobj/Thread_Pool.o .shobj/Thread_Pool.so: Thread_Pool.cpp \ - Thread_Pool.h \ - $(ACE_ROOT)/ace/pre.h \ - orbconf.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -31003,149 +29496,10 @@ realclean: $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - RTCORBAC.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/CDR_Base.inl \ - try_macros.h \ - $(ACE_ROOT)/ace/CORBA_macros.h \ - varbase.h \ - TAO_Export.h \ - corbafwd.i \ - IOPC.h \ - Any.h \ - CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - CDR.i \ - Environment.h \ - Environment.i \ - Object.h \ - Object_Proxy_Broker.h \ - Object_Proxy_Impl.h \ - Object.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ - Any.i \ - Sequence.h \ - Managed_Types.h \ - Managed_Types.i \ - Sequence.i \ - Sequence_T.h \ - Sequence_T.i \ - Sequence_T.cpp \ - IOPC.i \ - PolicyC.h \ - CurrentC.h \ - CurrentC.i \ - Encodable.h \ - Remote_Object_Proxy_Impl.h \ - PolicyC.i \ - TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i \ - RTCORBAC.i \ - ORB.h \ - Services.h \ - Services.i \ - CORBA_String.h \ - CORBA_String.inl \ - ORB.i \ - Thread_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - ORB_Core.h \ - Policy_Manager.h \ - LocalObject.h \ - LocalObject.i \ - Policy_Manager.i \ - Resource_Factory.h \ - Pluggable.h \ - Pluggable.i \ - Protocol_Factory.h \ - params.h \ - params.i \ - Adapter.h \ - Adapter.i \ - PolicyFactory_Registry.h \ - PortableInterceptorC.h \ - DynamicC.h \ - DynamicC.i \ - MessagingC.h \ - ValueBase.h \ - ValueBase.i \ - ValueFactory.h \ - ValueFactory.i \ - PollableC.h \ - PollableC.i \ - MessagingC.i \ - PortableInterceptorC.i \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - Parser_Registry.h \ - Parser_Registry.i \ - Service_Callbacks.h \ - Service_Callbacks.i \ - Fault_Tolerance_Service.h \ - Fault_Tolerance_Service.i \ - Transport_Cache_Manager.h \ - Cache_Entries.h \ - Transport_Descriptor_Interface.h \ - Endpoint.h \ - Endpoint.i \ - Transport_Descriptor_Interface.inl \ - Cache_Entries.inl \ - Transport_Cache_Manager.inl \ - Cleanup_Func_Registry.h \ - Cleanup_Func_Registry.inl \ - Object_Ref_Table.h \ - Interceptor_List.h \ - Interceptor_List.inl \ + RT_ORB.i \ RT_Policy_i.h \ RT_Policy_i.i \ - Protocols_Hooks.h \ - ORB_Core.i + RT_Mutex.h .obj/RT_ORB_Loader.o .obj/RT_ORB_Loader.so .shobj/RT_ORB_Loader.o .shobj/RT_ORB_Loader.so: RT_ORB_Loader.cpp RT_ORB_Loader.h \ $(ACE_ROOT)/ace/pre.h \ @@ -31301,107 +29655,58 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ RTCORBAC.i \ LocalObject.h \ LocalObject.i \ - Thread_Pool.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - ORB.h \ - Services.h \ - Services.i \ - CORBA_String.h \ - CORBA_String.inl \ - ORB.i \ - Thread_Pool.i \ RT_ORB.i \ RT_Current.h \ RT_Current.i \ - ORB_Core.h corbafwd.h ORB.h Environment.h Policy_Manager.h \ + ORB_Core.h corbafwd.h ORB.h Exception.h Services.h \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ + PolicyC.h ORB.i \ + Environment.h Policy_Manager.h \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ Pluggable.i \ Protocol_Factory.h \ params.h \ + CORBA_String.h \ params.i \ - TAO_Singleton_Manager.h TAO_Singleton.h Adapter.h Adapter.i \ - PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h DynamicC.i \ - MessagingC.h orbconf.h ValueBase.h \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + TAO_Singleton.h \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + TAO_Singleton_Manager.h \ + Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \ + DynamicC.h DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - TAO_Export.h Any.h CDR.h Remote_Object_Proxy_Impl.h TimeBaseC.h \ - IOPC.h PolicyC.h PollableC.h PollableC.i MessagingC.i CurrentC.h \ - PortableInterceptorC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -31419,10 +29724,26 @@ realclean: Transport_Descriptor_Interface.inl \ Cache_Entries.inl \ Transport_Cache_Manager.inl \ - Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \ - Interceptor_List.h Interceptor_List.inl RT_Policy_i.h \ + Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \ + Interceptor_List.inl RT_Policy_i.h \ RT_Policy_i.i \ - Protocols_Hooks.h RTCORBAC.h ORB_Core.i + Protocols_Hooks.h RTCORBAC.h BiDir_Adapter.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + ORB_Core.i .obj/RT_Protocols_Hooks.o .obj/RT_Protocols_Hooks.so .shobj/RT_Protocols_Hooks.o .shobj/RT_Protocols_Hooks.so: RT_Protocols_Hooks.cpp RT_Protocols_Hooks.h \ $(ACE_ROOT)/ace/pre.h \ @@ -31522,8 +29843,8 @@ realclean: TAO_Export.h \ corbafwd.i \ RTCORBAC.h \ - corbafwd.h \ - IOPC.h TAO_Export.h Any.h \ + corbafwd.h IOPC.h \ + TAO_Export.h Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -31540,8 +29861,8 @@ realclean: $(ACE_ROOT)/ace/SString.i \ Exception.i \ Typecode.i \ - Any.i \ - Object.h Exception.h CDR.h Sequence.h \ + Any.i Object.h \ + Exception.h CDR.h Sequence.h \ Managed_Types.h \ Managed_Types.i \ Sequence.i \ @@ -31549,29 +29870,14 @@ realclean: Sequence.h \ Sequence_T.i \ Sequence_T.cpp \ - IOPC.i \ - PolicyC.h \ + IOPC.i PolicyC.h \ CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ - TimeBaseC.h \ - Any.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i RTCORBAC.i \ + TimeBaseC.h Any.h \ + TimeBaseC.i \ + RTCORBAC.i \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -31626,6 +29932,16 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ Adapter.h \ Adapter.i \ PolicyFactory_Registry.h \ @@ -31633,6 +29949,7 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -31677,6 +29994,7 @@ realclean: Interceptor_List.inl \ RT_Policy_i.h \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -31698,13 +30016,15 @@ realclean: Priority_Mapping.h \ Priority_Mapping.i \ Priority_Mapping_Manager.i \ - TAOC.i operation_details.h Service_Context.h \ + TAOC.i operation_details.h \ + Service_Context.h \ Service_Context.inl \ target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ - target_specification.i operation_details.i \ - Invocation_Endpoint_Selectors.h \ + target_specification.i \ + operation_details.i \ + target_specification.h Invocation_Endpoint_Selectors.h \ Invocation_Endpoint_Selectors.i \ Invocation.i MProfile.h Priority_Mapping_Manager.h \ $(ACE_ROOT)/ace/Dynamic_Service.h \ @@ -31840,7 +30160,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ $(ACE_ROOT)/ace/Task.h \ @@ -31931,8 +30252,6 @@ realclean: Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ - Typecode.h \ - Typecode.i \ IOPC.h \ Any.h \ Any.i \ @@ -31953,14 +30272,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -31993,6 +30310,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ ORB_Core.i \ Acceptor_Registry.h \ Acceptor_Registry.i \ @@ -32100,8 +30418,8 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - IOPC.h TAO_Export.h Any.h \ + corbafwd.i IOPC.h \ + TAO_Export.h Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -32118,8 +30436,8 @@ realclean: $(ACE_ROOT)/ace/SString.i \ Exception.i \ Typecode.i \ - Any.i \ - Object.h Exception.h CDR.h Sequence.h \ + Any.i Object.h \ + Exception.h CDR.h Sequence.h \ Managed_Types.h \ Managed_Types.i \ Sequence.i \ @@ -32127,30 +30445,14 @@ realclean: Sequence.h \ Sequence_T.i \ Sequence_T.cpp \ - IOPC.i \ - PolicyC.h \ + IOPC.i PolicyC.h \ CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ - TimeBaseC.h \ - Any.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i RTCORBAC.i \ - Stub.h \ + TimeBaseC.h Any.h \ + TimeBaseC.i \ + RTCORBAC.i Stub.h \ Pluggable.h \ IOPC.h \ Pluggable.i \ @@ -32186,6 +30488,16 @@ realclean: $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ Adapter.h \ Adapter.i \ PolicyFactory_Registry.h \ @@ -32193,6 +30505,7 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -32254,6 +30567,7 @@ realclean: RTCORBAC.h \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -32422,33 +30736,20 @@ realclean: Sequence_T.cpp \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - Remote_Object_Proxy_Impl.h \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ - IOPC.h \ - IOPC.i \ PolicyC.h \ CurrentC.h \ CurrentC.i \ Encodable.h \ PolicyC.i \ + IOPC.h \ + IOPC.i \ PollableC.h \ PollableC.i \ MessagingC.i \ @@ -32587,33 +30888,20 @@ realclean: Sequence_T.cpp \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - Remote_Object_Proxy_Impl.h \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ - IOPC.h \ - IOPC.i \ PolicyC.h \ CurrentC.h \ CurrentC.i \ Encodable.h \ PolicyC.i \ + IOPC.h \ + IOPC.i \ PollableC.h \ PollableC.i \ MessagingC.i \ @@ -32669,6 +30957,16 @@ realclean: Protocol_Factory.h \ params.h \ params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ Adapter.h \ Adapter.i \ PolicyFactory_Registry.h \ @@ -32705,6 +31003,7 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -33101,7 +31400,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -33138,14 +31436,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -33204,6 +31500,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -33362,25 +31659,27 @@ realclean: GIOP_Utils.h \ GIOP_Utils.i \ GIOP_Message_Base.i \ - operation_details.h corbafwd.h Service_Context.h \ + operation_details.h \ + Service_Context.h \ Service_Context.inl \ target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ - target_specification.i operation_details.i GIOP_Utils.h Pluggable.h \ + target_specification.i \ + operation_details.i \ + GIOP_Utils.h Pluggable.h \ Pluggable.i \ - debug.h ORB_Core.h ORB.h Exception.h Services.h \ + debug.h ORB_Core.h corbafwd.h ORB.h Exception.h Services.h \ Services.i \ CORBA_String.h \ CORBA_String.inl \ PolicyC.h \ CurrentC.h \ CurrentC.i \ - TAO_Export.h Encodable.h Environment.h Sequence.h CDR.h \ - Remote_Object_Proxy_Impl.h \ + Encodable.h \ PolicyC.i \ ORB.i \ - Policy_Manager.h \ + Environment.h Policy_Manager.h \ LocalObject.h \ LocalObject.i \ PolicyC.h \ @@ -33411,16 +31710,16 @@ realclean: $(ACE_ROOT)/ace/Managed_Object.cpp \ TAO_Singleton_Manager.h \ Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \ - DynamicC.h DynamicC.i MessagingC.h orbconf.h ValueBase.h \ + DynamicC.h DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - Any.h TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i IOPC.h PollableC.h PollableC.i MessagingC.i CurrentC.h \ - PortableInterceptorC.i \ + TimeBaseC.h \ + TimeBaseC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -33468,11 +31767,9 @@ realclean: Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \ Interceptor_List.inl RT_Policy_i.h \ RTCORBAC.h \ - TimeBaseC.h \ - Encodable.h \ RTCORBAC.i \ RT_Policy_i.i \ - Protocols_Hooks.h RTCORBAC.h \ + Protocols_Hooks.h RTCORBAC.h BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -33491,8 +31788,8 @@ realclean: GIOPC.h \ GIOPC.i \ Tagged_Profile.i \ - OctetSeqC.h OctetSeqC.i Object.h TAO_Server_Request.i \ - GIOP_Message_Locate_Header.h \ + OctetSeqC.h Sequence.h OctetSeqC.i Service_Context.h Object.h \ + TAO_Server_Request.i GIOP_Message_Locate_Header.h \ Tagged_Profile.h \ GIOP_Message_Locate_Header.i \ Transport.h Transport_Descriptor_Interface.h \ @@ -33659,22 +31956,8 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ Priority_Mapping_Manager.h \ Priority_Mapping.h \ @@ -33707,6 +31990,16 @@ realclean: $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ Adapter.h \ Adapter.i \ PolicyFactory_Registry.h \ @@ -33714,6 +32007,7 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -33773,6 +32067,7 @@ realclean: RT_Policy_i.h \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -33972,7 +32267,8 @@ realclean: Object.i \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ + Typecode.h \ + Typecode.i \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -33985,8 +32281,6 @@ realclean: $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ Pluggable.h \ - Typecode.h \ - Typecode.i \ IOPC.h \ Any.h \ Any.i \ @@ -34015,14 +32309,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -34081,6 +32373,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -34404,14 +32697,17 @@ realclean: GIOPC.i \ Tagged_Profile.i \ GIOP_Message_Locate_Header.i \ - operation_details.h corbafwd.h Service_Context.h \ + operation_details.h \ + Service_Context.h \ Service_Context.inl \ - target_specification.h target_specification.i operation_details.i \ - CDR.h Any.h debug.h OctetSeqC.h Sequence.h OctetSeqC.i \ + target_specification.h \ + target_specification.i \ + operation_details.i \ + CDR.h Any.h debug.h OctetSeqC.h corbafwd.h Sequence.h OctetSeqC.i \ Pluggable_Messaging_Utils.h \ Pluggable_Messaging_Utils.i \ - TAO_Server_Request.h Tagged_Profile.h Object.h TAO_Server_Request.i \ - GIOP_Message_State.h \ + TAO_Server_Request.h Tagged_Profile.h Service_Context.h Object.h \ + TAO_Server_Request.i GIOP_Message_State.h \ GIOP_Message_State.i \ CORBA_String.h \ CORBA_String.inl @@ -34666,34 +32962,26 @@ realclean: GIOPC.i \ Tagged_Profile.i \ GIOP_Message_Locate_Header.i \ - operation_details.h corbafwd.h Service_Context.h \ + operation_details.h \ + Service_Context.h \ Service_Context.inl \ - target_specification.h target_specification.i operation_details.i \ - CDR.h Any.h debug.h OctetSeqC.h Sequence.h OctetSeqC.i \ + target_specification.h \ + target_specification.i \ + operation_details.i \ + debug.h \ + OctetSeqC.h \ + OctetSeqC.i \ Pluggable_Messaging_Utils.h \ Pluggable_Messaging_Utils.i \ - TAO_Server_Request.h Tagged_Profile.h Object.h TAO_Server_Request.i \ + TAO_Server_Request.h \ + TAO_Server_Request.i \ TAOC.h \ PolicyC.h \ CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ Priority_Mapping_Manager.h \ Priority_Mapping.h \ @@ -34703,37 +32991,54 @@ realclean: LocalObject.h \ LocalObject.i \ Priority_Mapping_Manager.i \ - TAOC.i Pluggable.h \ + TAOC.i \ + Pluggable.h \ Pluggable.i \ - ORB_Core.h ORB.h Exception.h Services.h \ + ORB_Core.h \ + ORB.h \ + Services.h \ Services.i \ CORBA_String.h \ CORBA_String.inl \ - PolicyC.h \ ORB.i \ - Environment.h Policy_Manager.h \ + Policy_Manager.h \ Policy_Manager.i \ Resource_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ - Pluggable.h \ Protocol_Factory.h \ params.h \ - CORBA_String.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ params.i \ - TAO_Singleton_Manager.h TAO_Singleton.h Adapter.h Adapter.i \ - PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h DynamicC.i \ - MessagingC.h orbconf.h ValueBase.h \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + Adapter.h \ + Adapter.i \ + PolicyFactory_Registry.h \ + PortableInterceptorC.h \ + DynamicC.h \ + DynamicC.i \ + MessagingC.h \ + Remote_Object_Proxy_Impl.h \ + ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - TAO_Export.h Remote_Object_Proxy_Impl.h TimeBaseC.h IOPC.h \ - PollableC.h PollableC.i MessagingC.i CurrentC.h \ + PollableC.h \ + PollableC.i \ + MessagingC.i \ PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ @@ -34779,10 +33084,14 @@ realclean: $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ - Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \ - Interceptor_List.inl RT_Policy_i.h \ + Cleanup_Func_Registry.inl \ + Object_Ref_Table.h \ + Interceptor_List.h \ + Interceptor_List.inl \ + RT_Policy_i.h \ RT_Policy_i.i \ - Protocols_Hooks.h RTCORBAC.h \ + Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -34794,7 +33103,9 @@ realclean: $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ - ORB_Core.i Transport.h Transport_Descriptor_Interface.h \ + ORB_Core.i \ + Transport.h corbafwd.h Exception.h Transport_Descriptor_Interface.h \ + Transport_Cache_Manager.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ @@ -35068,7 +33379,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -35105,14 +33415,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -35171,6 +33479,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -35608,7 +33917,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -35645,14 +33953,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -35711,6 +34017,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -35864,7 +34171,6 @@ realclean: CurrentC.h \ CurrentC.i \ Encodable.h \ - Remote_Object_Proxy_Impl.h \ PolicyC.i \ ORB.i \ Policy_Manager.h \ @@ -35901,14 +34207,12 @@ realclean: DynamicC.h \ DynamicC.i \ MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ TimeBaseC.h \ - SmartProxies/Smart_Proxies.h \ - SmartProxies/smartproxies_export.h \ - SmartProxies/Smart_Proxies.inl \ TimeBaseC.i \ PollableC.h \ PollableC.i \ @@ -35967,6 +34271,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ + BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor index d01942fd890..a00a2f9d06c 100644 --- a/TAO/tao/Makefile.bor +++ b/TAO/tao/Makefile.bor @@ -132,6 +132,7 @@ OBJFILES = \ $(OBJDIR)\Parser_Registry.obj \ $(OBJDIR)\Pluggable.obj \ $(OBJDIR)\Transport.obj \ + $(OBJDIR)\Transport_Timer.obj \ $(OBJDIR)\Pluggable_Messaging.obj \ $(OBJDIR)\Pluggable_Messaging_Utils.obj \ $(OBJDIR)\Policy_Manager.obj \ diff --git a/TAO/tao/Messaging_Policy_i.cpp b/TAO/tao/Messaging_Policy_i.cpp index a7540f9c1db..0aeea2ea279 100644 --- a/TAO/tao/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging_Policy_i.cpp @@ -156,10 +156,9 @@ TAO_RelativeRoundtripTimeoutPolicy::set_time_value (ACE_Time_Value &time_value) if (TAO_debug_level > 0) { - CORBA::ULong msecs = - ACE_static_cast(CORBA::ULong, microseconds / 1000); + CORBA::ULong msecs = time_value.msec (); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) Timeout is <%u>\n"), + ACE_TEXT ("TAO (%P|%t) - Timeout is <%u>\n"), msecs)); } } @@ -290,4 +289,3 @@ TAO_Sync_Scope_Policy::destroy (CORBA_Environment &) } #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 15a8f761e39..1390ffe0767 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -38,6 +38,7 @@ #include "IORInfo.h" +#include "Flushing_Strategy.h" #if defined(ACE_MVS) #include "ace/Codeset_IBM1047.h" @@ -47,10 +48,7 @@ # include "ORB_Core.i" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (TAO, - ORB_Core, - "$Id$") - +ACE_RCSID(tao, ORB_Core, "$Id$") // **************************************************************** @@ -162,6 +160,7 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid) transport_cache_ (), bidir_adapter_ (0), bidir_giop_policy_ (0) + , flushing_strategy_ (0) { #if defined(ACE_MVS) ACE_NEW (this->from_iso8859_, ACE_IBM1047_ISO8859); @@ -206,6 +205,8 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid) TAO_ORB_Core::~TAO_ORB_Core (void) { + delete this->flushing_strategy_; + ACE_OS::free (this->orbid_); delete this->from_iso8859_; @@ -1014,6 +1015,9 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) // init the ORB core's pointer this->protocol_factories_ = trf->get_protocol_factories (); + // Initialize the flushing strategy + this->flushing_strategy_ = trf->create_flushing_strategy (); + // Now that we have a complete list of available protocols and their // related factory objects, set default policies and initialize the // registries! @@ -1971,9 +1975,15 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, if (TAO_debug_level >= 3) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - blocking on handle events\n"))); + ACE_TEXT ("TAO (%P|%t) - calling handle_events\n"))); + result = r->handle_events (tv); + if (TAO_debug_level >= 3) + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO (%P|%t) - handle_events returns %d\n"), + result)); + if (result == -1) { // An error, terminate the loop diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 3a6b2f32d11..07ffd89ea90 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -75,6 +75,8 @@ class TAO_ServerRequest; class TAO_Protocols_Hooks; class TAO_BiDir_Adapter; +class TAO_Flushing_Strategy; + #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) class TAO_Eager_Buffering_Sync_Strategy; @@ -831,12 +833,21 @@ public: CORBA::Boolean bidir_giop_policy (void); void bidir_giop_policy (CORBA::Boolean); - /// Return the table that maps object key/name to de-stringified /// object reference. It is needed for supporting local objects in /// the resolve_initial_references() mechanism. TAO_Object_Ref_Table &object_ref_table (void); + /// Return the flushing strategy + /** + * The flushing strategy is created by the resource factory, and it + * is used by the ORB to control the mechanism used to flush the + * outgoing data queues. + * The flushing strategies are stateless, therefore, there is only + * one per ORB. + */ + TAO_Flushing_Strategy *flushing_strategy (void); + protected: /// Destructor is protected since the ORB Core is a reference @@ -1180,6 +1191,9 @@ protected: /// Bir Dir GIOP policy value CORBA::Boolean bidir_giop_policy_; + + /// Hold the flushing strategy + TAO_Flushing_Strategy *flushing_strategy_; }; // **************************************************************** diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index c7cfd3e8de4..d5cfc48f460 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -49,6 +49,11 @@ TAO_ORB_Core::object_ref_table (void) return this->object_ref_table_; } +ACE_INLINE TAO_Flushing_Strategy * +TAO_ORB_Core::flushing_strategy (void) +{ + return this->flushing_strategy_; +} ACE_INLINE CORBA::Boolean TAO_ORB_Core::service_profile_selection (TAO_MProfile &mprofile, diff --git a/TAO/tao/Pluggable_Messaging_Utils.cpp b/TAO/tao/Pluggable_Messaging_Utils.cpp index 30155e37afb..8feaf93e01c 100644 --- a/TAO/tao/Pluggable_Messaging_Utils.cpp +++ b/TAO/tao/Pluggable_Messaging_Utils.cpp @@ -9,16 +9,16 @@ ACE_RCSID(tao, Pluggable_Messaging_Utils, "$Id$") TAO_Pluggable_Reply_Params::TAO_Pluggable_Reply_Params (TAO_ORB_Core *orb_core) - : svc_ctx_ () - , request_id_ (0) - , reply_status_ (0) - , is_dsi_ (0) - , dsi_nvlist_align_ (0) - , argument_flag_ (0) - , input_cdr_ (orb_core->create_input_cdr_data_block ( + : svc_ctx_ (0), + request_id_ (0), + reply_status_ (0), + is_dsi_ (0), + dsi_nvlist_align_ (0), + argument_flag_ (0), + input_cdr_ (orb_core->create_input_cdr_data_block ( ACE_CDR::DEFAULT_BUFSIZE), TAO_ENCAP_BYTE_ORDER, - orb_core) - , service_context_ (0) + orb_core), + service_context_ (0) { } diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile index c64da7cb8e1..93b829d898f 100644 --- a/TAO/tao/PortableServer/Makefile +++ b/TAO/tao/PortableServer/Makefile @@ -203,8 +203,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -212,14 +210,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ PortableServerC.i \ @@ -227,19 +226,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/RTCORBAC.i \ RTPortableServerC.i Object_Adapter.h Key_Adapters.h \ @@ -413,8 +399,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -422,14 +406,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ PortableServerC.i POA.h Object_Adapter.h Key_Adapters.h \ @@ -485,19 +470,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/RTCORBAC.i \ RTPortableServerC.i Servant_Base.h \ @@ -521,8 +493,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - POA.i $(TAO_ROOT)/tao/ORB.h \ + $(ACE_ROOT)/ace/Containers_T.cpp POA.i \ + $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ @@ -639,8 +611,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -648,14 +618,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ PortableServerC.i \ @@ -663,19 +634,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/RTCORBAC.i \ RTPortableServerC.i @@ -791,8 +749,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -800,14 +756,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ PortableServerC.i \ @@ -863,19 +820,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/RTCORBAC.i \ RTPortableServerC.i Servant_Base.h \ @@ -899,38 +843,19 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - POA.i ImplRepoS.h ImplRepoC.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - ImplRepoC.i \ - PortableServer.h \ - portableserver_export.h \ - RTPortableServerC.h \ - Servant_Base.h \ - Collocated_Object.h \ - Collocated_Object.i \ - ThruPOA_Object_Proxy_Impl.h \ - Direct_Object_Proxy_Impl.h \ - ServerRequestInfo.h \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ - ServerRequestInfo.inl \ - ImplRepoS_T.h ImplRepoS_T.i ImplRepoS_T.cpp ImplRepoS.i \ + $(ACE_ROOT)/ace/Containers_T.cpp POA.i \ + ImplRepoS.h ImplRepoC.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + ImplRepoC.i ImplRepoS_T.h ImplRepoS_T.i ImplRepoS_T.cpp ImplRepoS.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -947,6 +872,19 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ $(TAO_ROOT)/tao/Service_Callbacks.h \ @@ -969,6 +907,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -1240,8 +1179,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -1249,14 +1186,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ PortableServerC.i \ @@ -1312,19 +1250,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/RTCORBAC.i \ RTPortableServerC.i Servant_Base.h \ @@ -1348,8 +1273,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - POA.i Strategized_Object_Proxy_Broker.h \ + $(ACE_ROOT)/ace/Containers_T.cpp POA.i \ + Strategized_Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -1365,11 +1290,22 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ @@ -1400,6 +1336,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -1610,7 +1547,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i @@ -1724,8 +1662,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -1733,14 +1669,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ PortableServerC.i \ @@ -1903,8 +1840,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -1912,14 +1847,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ PortableServerC.i poa_macros.h \ @@ -1978,19 +1914,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/RTCORBAC.i \ RTPortableServerC.i Servant_Base.h \ @@ -2012,12 +1935,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - POA.i + $(ACE_ROOT)/ace/Containers_T.cpp POA.i .obj/Active_Object_Map.o .obj/Active_Object_Map.so .shobj/Active_Object_Map.o .shobj/Active_Object_Map.so: Active_Object_Map.cpp Active_Object_Map.h \ - $(ACE_ROOT)/ace/pre.h \ - Key_Adapters.h PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h Key_Adapters.h \ + PortableServerC.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2125,8 +2047,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -2134,14 +2054,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ PortableServerC.i \ @@ -2311,8 +2232,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -2320,14 +2239,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ PortableServerC.i \ @@ -2385,19 +2305,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/RTCORBAC.i \ RTPortableServerC.i Active_Object_Map.h \ @@ -2419,8 +2326,19 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - POA.i Operation_Table.h Collocated_Object.h Collocated_Object.i \ + $(ACE_ROOT)/ace/Containers_T.cpp POA.i \ + Operation_Table.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + Collocated_Object.h Collocated_Object.i \ $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -2443,6 +2361,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ @@ -2473,6 +2392,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -2616,8 +2536,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -2625,14 +2543,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ PortableServerC.i \ @@ -2688,19 +2607,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/RTCORBAC.i \ RTPortableServerC.i Servant_Base.h \ @@ -2724,8 +2630,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - POA.i ThruPOA_Object_Proxy_Impl.h \ + $(ACE_ROOT)/ace/Containers_T.cpp POA.i \ + ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -2741,11 +2647,22 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ @@ -2776,6 +2693,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -2906,8 +2824,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -2915,14 +2831,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ PortableServerC.i \ @@ -2978,19 +2895,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/RTCORBAC.i \ RTPortableServerC.i Servant_Base.h \ @@ -3135,7 +3039,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Policy_Manager.h \ @@ -3148,8 +3053,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -3178,14 +3081,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ @@ -3244,6 +3145,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -3369,8 +3271,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -3378,14 +3278,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ PortableServerC.i \ @@ -3443,19 +3344,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/RTCORBAC.i \ RTPortableServerC.i Active_Object_Map.h \ @@ -3483,11 +3371,22 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ @@ -3521,6 +3420,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -3547,9 +3447,6 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/PolicyS.o .obj/PolicyS.so .shobj/PolicyS.o .shobj/PolicyS.so: PolicyS.cpp PolicyS.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ @@ -3645,17 +3542,19 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ + Servant_Base.h PortableServerC.h portableserver_export.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -3663,27 +3562,48 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - PortableServer.h \ - portableserver_export.h \ - RTPortableServerC.h \ - PortableServerC.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ PortableServerC.i \ - $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + Servant_Base.i ThruPOA_Object_Proxy_Impl.h Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ @@ -3692,58 +3612,28 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - RTPortableServerC.i \ - Servant_Base.h \ - $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - Servant_Base.i \ - Collocated_Object.h \ - Collocated_Object.i \ - ThruPOA_Object_Proxy_Impl.h \ - Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ - PolicyS_T.h PolicyS_T.i PolicyS_T.cpp PolicyS.i \ - Object_Adapter.h \ - Key_Adapters.h \ - $(ACE_ROOT)/ace/Map.h \ - $(ACE_ROOT)/ace/Map_T.h \ - $(ACE_ROOT)/ace/Pair.h \ - $(ACE_ROOT)/ace/Pair_T.h \ - $(ACE_ROOT)/ace/Pair_T.i \ - $(ACE_ROOT)/ace/Pair_T.cpp \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -3758,61 +3648,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Active_Map_Manager.h \ - $(ACE_ROOT)/ace/Active_Map_Manager.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - Key_Adapters.i \ - poa_macros.h \ - Active_Object_Map.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i \ - $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - Object_Adapter.i \ - Operation_Table.h \ - $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ - $(TAO_ROOT)/tao/TAO_Server_Request.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/Policy_Manager.i \ - $(TAO_ROOT)/tao/Resource_Factory.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/Pluggable.i \ - $(TAO_ROOT)/tao/Protocol_Factory.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ $(TAO_ROOT)/tao/Service_Callbacks.h \ @@ -3820,6 +3655,14 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ @@ -3828,11 +3671,20 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -3844,6 +3696,42 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + Object_Adapter.h Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + Key_Adapters.i poa_macros.h RTPortableServerC.h RTPortableServerC.i \ + Active_Object_Map.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + Active_Object_Map.i Object_Adapter.i Operation_Table.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/Profile.h \ @@ -3855,21 +3743,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ - ServerRequestInfo.h \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - ServerRequestInfo.inl \ - $(TAO_ROOT)/tao/RequestInfo_Util.h \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ - $(ACE_ROOT)/ace/Dynamic_Service.i \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp + $(TAO_ROOT)/tao/Stub.i .obj/ORB_Manager.o .obj/ORB_Manager.so .shobj/ORB_Manager.o .shobj/ORB_Manager.so: ORB_Manager.cpp ORB_Manager.h \ - $(ACE_ROOT)/ace/pre.h \ - PortableServer.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h PortableServer.h \ + portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3978,8 +3856,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -3987,14 +3863,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ PortableServerC.i \ @@ -4002,19 +3879,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/RTCORBAC.i \ RTPortableServerC.i \ @@ -4151,33 +4015,20 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ @@ -4202,8 +4053,7 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/ImplRepoC.o .obj/ImplRepoC.so .shobj/ImplRepoC.o .shobj/ImplRepoC.so: ImplRepoC.cpp ImplRepoC.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4212,6 +4062,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -4297,44 +4150,30 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ @@ -4345,29 +4184,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ + ImplRepoC.i $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - portableserver_export.h ImplRepoC.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/Profile.h \ @@ -4375,6 +4195,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ @@ -4387,6 +4212,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -4402,6 +4229,21 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -4455,6 +4297,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -4468,6 +4311,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Thread_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ @@ -4479,6 +4324,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -4486,16 +4333,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/operation_details.i \ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ - $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/RequestInfo_Util.h + $(TAO_ROOT)/tao/Invocation.i .obj/ImplRepoS.o .obj/ImplRepoS.so .shobj/ImplRepoS.o .shobj/ImplRepoS.so: ImplRepoS.cpp ImplRepoS.h \ - $(ACE_ROOT)/ace/pre.h \ - ImplRepoC.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/pre.h ImplRepoC.h \ + portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4504,6 +4346,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -4589,44 +4434,30 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ @@ -4637,58 +4468,25 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ + ImplRepoC.i Servant_Base.h PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - portableserver_export.h ImplRepoC.i \ - PortableServer.h \ - portableserver_export.h \ - RTPortableServerC.h \ - PortableServerC.h \ PortableServerC.i \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - RTPortableServerC.i \ - Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - Servant_Base.i \ - Collocated_Object.h \ - Collocated_Object.i \ - ThruPOA_Object_Proxy_Impl.h \ - Direct_Object_Proxy_Impl.h \ - ServerRequestInfo.h \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ - ServerRequestInfo.inl \ - ImplRepoS_T.h ImplRepoS_T.i ImplRepoS_T.cpp ImplRepoS.i \ - Object_Adapter.h \ - Key_Adapters.h \ - $(ACE_ROOT)/ace/Map.h \ - $(ACE_ROOT)/ace/Map_T.h \ - $(ACE_ROOT)/ace/Pair.h \ - $(ACE_ROOT)/ace/Pair_T.h \ - $(ACE_ROOT)/ace/Pair_T.i \ - $(ACE_ROOT)/ace/Pair_T.cpp \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ + Servant_Base.i ImplRepoS_T.h ImplRepoS_T.i ImplRepoS_T.cpp \ + ImplRepoS.i Operation_Table.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ @@ -4711,15 +4509,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + Object_Adapter.h Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Active_Map_Manager.h \ $(ACE_ROOT)/ace/Active_Map_Manager.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ @@ -4727,39 +4526,63 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp \ - Key_Adapters.i \ - poa_macros.h \ - Active_Object_Map.h \ + Key_Adapters.i poa_macros.h RTPortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + RTPortableServerC.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ Active_Object_Map.i \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ Object_Adapter.i \ - Operation_Table.h \ - $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/TAO_Server_Request.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ $(TAO_ROOT)/tao/Service_Callbacks.h \ @@ -4785,6 +4608,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -4796,26 +4620,17 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/Profile.h \ - $(TAO_ROOT)/tao/Tagged_Components.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.i \ - $(TAO_ROOT)/tao/Tagged_Components.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Profile.i \ - $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ - $(ACE_ROOT)/ace/Dynamic_Service.i \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/tao/RequestInfo_Util.h + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i .obj/MessagingS.o .obj/MessagingS.so .shobj/MessagingS.o .shobj/MessagingS.so: MessagingS.cpp \ $(TAO_ROOT)/tao/orbconf.h \ @@ -4842,10 +4657,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - MessagingS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ + $(ACE_ROOT)/ace/OS.i MessagingS.h \ + $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -4917,26 +4730,63 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ @@ -4945,72 +4795,28 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Managed_Types.h \ - $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ - PortableServer.h \ - portableserver_export.h \ - RTPortableServerC.h \ - PortableServerC.h \ - PortableServerC.i \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - RTPortableServerC.i \ - Servant_Base.h \ - $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - Servant_Base.i \ - Collocated_Object.h \ - Collocated_Object.i \ - ThruPOA_Object_Proxy_Impl.h \ - Direct_Object_Proxy_Impl.h \ - MessagingS_T.h MessagingS_T.i MessagingS_T.cpp MessagingS.i \ - Object_Adapter.h \ - Key_Adapters.h \ - $(ACE_ROOT)/ace/Map.h \ - $(ACE_ROOT)/ace/Map_T.h \ - $(ACE_ROOT)/ace/Pair.h \ - $(ACE_ROOT)/ace/Pair_T.h \ - $(ACE_ROOT)/ace/Pair_T.i \ - $(ACE_ROOT)/ace/Pair_T.cpp \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -5025,65 +4831,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Active_Map_Manager.h \ - $(ACE_ROOT)/ace/Active_Map_Manager.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - Key_Adapters.i \ - poa_macros.h \ - Active_Object_Map.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i \ - $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - Object_Adapter.i \ - Operation_Table.h \ - $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ - $(TAO_ROOT)/tao/TAO_Server_Request.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/Policy_Manager.i \ - $(TAO_ROOT)/tao/Resource_Factory.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/Pluggable.i \ - $(TAO_ROOT)/tao/Protocol_Factory.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ $(TAO_ROOT)/tao/Service_Callbacks.h \ @@ -5091,6 +4838,14 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ @@ -5107,8 +4862,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -5120,6 +4879,53 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ + PortableServerC.h portableserver_export.h PortableServerC.i \ + Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + Servant_Base.i Collocated_Object.h Collocated_Object.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + ThruPOA_Object_Proxy_Impl.h \ + portableserver_export.h \ + Direct_Object_Proxy_Impl.h \ + ServerRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + ServerRequestInfo.inl \ + MessagingS_T.h MessagingS_T.i MessagingS_T.cpp MessagingS.i \ + Operation_Table.h Object_Adapter.h Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + Key_Adapters.i poa_macros.h RTPortableServerC.h RTPortableServerC.i \ + Active_Object_Map.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + Active_Object_Map.i Object_Adapter.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/Profile.h \ @@ -5131,17 +4937,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ - ServerRequestInfo.h \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - ServerRequestInfo.inl \ - $(TAO_ROOT)/tao/RequestInfo_Util.h \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ - $(ACE_ROOT)/ace/Dynamic_Service.i \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp + $(TAO_ROOT)/tao/Stub.i .obj/RT_Acceptor_Filters.o .obj/RT_Acceptor_Filters.so .shobj/RT_Acceptor_Filters.o .shobj/RT_Acceptor_Filters.so: RT_Acceptor_Filters.cpp RT_Acceptor_Filters.h \ $(ACE_ROOT)/ace/pre.h \ @@ -5275,22 +5071,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/RTCORBAC.i \ RT_Acceptor_Filters.i \ diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index 76ce6d0dd3e..fe50b820c99 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -1677,7 +1677,6 @@ TAO_POA_Current::implementation (TAO_POA_Current_Impl *new_current) // Common typedefs. typedef TAO_Object_Adapter::poa_name key; typedef TAO_POA *value; -typedef ACE_Reverse_Lock<ACE_Lock> REVERSE_LOCK; typedef ACE_Pair<key, value> expanded_value; typedef ACE_Reference_Pair<const key, value> tao_value_type; @@ -1685,9 +1684,6 @@ typedef ACE_Equal_To<key> compare_keys; typedef TAO_ObjectId_Hash hash_key; typedef ACE_Noop_Key_Generator<key> noop_key_generator; -template class ACE_Reverse_Lock<ACE_Lock>; -template class ACE_Guard<REVERSE_LOCK>; - template class auto_ptr<TAO_Object_Adapter::Hint_Strategy>; template class auto_ptr<TAO_Object_Adapter::transient_poa_map>; @@ -1759,7 +1755,6 @@ template class ACE_Unbounded_Set_Iterator<TAO_POA_Manager *>; // Common typedefs. typedef TAO_Object_Adapter::poa_name key; typedef TAO_POA *value; -typedef ACE_Reverse_Lock<ACE_Lock> REVERSE_LOCK; typedef ACE_Pair<key, value> expanded_value; typedef ACE_Reference_Pair<const key, value> tao_value_type; @@ -1767,9 +1762,6 @@ typedef ACE_Equal_To<key> compare_keys; typedef TAO_ObjectId_Hash hash_key; typedef ACE_Noop_Key_Generator<key> noop_key_generator; -#pragma instantiate ACE_Reverse_Lock<ACE_Lock> -#pragma instantiate ACE_Guard<REVERSE_LOCK> - #pragma instantiate auto_ptr<TAO_Object_Adapter::Hint_Strategy> #pragma instantiate auto_ptr<TAO_Object_Adapter::transient_poa_map> diff --git a/TAO/tao/Queued_Message.cpp b/TAO/tao/Queued_Message.cpp new file mode 100644 index 00000000000..1cd30ae2e2e --- /dev/null +++ b/TAO/tao/Queued_Message.cpp @@ -0,0 +1,97 @@ +// -*- C++ -*- +// $Id$ + +#include "Queued_Message.h" + +#if !defined (__ACE_INLINE__) +# include "Queued_Message.inl" +#endif /* __ACE_INLINE__ */ + +ACE_RCSID(tao, Queued_Message, "$Id$") + +TAO_Queued_Message::TAO_Queued_Message (void) + : connection_closed_ (0) + , send_failure_ (0) + , timeout_ (0) + , next_ (0) + , prev_ (0) +{ +} + +TAO_Queued_Message::~TAO_Queued_Message (void) +{ +} + +void +TAO_Queued_Message::connection_closed (void) +{ + this->connection_closed_ = 1; +} + +void +TAO_Queued_Message::send_failure (void) +{ + this->send_failure_ = 1; +} + +void +TAO_Queued_Message::timeout (void) +{ + this->timeout_ = 1; +} + +void +TAO_Queued_Message::remove_from_list (TAO_Queued_Message *&head, + TAO_Queued_Message *&tail) +{ + if (this->prev_ != 0) + this->prev_->next_ = this->next_; + else + head = this->next_; + + if (this->next_ != 0) + this->next_->prev_ = this->prev_; + else + tail = this->prev_; + + this->next_ = 0; + this->prev_ = 0; +} + +void +TAO_Queued_Message::push_back (TAO_Queued_Message *&head, + TAO_Queued_Message *&tail) +{ + if (tail == 0) + { + tail = this; + head = this; + this->next_ = 0; + this->prev_ = 0; + return; + } + + tail->next_ = this; + this->prev_ = tail; + this->next_ = 0; + tail = this; +} + +void +TAO_Queued_Message::push_front (TAO_Queued_Message *&head, + TAO_Queued_Message *&tail) +{ + if (head == 0) + { + tail = this; + head = this; + this->next_ = 0; + this->prev_ = 0; + return; + } + + head->prev_ = this; + this->next_ = head; + this->prev_ = 0; + head = this; +} diff --git a/TAO/tao/Queued_Message.h b/TAO/tao/Queued_Message.h new file mode 100644 index 00000000000..11eb9861bfc --- /dev/null +++ b/TAO/tao/Queued_Message.h @@ -0,0 +1,203 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file Queued_Message.h + * + * $Id$ + * + * @author Carlos O'Ryan <coryan@uci.edu> + */ +//============================================================================= + +#ifndef TAO_QUEUED_MESSAGE_H +#define TAO_QUEUED_MESSAGE_H +#include "ace/pre.h" + +#include "corbafwd.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class ACE_Message_Block; + +/** + * @class TAO_Queued_Message + * + * @brief Represent messages queued in the outgoing data path of the + * TAO_Transport class. + * + * Please read the documentation in the TAO_Transport class to find + * out more about the design of the outgoing data path. + * + * In some configurations TAO needs to maintain a per-connection queue + * of outgoing messages. This queue is drained by the pluggable + * protocols framework, normally under control of the ACE_Reactor, but + * other configurations are conceivable. The elements in the queue + * may may removed early, for example, because the application can + * specify timeouts for each message, or because the underlying + * connection is broken. + * + * In many cases the message corresponds to some application request, + * the application may be blocked waiting for the request to be sent, + * even more importantlyl, the ORB can be configured to use the + * Leader/Followers strategy, in which case one of the waiting threads + * can be required to wake up before its message completes + * each message may contain a 'Sent_Notifier' + * + * <H4>NOTE:</H4> The contents of the ACE_Message_Block may have been + * allocated from TSS storage, in that case we cannot steal them. + * However, we do not need to perform a deep copy all the time, for + * example, in a twoway request the sending thread blocks until the + * data goes out. The queued message can borrow the memory as it will + * be deallocated by the sending thread when it finishes. + * Oneways and asynchronous calls are another story. + * + * @todo: Change the ORB to allocate oneway and AMI buffer from global + * memory, to avoid the data copy in this path. What happens + * if the there is no queueing? Can we check that before + * allocating the memory? + * + */ +class TAO_Export TAO_Queued_Message +{ +public: + /// Constructor + TAO_Queued_Message (void); + + /// Destructor + virtual ~TAO_Queued_Message (void); + + /// The underlying connection has been closed, release resources and + /// signal waiting threads. + void connection_closed (void); + + /// There was an error while sending the data. + void send_failure (void); + + /// There was a timeout while sending the data + void timeout (void); + + /** @name Intrusive list manipulation + * + * The messages are put in a doubled linked list (for easy insertion + * and removal). To minimize memory allocations the list is + * intrusive, i.e. each element in the list contains the pointers + * for the next and previous element. + * + * The following methods are used to manipulate this implicit list. + * + * @todo: We should implement this as a base template, something + * like:<BR> + * template<class T> Intrusive_Node {<BR> + * public:<BR><BR> + * void next (T *);<BR> + * T* next () const;<BR><BR> + * private:<BR> + * T* next_;<BR> + * };<BR> + * and use it as follows:<BR> + * class TAO_Queued_Message : public Intrusive_Node<TAO_Queued_Message><BR> + * {<BR> + * };<BR> + * + */ + //@{ + /// Set/get the next element in the list + virtual TAO_Queued_Message *next (void) const; + + /// Set/get the previous element in the list + virtual TAO_Queued_Message *prev (void) const; + + /// Remove this element from the list + virtual void remove_from_list (TAO_Queued_Message *&head, + TAO_Queued_Message *&tail); + + /// Insert the current element at the tail of the queue. + virtual void push_back (TAO_Queued_Message *&head, + TAO_Queued_Message *&tail); + + /// Insert the current element at the head of the queue. + virtual void push_front (TAO_Queued_Message *&head, + TAO_Queued_Message *&tail); + //@} + + /** @name Template Methods + */ + //@{ + + /// Return the length of the message + /** + * If the message has been partially sent it returns the number of + * bytes that are still not sent. + */ + virtual size_t message_length (void) const = 0; + + /// Return 1 if all the data has been sent + virtual int all_data_sent (void) const = 0; + + /// Fill up an io vector using the connects of the message + /** + * Different versions of this class represent the message using + * either a single buffer, or a message block. + * This method allows a derived class to fill up the contents of an + * io vector, the TAO_Transport class uses this method to group as + * many messages as possible in an iovector before sending them to + * the OS I/O subsystem. + * + * @param iovcnt_max The number of elements in iov + * @param iovcnt The number of elements already used by iov, this + * method should update this counter + * @param iov The io vector + */ + virtual void fill_iov (int iovcnt_max, int &iovcnt, iovec iov[]) const = 0; + + /// Update the internal state, data has been sent. + /** + * After the TAO_Transport class completes a successful (or + * partially successful) I/O operation it must update the state of + * all the messages queued. This callback method is used by each + * message to update its state and determine if all the data has + * been sent already. + * + * @param byte_count The number of bytes succesfully sent. The + * TAO_Queued_Message should decrement this value + * by the number of bytes that must still be sent. + * @return Returns 1 if the TAO_Queued_Message has any more data to + * send. + */ + virtual void bytes_transferred (size_t &byte_count) = 0; + + /// Reclaim resources + /** + * Reliable messages are allocated from the stack, thus they do not + * be deallocated. + * Asynchronous (SYNC_NONE) messages are allocated from the heap (or + * a pool), they need to be reclaimed explicitly. + */ + virtual void destroy (void) = 0; + //@} + +protected: + /// Set to 1 if the connection was closed + int connection_closed_; + + /// Set to 1 if there was a failure while sending the data + int send_failure_; + + /// Set to 1 if there was a timeout while sending the data + int timeout_; + +private: + /// Implement an intrusive double-linked list for the message queue + TAO_Queued_Message *next_; + TAO_Queued_Message *prev_; +}; + +#if defined (__ACE_INLINE__) +# include "Queued_Message.inl" +#endif /* __ACE_INLINE__ */ + +#include "ace/post.h" +#endif /* TAO_QUEUED_MESSAGE_H */ diff --git a/TAO/tao/Queued_Message.inl b/TAO/tao/Queued_Message.inl new file mode 100644 index 00000000000..e9cd0a9ff4b --- /dev/null +++ b/TAO/tao/Queued_Message.inl @@ -0,0 +1,13 @@ +// $Id$ + +ACE_INLINE TAO_Queued_Message * +TAO_Queued_Message::next (void) const +{ + return this->next_; +} + +ACE_INLINE TAO_Queued_Message * +TAO_Queued_Message::prev (void) const +{ + return this->prev_; +} diff --git a/TAO/tao/Reactive_Flushing_Strategy.cpp b/TAO/tao/Reactive_Flushing_Strategy.cpp new file mode 100644 index 00000000000..0bbc18bf46b --- /dev/null +++ b/TAO/tao/Reactive_Flushing_Strategy.cpp @@ -0,0 +1,77 @@ +// -*- C++ -*- +// $Id$ + +#include "Reactive_Flushing_Strategy.h" +#include "Transport.h" +#include "ORB_Core.h" +#include "Queued_Message.h" +#include "debug.h" + +ACE_RCSID(tao, Reactive_Flushing_Strategy, "$Id$") + +int +TAO_Reactive_Flushing_Strategy::schedule_output (TAO_Transport *transport) +{ + return transport->schedule_output_i (); +} + +int +TAO_Reactive_Flushing_Strategy::cancel_output (TAO_Transport *transport) +{ + return transport->cancel_output_i (); +} + +int +TAO_Reactive_Flushing_Strategy::flush_message (TAO_Transport *transport, + TAO_Queued_Message *msg, + ACE_Time_Value *max_wait_time) +{ + int result = 0; + + // @@ Should we pass this down? Can we? + ACE_DECLARE_NEW_CORBA_ENV; + ACE_TRY + { + TAO_ORB_Core *orb_core = transport->orb_core (); + + while (!msg->all_data_sent () && result >= 0) + { + result = orb_core->run (max_wait_time, 1, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + } + ACE_CATCHANY + { + return -1; + } + ACE_ENDTRY; + + return result; +} + +int +TAO_Reactive_Flushing_Strategy::flush_transport (TAO_Transport *transport) +{ + // @@ Should we pass this down? Can we? + ACE_DECLARE_NEW_CORBA_ENV; + ACE_TRY + { + TAO_ORB_Core *orb_core = transport->orb_core (); + + while (!transport->queue_is_empty ()) + { + int result = orb_core->run (0, 1, ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (result == -1) + return -1; + } + } + ACE_CATCHANY + { + return -1; + } + ACE_ENDTRY; + + return 0; +} diff --git a/TAO/tao/Reactive_Flushing_Strategy.h b/TAO/tao/Reactive_Flushing_Strategy.h new file mode 100644 index 00000000000..e1aba16bbb0 --- /dev/null +++ b/TAO/tao/Reactive_Flushing_Strategy.h @@ -0,0 +1,40 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file Reactive_Flushing_Strategy.h + * + * $Id$ + * + * @author Carlos O'Ryan <coryan@uci.edu> + */ +//============================================================================= + +#ifndef TAO_REACTIVE_FLUSHING_STRATEGY_H +#define TAO_REACTIVE_FLUSHING_STRATEGY_H +#include "ace/pre.h" + +#include "Flushing_Strategy.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +/** + * @class TAO_Reactive_Flushing_Strategy + * + * @brief Implement a flushing strategy that uses the reactor. + */ +class TAO_Export TAO_Reactive_Flushing_Strategy : public TAO_Flushing_Strategy +{ +public: + virtual int schedule_output (TAO_Transport *transport); + virtual int cancel_output (TAO_Transport *transport); + virtual int flush_message (TAO_Transport *transport, + TAO_Queued_Message *msg, + ACE_Time_Value *max_wait_time); + virtual int flush_transport (TAO_Transport *transport); +}; + +#include "ace/post.h" +#endif /* TAO_REACTIVE_FLUSHING_STRATEGY_H */ diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h index eeca5e3bb56..7751590bf06 100644 --- a/TAO/tao/Resource_Factory.h +++ b/TAO/tao/Resource_Factory.h @@ -32,6 +32,8 @@ class TAO_Connector_Registry; class TAO_Reactor_Registry; class TAO_Priority_Mapping; +class TAO_Flushing_Strategy; + // **************************************************************** class TAO_Export TAO_Protocol_Item @@ -184,6 +186,10 @@ public: /// Creates the lock for the lock needed in the Cache Map virtual ACE_Lock *create_cached_connection_lock (void); + /// Creates the flushing strategy. The new instance is owned by the + /// caller. + virtual TAO_Flushing_Strategy *create_flushing_strategy (void) = 0; + protected: /** * Loads the default protocols. This method is used so that the diff --git a/TAO/tao/SmartProxies/Makefile.bor b/TAO/tao/SmartProxies/Makefile.bor index f16111ec47f..d16b86e1aea 100644 --- a/TAO/tao/SmartProxies/Makefile.bor +++ b/TAO/tao/SmartProxies/Makefile.bor @@ -16,7 +16,7 @@ CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SMARTPROXIES_CFLAGS) \ CPPDIR = . -INCDIR_NAME = tao\SmartProxies +INCDIR_NAME = tao/SmartProxies INCLUDES = \ *.h *.inl diff --git a/TAO/tao/Strategies/Makefile b/TAO/tao/Strategies/Makefile index 7c55188003e..e2149e25f80 100644 --- a/TAO/tao/Strategies/Makefile +++ b/TAO/tao/Strategies/Makefile @@ -333,7 +333,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Connection_Handler.h \ $(TAO_ROOT)/tao/Connection_Handler.inl \ $(TAO_ROOT)/tao/Wait_Strategy.h \ - $(TAO_ROOT)/tao/Wait_Strategy.inl \ UIOP_Connection_Handler.inl \ $(TAO_ROOT)/tao/Acceptor_Impl.h \ $(TAO_ROOT)/tao/Acceptor_Impl.i \ @@ -348,7 +347,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Policy_Manager.h \ @@ -370,14 +368,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ @@ -402,6 +398,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/ORB_Table.h \ $(TAO_ROOT)/tao/ORB_Table.inl \ @@ -673,7 +670,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Connection_Handler.h \ $(TAO_ROOT)/tao/Connection_Handler.inl \ $(TAO_ROOT)/tao/Wait_Strategy.h \ - $(TAO_ROOT)/tao/Wait_Strategy.inl \ UIOP_Connection_Handler.inl \ $(TAO_ROOT)/tao/Acceptor_Impl.h \ $(TAO_ROOT)/tao/Acceptor_Impl.i \ @@ -688,7 +684,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Policy_Manager.h \ @@ -710,14 +705,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ @@ -742,6 +735,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/ORB_Table.h \ $(TAO_ROOT)/tao/ORB_Table.inl \ @@ -898,7 +892,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ @@ -1029,7 +1022,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Connection_Handler.h \ $(TAO_ROOT)/tao/Connection_Handler.inl \ $(TAO_ROOT)/tao/Wait_Strategy.h \ - $(TAO_ROOT)/tao/Wait_Strategy.inl \ UIOP_Connection_Handler.inl UIOP_Endpoint.h UIOP_Endpoint.i \ UIOP_Profile.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -1061,14 +1053,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ @@ -1093,6 +1083,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/debug.h \ uiop_endpoints.h uiop_endpoints.i @@ -1321,7 +1312,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Connection_Handler.h \ $(TAO_ROOT)/tao/Connection_Handler.inl \ $(TAO_ROOT)/tao/Wait_Strategy.h \ - $(TAO_ROOT)/tao/Wait_Strategy.inl \ UIOP_Connection_Handler.inl UIOP_Profile.h \ $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ @@ -1355,7 +1345,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ @@ -1369,14 +1358,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sync_Strategies.h \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -1406,6 +1387,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ @@ -1413,6 +1399,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ @@ -1438,6 +1425,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1723,7 +1711,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Connection_Handler.h \ $(TAO_ROOT)/tao/Connection_Handler.inl \ $(TAO_ROOT)/tao/Wait_Strategy.h \ - $(TAO_ROOT)/tao/Wait_Strategy.inl \ UIOP_Connection_Handler.inl \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/Protocol_Factory.h \ @@ -1740,7 +1727,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ @@ -1774,14 +1760,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ @@ -1803,6 +1787,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ @@ -2059,7 +2044,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Connection_Handler.h \ $(TAO_ROOT)/tao/Connection_Handler.inl \ $(TAO_ROOT)/tao/Wait_Strategy.h \ - $(TAO_ROOT)/tao/Wait_Strategy.inl \ UIOP_Connection_Handler.inl \ $(TAO_ROOT)/tao/Acceptor_Impl.h \ $(TAO_ROOT)/tao/Acceptor_Impl.i \ @@ -2074,7 +2058,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Policy_Manager.h \ @@ -2097,14 +2080,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ @@ -2129,6 +2110,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/ORB_Table.h \ $(TAO_ROOT)/tao/ORB_Table.inl \ @@ -2153,8 +2135,7 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/UIOP_Connection_Handler.o .obj/UIOP_Connection_Handler.so .shobj/UIOP_Connection_Handler.o .shobj/UIOP_Connection_Handler.so: UIOP_Connection_Handler.cpp \ UIOP_Connection_Handler.h \ - $(ACE_ROOT)/ace/pre.h \ - UIOP_Transport.h \ + $(ACE_ROOT)/ace/pre.h UIOP_Transport.h \ $(TAO_ROOT)/tao/Transport.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2377,7 +2358,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Connection_Handler.h \ $(TAO_ROOT)/tao/Connection_Handler.inl \ $(TAO_ROOT)/tao/Wait_Strategy.h \ - $(TAO_ROOT)/tao/Wait_Strategy.inl \ UIOP_Connection_Handler.inl \ $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -2407,7 +2387,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Policy_Manager.h \ @@ -2416,8 +2397,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -2438,14 +2417,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ @@ -2470,6 +2447,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ @@ -2715,7 +2693,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Connection_Handler.h \ $(TAO_ROOT)/tao/Connection_Handler.inl \ $(TAO_ROOT)/tao/Wait_Strategy.h \ - $(TAO_ROOT)/tao/Wait_Strategy.inl \ UIOP_Connection_Handler.inl .obj/SHMIOP_Factory.o .obj/SHMIOP_Factory.so .shobj/SHMIOP_Factory.o .shobj/SHMIOP_Factory.so: SHMIOP_Factory.cpp SHMIOP_Factory.h \ @@ -2935,7 +2912,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Wait_Strategy.h \ - $(TAO_ROOT)/tao/Wait_Strategy.inl \ $(TAO_ROOT)/tao/Connection_Handler.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/Addr.h \ @@ -2965,8 +2941,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ $(ACE_ROOT)/ace/PI_Malloc.i \ $(ACE_ROOT)/ace/MEM_SAP.i \ - $(ACE_ROOT)/ace/Process_Semaphore.h \ - $(ACE_ROOT)/ace/Process_Semaphore.inl \ $(ACE_ROOT)/ace/MEM_IO.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ @@ -2985,7 +2959,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Policy_Manager.h \ @@ -3007,14 +2980,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ @@ -3039,6 +3010,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/ORB_Table.h \ $(TAO_ROOT)/tao/ORB_Table.inl \ @@ -3204,7 +3176,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ @@ -3262,14 +3233,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ @@ -3326,6 +3295,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -3542,8 +3512,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ $(ACE_ROOT)/ace/PI_Malloc.i \ $(ACE_ROOT)/ace/MEM_SAP.i \ - $(ACE_ROOT)/ace/Process_Semaphore.h \ - $(ACE_ROOT)/ace/Process_Semaphore.inl \ $(ACE_ROOT)/ace/MEM_IO.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ @@ -3564,7 +3532,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Wait_Strategy.h \ - $(TAO_ROOT)/tao/Wait_Strategy.inl \ $(TAO_ROOT)/tao/Connection_Handler.h \ $(TAO_ROOT)/tao/Connection_Handler.inl \ SHMIOP_Connection_Handler.inl SHMIOP_Profile.h \ @@ -3600,7 +3567,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ @@ -3623,14 +3589,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sync_Strategies.h \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -3654,6 +3612,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ @@ -3661,6 +3624,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ @@ -3686,6 +3650,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -3926,8 +3891,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ $(ACE_ROOT)/ace/PI_Malloc.i \ $(ACE_ROOT)/ace/MEM_SAP.i \ - $(ACE_ROOT)/ace/Process_Semaphore.h \ - $(ACE_ROOT)/ace/Process_Semaphore.inl \ $(ACE_ROOT)/ace/MEM_IO.i \ $(ACE_ROOT)/ace/MEM_Stream.i \ $(ACE_ROOT)/ace/MEM_Addr.h \ @@ -3964,7 +3927,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Wait_Strategy.h \ - $(TAO_ROOT)/tao/Wait_Strategy.inl \ $(TAO_ROOT)/tao/Connection_Handler.h \ $(TAO_ROOT)/tao/Transport.h \ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ @@ -3994,7 +3956,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ @@ -4031,14 +3992,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ @@ -4060,6 +4019,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(ACE_ROOT)/ace/Auto_Ptr.h \ @@ -4280,7 +4240,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Wait_Strategy.h \ - $(TAO_ROOT)/tao/Wait_Strategy.inl \ $(TAO_ROOT)/tao/Connection_Handler.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/Addr.h \ @@ -4310,8 +4269,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ $(ACE_ROOT)/ace/PI_Malloc.i \ $(ACE_ROOT)/ace/MEM_SAP.i \ - $(ACE_ROOT)/ace/Process_Semaphore.h \ - $(ACE_ROOT)/ace/Process_Semaphore.inl \ $(ACE_ROOT)/ace/MEM_IO.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ @@ -4330,7 +4287,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Policy_Manager.h \ @@ -4353,14 +4309,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ @@ -4385,6 +4339,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/ORB_Table.h \ $(TAO_ROOT)/tao/ORB_Table.inl \ @@ -4605,7 +4560,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Wait_Strategy.h \ - $(TAO_ROOT)/tao/Wait_Strategy.inl \ $(TAO_ROOT)/tao/Connection_Handler.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/Addr.h \ @@ -4637,8 +4591,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ $(ACE_ROOT)/ace/PI_Malloc.i \ $(ACE_ROOT)/ace/MEM_SAP.i \ - $(ACE_ROOT)/ace/Process_Semaphore.h \ - $(ACE_ROOT)/ace/Process_Semaphore.inl \ $(ACE_ROOT)/ace/MEM_IO.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ @@ -4674,7 +4626,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Policy_Manager.h \ @@ -4683,8 +4636,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -4705,14 +4656,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ @@ -4737,6 +4686,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Messaging_Policy_i.h \ $(TAO_ROOT)/tao/Messaging_Policy_i.i \ @@ -4902,7 +4852,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(ACE_ROOT)/ace/INET_Addr.h \ @@ -4999,7 +4950,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Wait_Strategy.h \ - $(TAO_ROOT)/tao/Wait_Strategy.inl \ $(TAO_ROOT)/tao/Connection_Handler.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/IPC_SAP.h \ @@ -5025,8 +4975,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ $(ACE_ROOT)/ace/PI_Malloc.i \ $(ACE_ROOT)/ace/MEM_SAP.i \ - $(ACE_ROOT)/ace/Process_Semaphore.h \ - $(ACE_ROOT)/ace/Process_Semaphore.inl \ $(ACE_ROOT)/ace/MEM_IO.i \ $(ACE_ROOT)/ace/MEM_Stream.i \ SHMIOP_Transport.i SHMIOP_Connection_Handler.inl \ @@ -5206,7 +5154,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Policy_Manager.h \ @@ -5227,14 +5174,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ @@ -5278,6 +5223,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -5582,7 +5528,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Policy_Manager.h \ @@ -5608,14 +5553,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ @@ -5659,6 +5602,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -5889,7 +5833,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Policy_Manager.h \ @@ -5898,8 +5843,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -5925,14 +5868,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ @@ -5973,6 +5914,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -6120,22 +6062,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/Priority_Mapping.i \ @@ -6275,22 +6203,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/Priority_Mapping.i \ diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp index f0d63b028f1..650b9b8c149 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp @@ -299,9 +299,6 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core) this->base_acceptor_.acceptor().malloc_options ().minimum_bytes_ = this->mmap_size_; - if (orb_core->server_factory ()->activate_server_connections () != 0) - this->base_acceptor_.acceptor().preferred_strategy (ACE_MEM_IO::MT); - // @@ Should this be a catastrophic error??? if (this->base_acceptor_.acceptor ().get_local_addr (this->address_) != 0) { diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp index d2b99bec1dc..7ea782f38c8 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp @@ -22,8 +22,6 @@ ACE_RCSID(Strategies, SHMIOP_Connect, "$Id$") - - TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (ACE_Thread_Manager *t) : TAO_SHMIOP_SVC_HANDLER (t, 0 , 0), TAO_Connection_Handler (0), @@ -57,23 +55,8 @@ TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (TAO_ORB_Core *orb_ TAO_SHMIOP_Connection_Handler::~TAO_SHMIOP_Connection_Handler (void) { - if (this->transport () != 0) - { - // If the socket has not already been closed. - if (this->get_handle () != ACE_INVALID_HANDLE) - { - // Cannot deal with errors, and therefore they are ignored. - this->transport ()->send_buffered_messages (); - } - else - { - // Dequeue messages and delete message blocks. - this->transport ()->dequeue_all (); - } - } } - int TAO_SHMIOP_Connection_Handler::open (void*) { @@ -214,9 +197,6 @@ TAO_SHMIOP_Connection_Handler::handle_close (ACE_HANDLE handle, // Close the handle.. if (this->get_handle () != ACE_INVALID_HANDLE) { - // Send the buffered messages first - this->transport ()->send_buffered_messages (); - // Mark the entry as invalid this->transport ()->mark_invalid (); @@ -226,9 +206,10 @@ TAO_SHMIOP_Connection_Handler::handle_close (ACE_HANDLE handle, this->transport (0); this->peer ().cleanup (1); + this->peer ().close (); } - this->destroy (); + delete this; } return 0; @@ -240,28 +221,17 @@ TAO_SHMIOP_Connection_Handler::fetch_handle (void) return this->get_handle (); } - int TAO_SHMIOP_Connection_Handler::handle_timeout (const ACE_Time_Value &, const void *) { - // This method is called when buffering timer expires. - // - ACE_Time_Value *max_wait_time = 0; - - TAO_Stub *stub = 0; - int has_timeout; - this->orb_core ()->call_timeout_hook (stub, - has_timeout, - *max_wait_time); - // Cannot deal with errors, and therefore they are ignored. - this->transport ()->send_buffered_messages (max_wait_time); + if (this->transport ()->handle_output () == -1) + return -1; return 0; } - int TAO_SHMIOP_Connection_Handler::add_transport_to_cache (void) { diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index eec5c62dcae..3ea9b90662a 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -91,20 +91,10 @@ TAO_SHMIOP_Connector::open (TAO_ORB_Core *orb_core) TAO_SHMIOP_CONNECT_CONCURRENCY_STRATEGY (orb_core), -1); - if (this->base_connector_.open (this->orb_core ()->reactor (), - connect_creation_strategy, - &this->connect_strategy_, - concurrency_strategy) == -1) - return -1; - // We can take advantage of the multithreaded shared-memory transport - // if the client will block on read (i.e., will not allow callback.) - else if (orb_core->client_factory ()->allow_callback () == 0) - - { - this->base_connector_.connector ().preferred_strategy (ACE_MEM_IO::MT); - this->connect_strategy_.connector ().preferred_strategy (ACE_MEM_IO::MT); - } - return 0; + return this->base_connector_.open (this->orb_core ()->reactor (), + connect_creation_strategy, + &this->connect_strategy_, + concurrency_strategy); } int diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp index e6e53353061..ae99103d5f6 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.cpp +++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp @@ -1,14 +1,10 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ - #include "SHMIOP_Transport.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -ACE_RCSID (Strategies, SHMIOP_Transport, "$Id$") - - #include "SHMIOP_Connection_Handler.h" #include "SHMIOP_Profile.h" #include "tao/Timeprobe.h" @@ -27,6 +23,7 @@ ACE_RCSID (Strategies, SHMIOP_Transport, "$Id$") # include "SHMIOP_Transport.i" #endif /* ! __ACE_INLINE__ */ +ACE_RCSID (Strategies, SHMIOP_Transport, "$Id$") TAO_SHMIOP_Transport::TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core, @@ -70,12 +67,23 @@ TAO_SHMIOP_Transport::messaging_object (void) ssize_t -TAO_SHMIOP_Transport::send_i (const ACE_Message_Block *message_block, - const ACE_Time_Value *max_wait_time, - size_t *) +TAO_SHMIOP_Transport::send_i (iovec *iov, int iovcnt, + size_t &bytes_transferred, + const ACE_Time_Value *max_wait_time) { - return this->connection_handler_->peer ().send (message_block, - max_wait_time); + bytes_transferred = 0; + for (int i = 0; i < iovcnt; ++i) + { + ssize_t retval = + this->connection_handler_->peer ().send (iov[i].iov_base, + iov[i].iov_len, + max_wait_time); + if (retval > 0) + bytes_transferred += retval; + if (retval <= 0) + return retval; + } + return bytes_transferred; } ssize_t @@ -127,6 +135,21 @@ TAO_SHMIOP_Transport::read_process_message (ACE_Time_Value *max_wait_time, int TAO_SHMIOP_Transport::register_handler_i (void) { + if (TAO_debug_level > 4) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - IIOP_Transport::register_handler %d\n", + this->id ())); + } + if (this->connection_handler_->is_registered ()) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - IIOP_Transport::register_handler %d" + ", already registered\n", + this->id ())); + return 0; + } + // @@ It seems like this method should go away, the right reactor is // picked at object creation time. ACE_Reactor *r = this->orb_core_->reactor (); @@ -180,7 +203,7 @@ TAO_SHMIOP_Transport::send_message (TAO_OutputCDR &stream, // versions seem to need it though. Leaving it costs little. // This guarantees to send all data (bytes) or return an error. - ssize_t n = this->send_or_buffer (stub, + ssize_t n = this->send_message_i (stub, twoway, stream.begin (), max_wait_time); @@ -196,17 +219,6 @@ TAO_SHMIOP_Transport::send_message (TAO_OutputCDR &stream, return -1; } - // EOF. - if (n == 0) - { - if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO: (%P|%t|%N|%l) send_message () \n") - ACE_TEXT ("EOF, closing transport %d\n"), - this->id ())); - return -1; - } - return 1; } diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h index dc679330824..ead847e0e5a 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.h +++ b/TAO/tao/Strategies/SHMIOP_Transport.h @@ -1,5 +1,6 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // =================================================================== /** * @file SHMIOP_Transport.h @@ -10,6 +11,7 @@ * @author Modified by Balachandran Natarajan <bala@cs.wustl.edu> */ // =================================================================== + #ifndef TAO_SHMIOP_TRANSPORT_H #define TAO_SHMIOP_TRANSPORT_H #include "ace/pre.h" @@ -67,9 +69,9 @@ protected: virtual TAO_Pluggable_Messaging *messaging_object (void); /// Write the complete Message_Block chain to the connection. - virtual ssize_t send_i (const ACE_Message_Block *mblk, - const ACE_Time_Value *s = 0, - size_t *bytes_transferred = 0); + virtual ssize_t send_i (iovec *iov, int iovcnt, + size_t &bytes_transferred, + const ACE_Time_Value *timeout = 0); /// Read len bytes from into buf. virtual ssize_t recv_i (char *buf, diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp index 113f4925512..e36093aecf9 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp @@ -4,6 +4,8 @@ #if TAO_HAS_UIOP == 1 +#include "UIOP_Transport.h" +#include "UIOP_Endpoint.h" #include "tao/debug.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" @@ -11,8 +13,8 @@ #include "tao/Timeprobe.h" #include "tao/Server_Strategy_Factory.h" #include "tao/Messaging_Policy_i.h" -#include "UIOP_Endpoint.h" #include "tao/Base_Transport_Property.h" +#include "tao/GIOP_Message_Lite.h" #if !defined (__ACE_INLINE__) # include "UIOP_Connection_Handler.inl" @@ -20,10 +22,6 @@ ACE_RCSID(Strategies, UIOP_Connect, "$Id$") -#include "tao/GIOP_Message_Lite.h" - - - TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler (ACE_Thread_Manager *t) : TAO_UIOP_SVC_HANDLER (t, 0 , 0), TAO_Connection_Handler (0), @@ -60,23 +58,8 @@ TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler (TAO_ORB_Core *orb_core TAO_UIOP_Connection_Handler::~TAO_UIOP_Connection_Handler (void) { - if (this->transport () != 0) { - // If the socket has not already been closed. - if (this->get_handle () != ACE_INVALID_HANDLE) - { - // Cannot deal with errors, and therefore they are ignored. - this->transport ()->send_buffered_messages (); - } - else - { - // Dequeue messages and delete message blocks. - this->transport ()->dequeue_all (); - } - } } - - int TAO_UIOP_Connection_Handler::open (void*) { @@ -196,9 +179,6 @@ TAO_UIOP_Connection_Handler::handle_close (ACE_HANDLE handle, // Close the handle.. if (this->get_handle () != ACE_INVALID_HANDLE) { - // Send the buffered messages first - this->transport ()->send_buffered_messages (); - // Mark the entry as invalid this->transport ()->mark_invalid (); @@ -206,9 +186,11 @@ TAO_UIOP_Connection_Handler::handle_close (ACE_HANDLE handle, // a reference to it. This will eventually call // TAO_Transport::release (). this->transport (0); + + this->peer ().close (); } - this->destroy (); + delete this; } return 0; @@ -225,23 +207,13 @@ int TAO_UIOP_Connection_Handler::handle_timeout (const ACE_Time_Value &, const void *) { - // This method is called when buffering timer expires. - // - ACE_Time_Value *max_wait_time = 0; - - TAO_Stub *stub = 0; - int has_timeout; - this->orb_core ()->call_timeout_hook (stub, - has_timeout, - *max_wait_time); - // Cannot deal with errors, and therefore they are ignored. - this->transport ()->send_buffered_messages (max_wait_time); + if (this->transport ()->handle_output () == -1) + return -1; return 0; } - int TAO_UIOP_Connection_Handler::add_transport_to_cache (void) { diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp index 9dbb2bd0019..172ef5260a0 100644 --- a/TAO/tao/Strategies/UIOP_Transport.cpp +++ b/TAO/tao/Strategies/UIOP_Transport.cpp @@ -5,10 +5,6 @@ #if TAO_HAS_UIOP == 1 - -ACE_RCSID (Strategies, UIOP_Transport, "$Id$") - - #include "UIOP_Connection_Handler.h" #include "UIOP_Profile.h" #include "tao/Timeprobe.h" @@ -26,6 +22,7 @@ ACE_RCSID (Strategies, UIOP_Transport, "$Id$") # include "UIOP_Transport.i" #endif /* ! __ACE_INLINE__ */ +ACE_RCSID (Strategies, UIOP_Transport, "$Id$") TAO_UIOP_Transport::TAO_UIOP_Transport (TAO_UIOP_Connection_Handler *handler, @@ -67,16 +64,17 @@ TAO_UIOP_Transport::messaging_object (void) return this->messaging_object_; } - ssize_t -TAO_UIOP_Transport::send_i (const ACE_Message_Block *message_block, - const ACE_Time_Value *max_wait_time, - size_t *bytes_transferred) +TAO_UIOP_Transport::send_i (iovec *iov, int iovcnt, + size_t &bytes_transferred, + const ACE_Time_Value *max_wait_time) { - return ACE::send_n (this->connection_handler_->get_handle (), - message_block, - max_wait_time, - bytes_transferred); + ssize_t retval = this->connection_handler_->peer ().sendv (iov, iovcnt, + max_wait_time); + if (retval > 0) + bytes_transferred = retval; + + return retval; } ssize_t @@ -127,6 +125,21 @@ TAO_UIOP_Transport::read_process_message (ACE_Time_Value *max_wait_time, int TAO_UIOP_Transport::register_handler_i (void) { + if (TAO_debug_level > 4) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - IIOP_Transport::register_handler %d\n", + this->id ())); + } + if (this->connection_handler_->is_registered ()) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - IIOP_Transport::register_handler %d" + ", already registered\n", + this->id ())); + return 0; + } + // @@ It seems like this method should go away, the right reactor is // picked at object creation time. ACE_Reactor *r = this->orb_core_->reactor (); @@ -180,7 +193,7 @@ TAO_UIOP_Transport::send_message (TAO_OutputCDR &stream, // versions seem to need it though. Leaving it costs little. // This guarantees to send all data (bytes) or return an error. - ssize_t n = this->send_or_buffer (stub, + ssize_t n = this->send_message_i (stub, twoway, stream.begin (), max_wait_time); @@ -196,17 +209,6 @@ TAO_UIOP_Transport::send_message (TAO_OutputCDR &stream, return -1; } - // EOF. - if (n == 0) - { - if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO: (%P|%t|%N|%l) send_message () \n") - ACE_TEXT ("EOF, closing transport %d\n"), - this->id ())); - return -1; - } - return 1; } diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h index de7d68b2e1e..f3bb0b2b920 100644 --- a/TAO/tao/Strategies/UIOP_Transport.h +++ b/TAO/tao/Strategies/UIOP_Transport.h @@ -1,13 +1,13 @@ // This may look like C, but it's really -*- C++ -*- -// + // =================================================================== /** * @file UIOP_Transport.h * * $Id$ * - * @author Originally by Fred Kuhns <fredk@cs.wustl.edu> and Ossama - * Othman <ossama@ece.uci.edu> + * @author Originally by Fred Kuhns <fredk@cs.wustl.edu> + * @author Ossama Othman <ossama@ece.uci.edu> * @author Modified by Balachandran Natarajan <bala@cs.wustl.edu> */ // =================================================================== @@ -72,9 +72,9 @@ protected: virtual TAO_Pluggable_Messaging *messaging_object (void); /// Write the complete Message_Block chain to the connection. - virtual ssize_t send_i (const ACE_Message_Block *mblk, - const ACE_Time_Value *s = 0, - size_t *bytes_transferred = 0); + virtual ssize_t send_i (iovec *iov, int iovcnt, + size_t &bytes_transferred, + const ACE_Time_Value *timeout = 0); /// Read len bytes from into buf. virtual ssize_t recv_i (char *buf, diff --git a/TAO/tao/Sync_Strategies.cpp b/TAO/tao/Sync_Strategies.cpp index d09bcd1a5a5..a64223da662 100644 --- a/TAO/tao/Sync_Strategies.cpp +++ b/TAO/tao/Sync_Strategies.cpp @@ -5,138 +5,68 @@ #include "tao/Buffering_Constraint_Policy.h" #include "tao/Stub.h" #include "tao/ORB_Core.h" +#include "tao/debug.h" #if !defined (__ACE_INLINE__) # include "tao/Sync_Strategies.i" #endif /* ! __ACE_INLINE__ */ -TAO_Sync_Strategy::~TAO_Sync_Strategy (void) -{ -} +ACE_RCSID(tao, Sync_Strategies, "$Id$") -ssize_t -TAO_Transport_Sync_Strategy::send (TAO_Transport &transport, - TAO_Stub &, - const ACE_Message_Block *message_block, - const ACE_Time_Value *max_wait_time) +TAO_Sync_Strategy::~TAO_Sync_Strategy (void) { - // Immediate delegation to the transport. - return transport.send (message_block, - max_wait_time); } -#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) +// **************************************************************** -ssize_t -TAO_Delayed_Buffering_Sync_Strategy::send (TAO_Transport &transport, - TAO_Stub &stub, - const ACE_Message_Block *mb, - const ACE_Time_Value *max_wait_time) +int +TAO_Transport_Sync_Strategy:: + must_queue (int) { - ACE_Message_Block *message_block = - ACE_const_cast (ACE_Message_Block *, mb); - - ssize_t result = 0; - - // Get the message queue from the transport. - TAO_Transport_Buffering_Queue &buffering_queue = - transport.buffering_queue (); - - // Check if there are messages already in the queue. - if (!buffering_queue.is_empty ()) - return TAO_Eager_Buffering_Sync_Strategy::send (transport, - stub, - message_block, - max_wait_time); - - // - // Otherwise there were no queued messages. We first try to send - // the message right away. - // - - // Actual network send. - size_t bytes_transferred = 0; - result = transport.send (message_block, - max_wait_time, - &bytes_transferred); - - // Cannot send completely: timed out. - if (result == -1 && - errno == ETIME) - { - if (bytes_transferred > 0) - { - // If successful in sending some of the data, reset the - // message block appropriately. - transport.reset_sent_message (message_block, - bytes_transferred); - } - - // Queue the rest. - return bytes_transferred + - TAO_Eager_Buffering_Sync_Strategy::send (transport, - stub, - message_block, - max_wait_time); - } - - // EOF or other errors. - if (result == -1 || - result == 0) - return -1; - - // Everything was successfully delivered. - return result; + return 0; } -ssize_t -TAO_Eager_Buffering_Sync_Strategy::send (TAO_Transport &transport, - TAO_Stub &stub, - const ACE_Message_Block *message_block, - const ACE_Time_Value *max_wait_time) +int +TAO_Transport_Sync_Strategy:: + buffering_constraints_reached (TAO_Stub *, + size_t , + size_t , + int &must_flush, + const ACE_Time_Value &, + int &set_timer, + ACE_Time_Value &) { - ssize_t result = 0; - - // Get the message queue from the transport. - TAO_Transport_Buffering_Queue &buffering_queue = - transport.buffering_queue (); - - // Copy the message. - ACE_Message_Block *copy = message_block->clone (); - - // Enqueue current message. - result = buffering_queue.enqueue_tail (copy); - - // Enqueuing error. - if (result == -1) - { - // Eliminate the copy. - copy->release (); + set_timer = 0; + must_flush = 1; + return 1; +} - // Return error. - return -1; - } +#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) - // Check if upper bound has been reached. - if (this->buffering_constraints_reached (transport, - stub, - buffering_queue)) - { - return transport.send_buffered_messages (max_wait_time); - } +// **************************************************************** - // Hoping that this return value is meaningful or at least - // acceptable. - return message_block->total_length (); +int +TAO_Eager_Buffering_Sync_Strategy:: + must_queue (int) +{ + return 1; } int -TAO_Eager_Buffering_Sync_Strategy::buffering_constraints_reached (TAO_Transport &transport, - TAO_Stub &stub, - TAO_Transport_Buffering_Queue &buffering_queue) +TAO_Eager_Buffering_Sync_Strategy:: + buffering_constraints_reached (TAO_Stub *stub, + size_t msg_count, + size_t total_bytes, + int &must_flush, + const ACE_Time_Value ¤t_deadline, + int &set_timer, + ACE_Time_Value &new_deadline) { + must_flush = 0; + set_timer = 0; + TAO_Buffering_Constraint_Policy *buffering_constraint_policy = - stub.buffering_constraint (); + stub->buffering_constraint (); if (buffering_constraint_policy == 0) return 1; @@ -147,80 +77,85 @@ TAO_Eager_Buffering_Sync_Strategy::buffering_constraints_reached (TAO_Transport TAO::BufferingConstraint buffering_constraint; buffering_constraint_policy->get_buffering_constraint (buffering_constraint); - this->timer_check (transport, - buffering_constraint); - if (buffering_constraint.mode == TAO::BUFFER_FLUSH) - return 1; + { + must_flush = 1; + return 1; + } + int constraints_reached = 0; if (ACE_BIT_ENABLED (buffering_constraint.mode, - TAO::BUFFER_MESSAGE_COUNT) && - buffering_queue.message_count () >= buffering_constraint.message_count) - return 1; + TAO::BUFFER_MESSAGE_COUNT) + && msg_count >= buffering_constraint.message_count) + constraints_reached = 1; if (ACE_BIT_ENABLED (buffering_constraint.mode, - TAO::BUFFER_MESSAGE_BYTES) && - buffering_queue.message_length () >= buffering_constraint.message_bytes) - return 1; + TAO::BUFFER_MESSAGE_BYTES) + && total_bytes >= buffering_constraint.message_bytes) + constraints_reached = 1; - return 0; + if (this->timer_check (buffering_constraint, + current_deadline, + set_timer, + new_deadline) != 0) + constraints_reached = 1; + + return constraints_reached; } -void -TAO_Eager_Buffering_Sync_Strategy::timer_check (TAO_Transport &transport, - const TAO::BufferingConstraint &buffering_constraint) +int +TAO_Eager_Buffering_Sync_Strategy:: + timer_check (const TAO::BufferingConstraint &buffering_constraint, + const ACE_Time_Value ¤t_deadline, + int &set_timer, + ACE_Time_Value &new_deadline) { - if (transport.buffering_timer_id () != 0) + set_timer = 0; + if (!ACE_BIT_ENABLED (buffering_constraint.mode, + TAO::BUFFER_TIMEOUT)) { - // - // There is a timeout set by us, though we are not sure if we - // still need the timeout or if the timeout value is correct or - // not. - // - - // Get our reactor. - ACE_Reactor *reactor = transport.orb_core ()->reactor (); - - if (!ACE_BIT_ENABLED (buffering_constraint.mode, - TAO::BUFFER_TIMEOUT)) - { - // Timeouts are no longer needed. Cancel existing one. - reactor->cancel_timer (transport.buffering_timer_id ()); - transport.buffering_timer_id (0); - } - else - { - ACE_Time_Value timeout = - this->time_conversion (buffering_constraint.timeout); - - if (transport.buffering_timeout_value () == timeout) - { - // Timeout value is the same, nothing to be done. - } - else - { - // Timeout value has changed, reset the old timer. - reactor->reset_timer_interval (transport.buffering_timer_id (), - timeout); - } - } + return 0; } - else if (ACE_BIT_ENABLED (buffering_constraint.mode, - TAO::BUFFER_TIMEOUT)) + + // Compute the next deadline... + ACE_Time_Value now = ACE_OS::gettimeofday (); + ACE_Time_Value timeout = + this->time_conversion (buffering_constraint.timeout); + new_deadline = now + timeout; + + // Check if the new deadline is more stringent, or if the deadline + // has expired and thus must be reset anyway. + if (current_deadline > new_deadline + || current_deadline < now) { - // We didn't have timeouts before, but we want them now. - ACE_Time_Value timeout = - this->time_conversion (buffering_constraint.timeout); + set_timer = 1; + } - long timer_id = transport.register_for_timer_event (0, timeout, timeout); + // ... if there is no deadline we don't want to schedule output (the + // deadline will be set because set_timer is set to 1 in that case). + // If there is a deadline but but it has not been reached, we + // don't want to schedule any output either... + if (current_deadline == ACE_Time_Value::zero + || current_deadline >= now) + { + return 0; + } - transport.buffering_timer_id (timer_id); - transport.buffering_timeout_value (timeout); + if (TAO_debug_level > 6) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - TAO_Eager_Buffering_Sync_Strategy::timer_check, " + "Now = %u, Current = %u, New = %u\n", + now.msec (), current_deadline.msec (), + new_deadline.msec ())); } + + return 1; } ACE_Time_Value -TAO_Eager_Buffering_Sync_Strategy::time_conversion (const TimeBase::TimeT &time) +TAO_Eager_Buffering_Sync_Strategy:: + time_conversion (const TimeBase::TimeT &time) { TimeBase::TimeT seconds = time / 10000000u; TimeBase::TimeT microseconds = (time % 10000000u) / 10; @@ -228,4 +163,14 @@ TAO_Eager_Buffering_Sync_Strategy::time_conversion (const TimeBase::TimeT &time) ACE_U64_TO_U32 (microseconds)); } +// **************************************************************** + +int +TAO_Delayed_Buffering_Sync_Strategy:: + must_queue (int queue_empty) +{ + // If the queue is empty we want to send immediately + return !queue_empty; +} + #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ diff --git a/TAO/tao/Sync_Strategies.h b/TAO/tao/Sync_Strategies.h index 5b273dac3e5..dcbc524a5a7 100644 --- a/TAO/tao/Sync_Strategies.h +++ b/TAO/tao/Sync_Strategies.h @@ -27,24 +27,61 @@ #include "tao/Transport.h" #include "tao/TAOC.h" +/// Define the interface for the Queueing Strategy +/** + * The low-level I/O components in the ORB use this strategy to + * determine when messages must be queued, immediately sent or + * flushed. + * + * The strategy isolates this low-level components from the higher + * level strategies used by the application developer. + * + * @todo The class name (Sync_Strategy) is inherited from the policies + * (SyncScopePolicy), but Queueing_Strategy probably captures its + * intent better. It should be changed in a future revision of the + * ORB. + */ class TAO_Export TAO_Sync_Strategy { public: + /// Destructor virtual ~TAO_Sync_Strategy (void); - virtual ssize_t send (TAO_Transport &transport, - TAO_Stub &stub, - const ACE_Message_Block *message_block, - const ACE_Time_Value *max_wait_time) = 0; + /// Return 1 if a message must be queued + virtual int must_queue (int queue_empty) = 0; + + /// Return 1 if it is time to start + /** + * @param stub The object used to make the request, this is used to + * obtain the policies currently in effect for the request + * @param msg_count The number of messages currently queued + * @param total_bytes Number of bytes currently queued + * @param set_timer Returns 1 if a timer should be set to drain the + * queue + * @param interval If set_timer returns 1, this parameter contains + * the timer interval + */ + virtual int buffering_constraints_reached (TAO_Stub *stub, + size_t msg_count, + size_t total_bytes, + int &must_flush, + const ACE_Time_Value ¤t_deadline, + int &set_timer, + ACE_Time_Value &interval) = 0; }; class TAO_Export TAO_Transport_Sync_Strategy : public TAO_Sync_Strategy { public: - ssize_t send (TAO_Transport &transport, - TAO_Stub &stub, - const ACE_Message_Block *message_block, - const ACE_Time_Value *max_wait_time); + virtual int must_queue (int queue_empty); + + virtual int buffering_constraints_reached (TAO_Stub *stub, + size_t msg_count, + size_t total_bytes, + int &must_flush, + const ACE_Time_Value ¤t_deadline, + int &set_timer, + ACE_Time_Value &interval); }; #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) @@ -52,28 +89,48 @@ public: class TAO_Export TAO_Eager_Buffering_Sync_Strategy : public TAO_Sync_Strategy { public: - ssize_t send (TAO_Transport &transport, - TAO_Stub &stub, - const ACE_Message_Block *message_block, - const ACE_Time_Value *max_wait_time); - - virtual int buffering_constraints_reached (TAO_Transport &transport, - TAO_Stub &stub, - TAO_Transport_Buffering_Queue &buffering_queue); - - void timer_check (TAO_Transport &transport, - const TAO::BufferingConstraint &buffering_constraint); - + virtual int must_queue (int queue_empty); + + virtual int buffering_constraints_reached (TAO_Stub *stub, + size_t msg_count, + size_t total_bytes, + int &must_flush, + const ACE_Time_Value ¤t_deadline, + int &set_timer, + ACE_Time_Value &new_deadline); + +private: + /// Check if the buffering constraint includes any timeouts and + /// compute the right timeout interval if needed. + /** + * @param buffering_constraint The constraints defined by the + * application + * @param set_timer Return 1 if the timer should be set + * @param interval Return the timer interval value + * + * @return Returns 1 if the deadline has already expired and + * flushing must commence immediately. If the function + * returns 0 then flushing may need to be delayed, use @c + * set_timer and + * + */ + int timer_check (const TAO::BufferingConstraint &buffering_constraint, + const ACE_Time_Value ¤t_deadline, + int &set_timer, + ACE_Time_Value &new_deadline); + + /// Convert from standard CORBA time units to seconds/microseconds. ACE_Time_Value time_conversion (const TimeBase::TimeT &time); }; +/// Delay the buffering decision until the transport blocks +/** + * If the queue is empty the transport will try to send immediately. + */ class TAO_Export TAO_Delayed_Buffering_Sync_Strategy : public TAO_Eager_Buffering_Sync_Strategy { public: - ssize_t send (TAO_Transport &transport, - TAO_Stub &stub, - const ACE_Message_Block *message_block, - const ACE_Time_Value *max_wait_time); + virtual int must_queue (int queue_empty); }; #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp new file mode 100644 index 00000000000..b65fd572408 --- /dev/null +++ b/TAO/tao/Synch_Queued_Message.cpp @@ -0,0 +1,91 @@ +// -*- C++ -*- +// $Id$ + +#include "Synch_Queued_Message.h" + +ACE_RCSID(tao, Synch_Queued_Message, "$Id$") + +TAO_Synch_Queued_Message:: + TAO_Synch_Queued_Message (const ACE_Message_Block *contents) + : contents_ (ACE_const_cast (ACE_Message_Block*,contents)) + , current_block_ (contents_) +{ +} + +TAO_Synch_Queued_Message::~TAO_Synch_Queued_Message (void) +{ +} + +const ACE_Message_Block * +TAO_Synch_Queued_Message::current_block (void) const +{ + return this->current_block_; +} + +size_t +TAO_Synch_Queued_Message::message_length (void) const +{ + if (this->current_block_ == 0) + return 0; + return this->current_block_->total_length (); +} + +int +TAO_Synch_Queued_Message::all_data_sent (void) const +{ + return this->current_block_ == 0; +} + +void +TAO_Synch_Queued_Message::fill_iov (int iovcnt_max, + int &iovcnt, + iovec iov[]) const +{ + ACE_ASSERT (iovcnt_max > iovcnt); + + for (const ACE_Message_Block *message_block = this->current_block_; + message_block != 0 && iovcnt < iovcnt_max; + message_block = message_block->cont ()) + { + size_t message_block_length = message_block->length (); + + // Check if this block has any data to be sent. + if (message_block_length > 0) + { + // Collect the data in the iovec. + iov[iovcnt].iov_base = message_block->rd_ptr (); + iov[iovcnt].iov_len = message_block_length; + + // Increment iovec counter. + iovcnt++; + } + } +} + +void +TAO_Synch_Queued_Message::bytes_transferred (size_t &byte_count) +{ + while (this->current_block_ != 0 && byte_count > 0) + { + size_t l = this->current_block_->length (); + + if (byte_count < l) + { + this->current_block_->rd_ptr (byte_count); + byte_count = 0; + return; + } + byte_count -= l; + this->current_block_ = this->current_block_->cont (); + while (this->current_block_ != 0 + && this->current_block_->length () == 0) + { + this->current_block_ = this->current_block_->cont (); + } + } +} + +void +TAO_Synch_Queued_Message::destroy (void) +{ +} diff --git a/TAO/tao/Synch_Queued_Message.h b/TAO/tao/Synch_Queued_Message.h new file mode 100644 index 00000000000..2a8c638abf7 --- /dev/null +++ b/TAO/tao/Synch_Queued_Message.h @@ -0,0 +1,86 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file Synch_Queued_Message.h + * + * $Id$ + * + * @author Carlos O'Ryan <coryan@uci.edu> + */ +//============================================================================= + +#ifndef TAO_SYNCH_QUEUED_MESSAGE_H +#define TAO_SYNCH_QUEUED_MESSAGE_H +#include "ace/pre.h" + +#include "Queued_Message.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +/** + * @class TAO_Synch_Queued_Message + * + * @brief Specialize TAO_Queued_Message for synchronous requests, + * i.e. twoways and oneways sent with reliability better than + * SYNC_NONE. + * + * Reliable requests block the sending thread until the message is + * sent, likewise, the sending thread must be informed if the + * connection is closed or the message times out. + * + * In contrast oneway (and AMI) requests sent with the SYNC_NONE + * policy are simple discarded if the connection fails or they + * timeout. + * + * Another important difference is the management of the data buffer: + * one SYNC_NONE messages the buffer is immediately copied into a + * newly allocated buffer, and must be deallocated. Other types of + * requests use the memory allocated by the sending thread. + * + */ +class TAO_Export TAO_Synch_Queued_Message : public TAO_Queued_Message +{ +public: + /// Constructor + /** + * @param contents The message block chain that must be sent. + */ + TAO_Synch_Queued_Message (const ACE_Message_Block *contents); + + /// Destructor + virtual ~TAO_Synch_Queued_Message (void); + + const ACE_Message_Block *current_block (void) const; + + /** Implement the Template Methods from TAO_Queued_Message + */ + //@{ + virtual size_t message_length (void) const; + virtual int all_data_sent (void) const; + virtual void fill_iov (int iovcnt_max, int &iovcnt, iovec iov[]) const; + virtual void bytes_transferred (size_t &byte_count); + virtual void destroy (void); + //@} + +private: + /// The contents of the message. + /** + * The message is normally generated by a TAO_OutputCDR stream. The + * application marshals the payload, possibly generating a chain of + * message block connected via the 'cont()' field. + */ + ACE_Message_Block *contents_; + + /// The current message block + /** + * The message may be set in multiple writev() operations. This + * point keeps track of the next message to send out. + */ + ACE_Message_Block *current_block_; +}; + +#include "ace/post.h" +#endif /* TAO_QUEUED_MESSAGE_H */ diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp index 196cf082a9f..e1ae786dc73 100644 --- a/TAO/tao/TAO.dsp +++ b/TAO/tao/TAO.dsp @@ -187,6 +187,10 @@ SOURCE=.\Asynch_Invocation.cpp # End Source File
# Begin Source File
+SOURCE=.\Asynch_Queued_Message.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Asynch_Reply_Dispatcher.cpp
# End Source File
# Begin Source File
@@ -207,6 +211,10 @@ SOURCE=.\Bind_Dispatcher_Guard.cpp # End Source File
# Begin Source File
+SOURCE=.\Block_Flushing_Strategy.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\BoundsC.cpp
# End Source File
# Begin Source File
@@ -363,6 +371,10 @@ SOURCE=.\FILE_Parser.cpp # End Source File
# Begin Source File
+SOURCE=.\Flushing_Strategy.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\GIOP_Message_Base.cpp
# End Source File
# Begin Source File
@@ -659,6 +671,14 @@ SOURCE=.\Protocols_Hooks.cpp # End Source File
# Begin Source File
+SOURCE=.\Queued_Message.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Reactive_Flushing_Strategy.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Reactor_Registry.cpp
# End Source File
# Begin Source File
@@ -703,10 +723,6 @@ SOURCE=.\RT_ORB.cpp # End Source File
# Begin Source File
-SOURCE=.\Thread_Pool.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\RT_ORB_Loader.cpp
# End Source File
# Begin Source File
@@ -775,6 +791,10 @@ SOURCE=.\Sync_Strategies.cpp # End Source File
# Begin Source File
+SOURCE=.\Synch_Queued_Message.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Synch_Reply_Dispatcher.cpp
# End Source File
# Begin Source File
@@ -807,6 +827,10 @@ SOURCE=.\target_specification.cpp # End Source File
# Begin Source File
+SOURCE=.\Thread_Pool.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\TimeBaseC.cpp
# End Source File
# Begin Source File
@@ -831,6 +855,10 @@ SOURCE=.\Transport_Mux_Strategy.cpp # End Source File
# Begin Source File
+SOURCE=.\Transport_Timer.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Typecode.cpp
# End Source File
# Begin Source File
@@ -907,6 +935,10 @@ SOURCE=.\Asynch_Invocation.h # End Source File
# Begin Source File
+SOURCE=.\Asynch_Queued_Message.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Asynch_Reply_Dispatcher.h
# End Source File
# Begin Source File
@@ -919,10 +951,18 @@ SOURCE=.\Base_Transport_Property.h # End Source File
# Begin Source File
+SOURCE=.\BiDir_Adapter.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Bind_Dispatcher_Guard.h
# End Source File
# Begin Source File
+SOURCE=.\Block_Flushing_Strategy.h
+# End Source File
+# Begin Source File
+
SOURCE=.\BoundsC.h
# End Source File
# Begin Source File
@@ -1091,6 +1131,10 @@ SOURCE=.\FILE_Parser.h # End Source File
# Begin Source File
+SOURCE=.\Flushing_Strategy.h
+# End Source File
+# Begin Source File
+
SOURCE=.\giop.h
# End Source File
# Begin Source File
@@ -1427,6 +1471,18 @@ SOURCE=.\Protocols_Hooks.h # End Source File
# Begin Source File
+SOURCE=.\Queued_Message.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Queued_Message.inl
+# End Source File
+# Begin Source File
+
+SOURCE=.\Reactive_Flushing_Strategy.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Reactor_Registry.h
# End Source File
# Begin Source File
@@ -1471,10 +1527,6 @@ SOURCE=.\RT_ORB.h # End Source File
# Begin Source File
-SOURCE=.\Thread_Pool.h
-# End Source File
-# Begin Source File
-
SOURCE=.\RT_ORB_Loader.h
# End Source File
# Begin Source File
@@ -1555,6 +1607,10 @@ SOURCE=.\Sync_Strategies.h # End Source File
# Begin Source File
+SOURCE=.\Synch_Queued_Message.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Synch_Reply_Dispatcher.h
# End Source File
# Begin Source File
@@ -1603,6 +1659,10 @@ SOURCE=.\target_specification.h # End Source File
# Begin Source File
+SOURCE=.\Thread_Pool.h
+# End Source File
+# Begin Source File
+
SOURCE=.\TimeBaseC.h
# End Source File
# Begin Source File
@@ -1639,6 +1699,10 @@ SOURCE=.\Transport_Mux_Strategy.h # End Source File
# Begin Source File
+SOURCE=.\Transport_Timer.h
+# End Source File
+# Begin Source File
+
SOURCE=.\try_macros.h
# End Source File
# Begin Source File
@@ -2123,10 +2187,6 @@ SOURCE=.\RT_ORB.i # End Source File
# Begin Source File
-SOURCE=.\Thread_Pool.i
-# End Source File
-# Begin Source File
-
SOURCE=.\RT_Policy_i.i
# End Source File
# Begin Source File
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp index 3eed1af8bc7..0337b6a1f65 100644 --- a/TAO/tao/TAO_Server_Request.cpp +++ b/TAO/tao/TAO_Server_Request.cpp @@ -2,29 +2,27 @@ // Implementation of the Dynamic Server Skeleton Interface (for GIOP) -#include "TAO_Server_Request.h" -#include "CDR.h" -#include "Environment.h" -#include "Principal.h" -#include "ORB_Core.h" -#include "ORB.h" -#include "Timeprobe.h" -#include "debug.h" -#include "Pluggable_Messaging_Utils.h" -#include "Pluggable_Messaging.h" +#include "tao/TAO_Server_Request.h" +#include "tao/CDR.h" +#include "tao/Environment.h" +#include "tao/Principal.h" +#include "tao/ORB_Core.h" +#include "tao/ORB.h" +#include "tao/Timeprobe.h" +#include "tao/debug.h" +#include "tao/Pluggable_Messaging_Utils.h" +#include "tao/Pluggable_Messaging.h" // @@ Should not be included. But, for the timebeing. -#include "GIOP_Utils.h" +#include "tao/GIOP_Utils.h" #include "Transport.h" #if !defined (__ACE_INLINE__) -# include "TAO_Server_Request.i" +# include "tao/TAO_Server_Request.i" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (tao, - TAO_Server_Request, - "$Id$") +ACE_RCSID(tao, TAO_Server_Request, "$Id$") #if defined (ACE_ENABLE_TIMEPROBES) @@ -53,7 +51,6 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base, TAO_Transport *transport, TAO_ORB_Core *orb_core) : mesg_base_ (mesg_base), - operation_ (), incoming_ (&input), outgoing_ (&output), transport_(TAO_Transport::_duplicate (transport)), @@ -83,7 +80,7 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base, CORBA::Boolean response_expected, CORBA::Boolean deferred_reply, TAO_ObjectKey &object_key, - const char *operation, + const ACE_CString &operation, TAO_OutputCDR &output, TAO_Transport *transport, TAO_ORB_Core *orb_core, @@ -270,14 +267,11 @@ TAO_ServerRequest::tao_send_reply_exception (CORBA::Exception &ex) } // Create a new output CDR stream -#if defined(ACE_HAS_PURIFY) - // Only inititialize the buffer if we're compiling with Purify. - // Otherwise, there is no real need to do so, especially since - // we can avoid the initialization overhead at run-time if we - // are not compiling with Purify support. - char repbuf[ACE_CDR::DEFAULT_BUFSIZE] = { 0 }; -#else char repbuf[ACE_CDR::DEFAULT_BUFSIZE]; +#if defined(ACE_HAS_PURIFY) + (void) ACE_OS::memset (repbuf, + '\0', + sizeof repbuf); #endif /* ACE_HAS_PURIFY */ TAO_OutputCDR output (repbuf, diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h index 8d30ee17f2d..b78d9dd730d 100644 --- a/TAO/tao/TAO_Server_Request.h +++ b/TAO/tao/TAO_Server_Request.h @@ -61,7 +61,7 @@ public: CORBA::Boolean response_expected, CORBA::Boolean deferred_flag, TAO_ObjectKey &object_key, - const char *operation, + const ACE_CString &operation, TAO_OutputCDR &output, TAO_Transport *transport, TAO_ORB_Core *orb_core, @@ -78,8 +78,10 @@ public: const char *operation (void) const; /// Set the operation name. - void operation (const char *operation, - size_t length, + void operation (ACE_CString &operation); + + /// Set the operation name. + void operation (const char * name, int release); /// Return the legnth of the operation. diff --git a/TAO/tao/TAO_Server_Request.i b/TAO/tao/TAO_Server_Request.i index c79064a782c..0e00e4ec7df 100644 --- a/TAO/tao/TAO_Server_Request.i +++ b/TAO/tao/TAO_Server_Request.i @@ -26,14 +26,9 @@ TAO_ServerRequest::operation (void) const } ACE_INLINE void -TAO_ServerRequest::operation (const char *operation, - size_t length, - int release) -{ - if (length == 0) - this->operation_.set (operation, release); - else - this->operation_.set (operation, length, release); +TAO_ServerRequest::operation (ACE_CString &operation) +{ + this->operation_ = operation; } ACE_INLINE unsigned int diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp index e5a71d7c0e1..e2b4c9f35de 100644 --- a/TAO/tao/TAO_Static.dsp +++ b/TAO/tao/TAO_Static.dsp @@ -40,8 +40,8 @@ RSC=rc.exe # PROP Output_Dir ""
# PROP Intermediate_Dir "LIB\Release"
# PROP Target_Dir ""
-LINK32=link.exe -lib
MTL=midl.exe
+LINK32=link.exe -lib
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /I "../" /D "_WINDOWS" /D "_CONSOLE" /D "NDEBUG" /D "WIN32" /D "TAO_AS_STATIC_LIBS" /D "ACE_AS_STATIC_LIBS" /FD /c
# SUBTRACT CPP /YX
@@ -66,8 +66,8 @@ LIB32=link.exe -lib # PROP Output_Dir ""
# PROP Intermediate_Dir "LIB\Debug"
# PROP Target_Dir ""
-LINK32=link.exe -lib
MTL=midl.exe
+LINK32=link.exe -lib
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../" /I "../" /D "_WINDOWS" /D "_CONSOLE" /D "_DEBUG" /D "WIN32" /D "ACE_AS_STATIC_LIBS" /D "TAO_AS_STATIC_LIBS" /FD /c
# SUBTRACT CPP /YX
@@ -119,6 +119,10 @@ SOURCE=.\Asynch_Invocation.h # End Source File
# Begin Source File
+SOURCE=.\Asynch_Queued_Message.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Asynch_Reply_Dispatcher.h
# End Source File
# Begin Source File
@@ -131,7 +135,19 @@ SOURCE=.\Base_Transport_Property.h # End Source File
# Begin Source File
-SOURCE=.\BiDir_Adapter.h
+SOURCE=.\BiDir_ORBInitializer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDir_Policy_i.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDir_PolicyFactory.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDirPolicyC.h
# End Source File
# Begin Source File
@@ -139,6 +155,10 @@ SOURCE=.\Bind_Dispatcher_Guard.h # End Source File
# Begin Source File
+SOURCE=.\Block_Flushing_Strategy.h
+# End Source File
+# Begin Source File
+
SOURCE=.\BoundsC.h
# End Source File
# Begin Source File
@@ -275,10 +295,6 @@ SOURCE=.\Endpoint.h # End Source File
# Begin Source File
-SOURCE=.\Endpoint_Selector_Factory.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Environment.h
# End Source File
# Begin Source File
@@ -299,6 +315,10 @@ SOURCE=.\FILE_Parser.h # End Source File
# Begin Source File
+SOURCE=.\Flushing_Strategy.h
+# End Source File
+# Begin Source File
+
SOURCE=.\giop.h
# End Source File
# Begin Source File
@@ -451,6 +471,10 @@ SOURCE=.\marshal.h # End Source File
# Begin Source File
+SOURCE=.\Message_Sent_Callback.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Messaging_ORBInitializer.h
# End Source File
# Begin Source File
@@ -631,6 +655,14 @@ SOURCE=.\Protocols_Hooks.h # End Source File
# Begin Source File
+SOURCE=.\Queued_Message.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Reactive_Flushing_Strategy.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Reactor_Registry.h
# End Source File
# Begin Source File
@@ -659,10 +691,6 @@ SOURCE=.\RT_Current.h # End Source File
# Begin Source File
-SOURCE=.\RT_Endpoint_Selector_Factory.h
-# End Source File
-# Begin Source File
-
SOURCE=.\RT_Invocation_Endpoint_Selectors.h
# End Source File
# Begin Source File
@@ -675,10 +703,6 @@ SOURCE=.\RT_ORB.h # End Source File
# Begin Source File
-SOURCE=.\Thread_Pool.h
-# End Source File
-# Begin Source File
-
SOURCE=.\RT_ORB_Loader.h
# End Source File
# Begin Source File
@@ -759,6 +783,10 @@ SOURCE=.\Sync_Strategies.h # End Source File
# Begin Source File
+SOURCE=.\Synch_Queued_Message.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Synch_Reply_Dispatcher.h
# End Source File
# Begin Source File
@@ -911,6 +939,14 @@ SOURCE=.\Base_Transport_Property.inl # End Source File
# Begin Source File
+SOURCE=.\BiDir_Policy_i.inl
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDirPolicyC.i
+# End Source File
+# Begin Source File
+
SOURCE=.\Bind_Dispatcher_Guard.i
# End Source File
# Begin Source File
@@ -1163,6 +1199,10 @@ SOURCE=.\marshal.i # End Source File
# Begin Source File
+SOURCE=.\Message_Sent_Callback.inl
+# End Source File
+# Begin Source File
+
SOURCE=.\Messaging_Policy_i.i
# End Source File
# Begin Source File
@@ -1299,6 +1339,10 @@ SOURCE=.\Profile.i # End Source File
# Begin Source File
+SOURCE=.\Queued_Message.inl
+# End Source File
+# Begin Source File
+
SOURCE=.\Reactor_Registry.i
# End Source File
# Begin Source File
@@ -1323,10 +1367,6 @@ SOURCE=.\RT_ORB.i # End Source File
# Begin Source File
-SOURCE=.\Thread_Pool.i
-# End Source File
-# Begin Source File
-
SOURCE=.\RT_Policy_i.i
# End Source File
# Begin Source File
@@ -1511,6 +1551,10 @@ SOURCE=.\Asynch_Invocation.cpp # End Source File
# Begin Source File
+SOURCE=.\Asynch_Queued_Message.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Asynch_Reply_Dispatcher.cpp
# End Source File
# Begin Source File
@@ -1523,7 +1567,19 @@ SOURCE=.\Base_Transport_Property.cpp # End Source File
# Begin Source File
-SOURCE=.\BiDir_Adapter.cpp
+SOURCE=.\BiDir_ORBInitializer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDir_Policy_i.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDir_PolicyFactory.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDirPolicyC.cpp
# End Source File
# Begin Source File
@@ -1531,6 +1587,10 @@ SOURCE=.\Bind_Dispatcher_Guard.cpp # End Source File
# Begin Source File
+SOURCE=.\Block_Flushing_Strategy.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\BoundsC.cpp
# End Source File
# Begin Source File
@@ -1659,10 +1719,6 @@ SOURCE=.\Endpoint.cpp # End Source File
# Begin Source File
-SOURCE=.\Endpoint_Selector_Factory.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\Environment.cpp
# End Source File
# Begin Source File
@@ -1683,6 +1739,10 @@ SOURCE=.\FILE_Parser.cpp # End Source File
# Begin Source File
+SOURCE=.\Flushing_Strategy.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\GIOP_Message_Base.cpp
# End Source File
# Begin Source File
@@ -1819,6 +1879,10 @@ SOURCE=.\Marshal.cpp # End Source File
# Begin Source File
+SOURCE=.\Message_Sent_Callback.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Messaging_ORBInitializer.cpp
# End Source File
# Begin Source File
@@ -1979,6 +2043,14 @@ SOURCE=.\Protocols_Hooks.cpp # End Source File
# Begin Source File
+SOURCE=.\Queued_Message.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Reactive_Flushing_Strategy.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Reactor_Registry.cpp
# End Source File
# Begin Source File
@@ -2007,10 +2079,6 @@ SOURCE=.\RT_Current.cpp # End Source File
# Begin Source File
-SOURCE=.\RT_Endpoint_Selector_Factory.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\RT_Invocation_Endpoint_Selectors.cpp
# End Source File
# Begin Source File
@@ -2023,10 +2091,6 @@ SOURCE=.\RT_ORB.cpp # End Source File
# Begin Source File
-SOURCE=.\Thread_Pool.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\RT_ORB_Loader.cpp
# End Source File
# Begin Source File
@@ -2095,6 +2159,10 @@ SOURCE=.\Sync_Strategies.cpp # End Source File
# Begin Source File
+SOURCE=.\Synch_Queued_Message.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Synch_Reply_Dispatcher.cpp
# End Source File
# Begin Source File
diff --git a/TAO/tao/Thread_Pool.cpp b/TAO/tao/Thread_Pool.cpp index ad8e901edd6..08e249958b8 100644 --- a/TAO/tao/Thread_Pool.cpp +++ b/TAO/tao/Thread_Pool.cpp @@ -476,7 +476,7 @@ TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool, // Return current counter and perform post-increment. return this->thread_pool_id_counter_++; -} +}; void TAO_Thread_Pool_Manager::destroy_threadpool_i (RTCORBA::ThreadpoolId thread_pool_id, diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index 32733dee5c5..ba8108218f1 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -12,36 +12,39 @@ #include "Sync_Strategies.h" #include "Connection_Handler.h" #include "Pluggable_Messaging.h" +#include "Synch_Queued_Message.h" +#include "Asynch_Queued_Message.h" +#include "Flushing_Strategy.h" #include "debug.h" +#include "ace/Message_Block.h" + #if !defined (__ACE_INLINE__) # include "Transport.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(tao, Transport, "$Id$") -TAO_Synch_Refcountable::TAO_Synch_Refcountable (ACE_Lock *lock, int refcount) +TAO_Synch_Refcountable::TAO_Synch_Refcountable (int refcount) : ACE_Refcountable (refcount) - , refcount_lock_ (lock) { } TAO_Synch_Refcountable::~TAO_Synch_Refcountable (void) { - delete this->refcount_lock_; } int TAO_Synch_Refcountable::increment (void) { - ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->refcount_lock_, 0); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return ACE_Refcountable::increment (); } int TAO_Synch_Refcountable::decrement (void) { - ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->refcount_lock_, 0); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return ACE_Refcountable::decrement (); } @@ -54,13 +57,16 @@ TAO_Synch_Refcountable::refcount (void) const // Constructor. TAO_Transport::TAO_Transport (CORBA::ULong tag, TAO_ORB_Core *orb_core) - : TAO_Synch_Refcountable (orb_core->resource_factory ()->create_cached_connection_lock (), 1) + : TAO_Synch_Refcountable (1) , tag_ (tag) , orb_core_ (orb_core) , cache_map_entry_ (0) - , buffering_queue_ (0) - , buffering_timer_id_ (0) , bidirectional_flag_ (-1) + , head_ (0) + , tail_ (0) + , current_deadline_ (ACE_Time_Value::zero) + , flush_timer_id_ (-1) + , transport_timer_ (this) , id_ ((long) this) { TAO_Client_Strategy_Factory *cf = @@ -85,31 +91,76 @@ TAO_Transport::~TAO_Transport (void) delete this->tms_; this->tms_ = 0; - delete this->buffering_queue_; - delete this->handler_lock_; -} + TAO_Queued_Message *i = this->head_; + while (i != 0) + { + // @@ This is a good point to insert a flag to indicate that a + // CloseConnection message was successfully received. + i->connection_closed (); + TAO_Queued_Message *tmp = i; + i = i->next (); -ssize_t -TAO_Transport::send_or_buffer (TAO_Stub *stub, - int two_way, - const ACE_Message_Block *message_block, - const ACE_Time_Value *max_wait_time) + tmp->destroy (); + } +} + +int +TAO_Transport::handle_output () { + if (TAO_debug_level > 4) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::handle_output\n", + this->id ())); + } - if (stub == 0 || two_way) + // The flushing strategy (potentially via the Reactor) wants to send + // more data, first check if there is a current message that needs + // more sending... + int retval = this->drain_queue (); + + if (TAO_debug_level > 4) { - return this->send (message_block, max_wait_time); + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::handle_output, " + "drain_queue returns %d/%d\n", + this->id (), + retval, errno)); } - TAO_Sync_Strategy &sync_strategy = stub->sync_strategy (); + if (retval == 1) + { + // ... there is no current message or it was completely + // sent, cancel output... + TAO_Flushing_Strategy *flushing_strategy = + this->orb_core ()->flushing_strategy (); + + ACE_MT (ACE_GUARD_RETURN (ACE_Lock, guard, *this->handler_lock_, -1)); + + flushing_strategy->cancel_output (this); - return sync_strategy.send (*this, - *stub, - message_block, - max_wait_time); + if (this->flush_timer_id_ != -1) + { + ACE_Event_Handler *eh = this->event_handler_i (); + if (eh != 0) + { + ACE_Reactor *reactor = eh->reactor (); + if (reactor != 0) + { + (void) reactor->cancel_timer (this->flush_timer_id_); + } + } + this->current_deadline_ = ACE_Time_Value::zero; + this->flush_timer_id_ = -1; + } + return 0; + } + + // Any errors are returned directly to the Reactor + return retval; } void @@ -124,150 +175,342 @@ TAO_Transport::provide_handle (ACE_Handle_Set &handle_set) handle_set.set_bit (eh->get_handle ()); } -ssize_t -TAO_Transport::send_buffered_messages (const ACE_Time_Value *max_wait_time) +static void +dump_iov (iovec *iov, int iovcnt, int id, + size_t current_transfer, + const char *location) { - // Make sure we have a buffering queue and there are messages in it. - if (this->buffering_queue_ == 0 || - this->buffering_queue_->is_empty ()) - return 1; + ACE_Log_Msg::instance ()->acquire (); - // Now, we can take the lock and try to do something. - // - // @@CJC We might be able to reduce the length of time we hold - // the lock depending on whether or not we need to hold the - // hold the lock while we're doing queueing activities. - ACE_MT (ACE_GUARD_RETURN (ACE_Lock, - guard, - *this->handler_lock_, - -1)); + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::%s" + " sending %d buffers\n", + id, location, iovcnt)); + for (int i = 0; i != iovcnt && 0 < current_transfer; ++i) + { + size_t iov_len = iov[i].iov_len; + + // Possibly a partially sent iovec entry. + if (current_transfer < iov_len) + iov_len = current_transfer; + + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::%s" + " buffer %d/%d has %d bytes\n", + id, location, + i, iovcnt, + iov_len)); + + size_t len; + for (size_t offset = 0; offset < iov_len; offset += len) + { + char header[1024]; + ACE_OS::sprintf (header, + "TAO - Transport[%d]::%s (%d/%d)\n", + id, location, offset, iov_len); + + len = iov_len - offset; + if (len > 512) + len = 512; + ACE_HEX_DUMP ((LM_DEBUG, + ACE_static_cast(char*,iov[i].iov_base) + offset, + len, + header)); + } + current_transfer -= iov_len; + } + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::%s" + " end of data\n", + id, location)); + + ACE_Log_Msg::instance ()->release (); +} + +int +TAO_Transport::send_message_block_chain (const ACE_Message_Block *mb, + size_t &bytes_transferred, + ACE_Time_Value *max_wait_time) +{ + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1); + + if (this->check_event_handler_i ("TAO_Transport::send_message_block_chain") == -1) + return -1; + + return this->send_message_block_chain_i (mb, + bytes_transferred, + max_wait_time); +} + +int +TAO_Transport::send_message_block_chain_i (const ACE_Message_Block *mb, + size_t &bytes_transferred, + ACE_Time_Value *) +{ + size_t total_length = mb->total_length (); + + // We are going to block, so there is no need to clone + // the message block. + TAO_Synch_Queued_Message synch_message (mb); + + synch_message.push_back (this->head_, this->tail_); + + int n = this->drain_queue_i (); + if (n == -1) + { + synch_message.remove_from_list (this->head_, this->tail_); + ACE_ASSERT (synch_message.next () == 0); + ACE_ASSERT (synch_message.prev () == 0); + return -1; // Error while sending... + } + else if (n == 1) + { + ACE_ASSERT (synch_message.all_data_sent ()); + ACE_ASSERT (synch_message.next () == 0); + ACE_ASSERT (synch_message.prev () == 0); + return 1; // Empty queue, message was sent.. + } + + ACE_ASSERT (n == 0); // Some data sent, but data remains. + + // Remove the temporary message from the queue... + synch_message.remove_from_list (this->head_, this->tail_); + + bytes_transferred = + total_length - synch_message.message_length (); + + return 0; +} + +int +TAO_Transport::send_message_i (TAO_Stub *stub, + int is_synchronous, + const ACE_Message_Block *message_block, + ACE_Time_Value *max_wait_time) +{ + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1); + + if (this->check_event_handler_i ("TAO_Transport::send_message_i") == -1) + return -1; + + if (is_synchronous) + { + return this->send_synchronous_message_i (message_block, + max_wait_time); + } + + // Let's figure out if the message should be queued without trying + // to send first: + int try_sending_first = 1; + + int queue_empty = (this->head_ == 0); - // Get the first message from the queue. - ACE_Message_Block *queued_message = 0; - ssize_t result = this->buffering_queue_->peek_dequeue_head (queued_message); + if (!queue_empty) + try_sending_first = 0; + else if (stub->sync_strategy ().must_queue (queue_empty)) + try_sending_first = 0; - // @@ What to do here on failures? - ACE_ASSERT (result != -1); + size_t byte_count = 0; + ssize_t n; - // @@CJC take lock?? - // Actual network send. - size_t bytes_transferred = 0; - result = this->send_i (queued_message, - max_wait_time, - &bytes_transferred); - // @@CJC release lock?? + TAO_Flushing_Strategy *flushing_strategy = + this->orb_core ()->flushing_strategy (); - // Cannot send completely: timed out. - if (result == -1 && - errno == ETIME) + if (try_sending_first) { - if (bytes_transferred > 0) + // ... in this case we must try to send the message first ... + + if (TAO_debug_level > 6) { - // If successful in sending some of the data, reset the - // queue appropriately. - this->reset_queued_message (queued_message, - bytes_transferred); + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::send_message_i, " + "trying to send the message\n", + this->id ())); + } - // Indicate some success. - return bytes_transferred; + // @@ I don't think we want to hold the mutex here, however if + // we release it we need to recheck the status of the transport + // after we return... once I understand the final form for this + // code I will re-visit this decision + n = this->send_message_block_chain_i (message_block, + byte_count, + max_wait_time); + if (n == 0) + return -1; // EOF + else if (n == -1) + { + // ... if this is just an EWOULDBLOCK we must schedule the + // message for later, if it is ETIME we still have to send + // the complete message, because cutting off the message at + // this point will destroy the synchronization with the + // server ... + if (errno != EWOULDBLOCK && errno != ETIME) + { + return -1; + } } - // Since we queue up the message, this is not an error. We can - // try next time around. - return 1; + // ... let's figure out if the complete message was sent ... + if (message_block->total_length () == byte_count) + { + // Done, just return. Notice that there are no allocations + // or copies up to this point (though some fancy calling + // back and forth). + // This is the common case for the critical path, it should + // be fast. + return 0; + } } - // EOF or other errors. - if (result == -1 || - result == 0) + // ... either the message must be queued or we need to queue it + // because it was not completely sent out ... + + if (TAO_debug_level > 6) { - this->dequeue_all (); - return -1; + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::send_message_i, " + "message is queued\n", + this->id ())); } - // If successful in sending data, reset the queue appropriately. - this->reset_queued_message (queued_message, - bytes_transferred); + TAO_Queued_Message *queued_message = 0; + ACE_NEW_RETURN (queued_message, + TAO_Asynch_Queued_Message (message_block), + -1); + queued_message->bytes_transferred (byte_count); + queued_message->push_back (this->head_, this->tail_); + + // ... if the queue is full we need to activate the output on the + // queue ... + int must_flush = 0; + int constraints_reached = + this->check_buffering_constraints_i (stub, + must_flush); + + // ... but we also want to activate it if the message was partially + // sent.... Plus, when we use the blocking flushing strategy the + // queue is flushed as a side-effect of 'schedule_output()' + + if (constraints_reached || try_sending_first) + { + (void) flushing_strategy->schedule_output (this); + } - // Everything was successfully delivered. - return result; -} + if (must_flush) + { + typedef ACE_Reverse_Lock<ACE_Lock> TAO_REVERSE_LOCK; + TAO_REVERSE_LOCK reverse (*this->handler_lock_); + ACE_GUARD_RETURN (TAO_REVERSE_LOCK, ace_mon, reverse, -1); -void -TAO_Transport::reset_sent_message (ACE_Message_Block *message_block, - size_t bytes_delivered) -{ - this->reset_message (message_block, - bytes_delivered, - 0); -} + (void) flushing_strategy->flush_transport (this); + } -void -TAO_Transport::reset_queued_message (ACE_Message_Block *message_block, - size_t bytes_delivered) -{ - this->reset_message (message_block, - bytes_delivered, - 1); + return 0; } -void -TAO_Transport::reset_message (ACE_Message_Block *message_block, - size_t bytes_delivered, - int queued_message) +int +TAO_Transport::send_synchronous_message_i (const ACE_Message_Block *mb, + ACE_Time_Value *max_wait_time) { - while (bytes_delivered != 0) - { - // Our current message block chain. - ACE_Message_Block *current_message_block = message_block; + // We are going to block, so there is no need to clone + // the message block. + TAO_Synch_Queued_Message synch_message (mb); - int completely_delivered_current_message_block_chain = 0; + synch_message.push_back (this->head_, this->tail_); - while (current_message_block != 0 && - bytes_delivered != 0) - { - size_t current_message_block_length = - current_message_block->length (); + int n = this->drain_queue_i (); + if (n == -1) + { + synch_message.remove_from_list (this->head_, this->tail_); + ACE_ASSERT (synch_message.next () == 0); + ACE_ASSERT (synch_message.prev () == 0); + return -1; // Error while sending... + } + else if (n == 1) + { + ACE_ASSERT (synch_message.all_data_sent ()); + ACE_ASSERT (synch_message.next () == 0); + ACE_ASSERT (synch_message.prev () == 0); + return 1; // Empty queue, message was sent.. + } - int completely_delivered_current_message_block = - bytes_delivered >= current_message_block_length; + ACE_ASSERT (n == 0); // Some data sent, but data remains. - size_t adjustment_size = - ACE_MIN (current_message_block_length, bytes_delivered); + if (synch_message.all_data_sent ()) + { + ACE_ASSERT (synch_message.next () == 0); + ACE_ASSERT (synch_message.prev () == 0); + return 1; + } - // Reset according to send size. - current_message_block->rd_ptr (adjustment_size); + // @todo: Check for timeouts! + // if (max_wait_time != 0 && errno == ETIME) return -1; - // If queued message, adjust the queue. - if (queued_message) - // Hand adjust <message_length>. - this->buffering_queue_->message_length ( - this->buffering_queue_->message_length () - adjustment_size); + TAO_Flushing_Strategy *flushing_strategy = + this->orb_core ()->flushing_strategy (); + (void) flushing_strategy->schedule_output (this); - // Adjust <bytes_delivered>. - bytes_delivered -= adjustment_size; + // Release the mutex, other threads may modify the queue as we + // block for a long time writing out data. + int result; + { + typedef ACE_Reverse_Lock<ACE_Lock> TAO_REVERSE_LOCK; + TAO_REVERSE_LOCK reverse (*this->handler_lock_); + ACE_GUARD_RETURN (TAO_REVERSE_LOCK, ace_mon, reverse, -1); - if (completely_delivered_current_message_block) + result = flushing_strategy->flush_message (this, + &synch_message, + max_wait_time); + } + if (result == -1) + { + synch_message.remove_from_list (this->head_, this->tail_); + if (errno == ETIME) + { + if (this->head_ == &synch_message) { - // Next message block in the continuation chain. - current_message_block = current_message_block->cont (); - - if (current_message_block == 0) - completely_delivered_current_message_block_chain = 1; + // This is a timeout, there is only one nasty case: the + // message has been partially sent! We simply cannot take + // the message out of the queue, because that would corrupt + // the connection. + // + // What we do is replace the queued message with an + // asynchronous message, that contains only what remains of + // the timed out request. If you think about sending + // CancelRequests in this case: there is no much point in + // doing that: the receiving ORB would probably ignore it, + // and figuring out the request ID would be a bit of a + // nightmare. + // + + synch_message.remove_from_list (this->head_, this->tail_); + TAO_Queued_Message *queued_message = 0; + ACE_NEW_RETURN (queued_message, + TAO_Asynch_Queued_Message ( + synch_message.current_block ()), + -1); + queued_message->push_front (this->head_, this->tail_); } } - if (completely_delivered_current_message_block_chain) + if (TAO_debug_level > 0) { - // Go to the next message block chain. - message_block = message_block->next (); - - // If queued message, adjust the queue. - if (queued_message) - // Release this <current_message_block>. - this->dequeue_head (); + ACE_ERROR ((LM_ERROR, + "TAO (%P|%t) TAO_Transport::send_synchronous_message_i, " + "error while flushing message %p\n", "")); } + + return -1; } + + else + { + ACE_ASSERT (synch_message.all_data_sent () != 0); + } + + ACE_ASSERT (synch_message.next () == 0); + ACE_ASSERT (synch_message.prev () == 0); + return 1; } int @@ -320,14 +563,6 @@ TAO_Transport::connection_handler_closing (void) TAO_Transport::release(this); } -#if 0 -TAO_Connection_Handler* -TAO_Transport::connection_handler (void) const -{ - return 0; -} -#endif - TAO_Transport* TAO_Transport::_duplicate (TAO_Transport* transport) { @@ -377,9 +612,6 @@ TAO_Transport::mark_invalid (void) // @@ Do we need this method at all?? this->orb_core_->transport_cache ().mark_invalid ( this->cache_map_entry_); - - - } int @@ -429,32 +661,28 @@ TAO_Transport::close_connection (void) // work, for some reason they hold the mutex while they do // that work though. this->orb_core_->transport_cache ().purge_entry (this->cache_map_entry_); + + for (TAO_Queued_Message *i = this->head_; i != 0; i = i->next ()) + { + i->connection_closed (); + } } ssize_t -TAO_Transport::send (const ACE_Message_Block *mblk, - const ACE_Time_Value *timeout, - size_t *bytes_transferred) +TAO_Transport::send (iovec *iov, int iovcnt, + size_t &bytes_transferred, + const ACE_Time_Value *timeout) { ACE_MT (ACE_GUARD_RETURN (ACE_Lock, guard, *this->handler_lock_, -1)); - // if there's no associated event handler, then we act like a null transport - if (this->event_handler_i () == 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) transport %d (tag=%d) send() ") - ACE_TEXT ("no longer associated with handler, returning -1 with errno = ENOENT\n"), - this->id (), - this->tag_)); - errno = ENOENT; - return -1; - } + if (this->check_event_handler_i ("TAO_Transport::send") == -1) + return -1; // now call the template method - return this->send_i (mblk, timeout, bytes_transferred); + return this->send_i (iov, iovcnt, bytes_transferred, timeout); } ssize_t @@ -467,18 +695,8 @@ TAO_Transport::recv (char *buffer, *this->handler_lock_, -1)); - // if there's no associated event handler, then we act like a null transport - if (this->event_handler_i () == 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) transport %d (tag=%d) recv() ") - ACE_TEXT ("no longer associated with handler, returning -1 with errno = ENOENT\n"), - this->id (), - this->tag_)); - // @@CJC Should we return -1, like an error, or should we return 0, like an EOF? - errno = ENOENT; - return -1; - } + if (this->check_event_handler_i ("TAO_Transport::recv") == -1) + return -1; // now call the template method return this->recv_i (buffer, len, timeout); @@ -546,6 +764,19 @@ TAO_Transport::register_for_timer_event (const void* arg, } int +TAO_Transport::queue_is_empty (void) +{ + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1); + return this->queue_is_empty_i (); +} + +int +TAO_Transport::queue_is_empty_i (void) +{ + return (this->head_ == 0); +} + +int TAO_Transport::register_handler (void) { ACE_MT (ACE_GUARD_RETURN (ACE_Lock, @@ -566,3 +797,324 @@ TAO_Transport::id (int id) { this->id_ = id; } + +int +TAO_Transport::schedule_output_i (void) +{ + ACE_Event_Handler *eh = this->event_handler_i (); + if (eh == 0) + return -1; + + ACE_Reactor *reactor = eh->reactor (); + if (reactor == 0) + return -1; + + if (TAO_debug_level > 3) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::schedule_output\n", + this->id ())); + } + + return reactor->schedule_wakeup (eh, ACE_Event_Handler::WRITE_MASK); +} + +int +TAO_Transport::cancel_output_i (void) +{ + ACE_Event_Handler *eh = this->event_handler_i (); + if (eh == 0) + return -1; + + ACE_Reactor *reactor = eh->reactor (); + if (reactor == 0) + return -1; + + if (TAO_debug_level > 3) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::cancel output\n", + this->id ())); + } + + return reactor->cancel_wakeup (eh, ACE_Event_Handler::WRITE_MASK); +} + +int +TAO_Transport::handle_timeout (const ACE_Time_Value & /* current_time */, + const void *act) +{ + /// This is the only legal ACT in the current configuration.... + if (act != &this->current_deadline_) + return -1; + + if (this->flush_timer_pending ()) + { + // The timer is always a oneshot timer, so mark is as not + // pending. + this->reset_flush_timer (); + + TAO_Flushing_Strategy *flushing_strategy = + this->orb_core ()->flushing_strategy (); + (void) flushing_strategy->schedule_output (this); + } + return 0; +} + +int +TAO_Transport::drain_queue (void) +{ + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1); + + return this->drain_queue_i (); +} + +int +TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[]) +{ + if (this->check_event_handler_i ("TAO_Transport::drain_queue_helper") == -1) + return -1; + + size_t byte_count = 0; + + // ... send the message ... + ssize_t retval = + this->send_i (iov, iovcnt, byte_count); + + if (TAO_debug_level == 5) + { + dump_iov (iov, iovcnt, this->id (), + byte_count, "drain_queue_helper"); + } + + // ... now we need to update the queue, removing elements + // that have been sent, and updating the last element if it + // was only partially sent ... + this->cleanup_queue (byte_count); + iovcnt = 0; + + if (retval == 0) + { + if (TAO_debug_level > 4) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - TAO_Transport::drain_queue_helper, " + "send() returns 0")); + } + return -1; + } + else if (retval == -1) + { + if (TAO_debug_level > 4) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - TAO_Transport::drain_queue_helper, " + "%p", "send()")); + } + if (errno == EWOULDBLOCK) + return 0; + return -1; + } + + // ... start over, how do we guarantee progress? Because if + // no bytes are sent send() can only return 0 or -1 + ACE_ASSERT (byte_count != 0); + + if (TAO_debug_level > 4) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - TAO_Transport::drain_queue_helper, " + "byte_count = %d, head_is_empty = %d\n", + byte_count, (this->head_ == 0))); + } + return 1; +} + +int +TAO_Transport::drain_queue_i (void) +{ + if (this->head_ == 0) + return 1; + + // This is the vector used to send data, it must be declared outside + // the loop because after the loop there may still be data to be + // sent + int iovcnt = 0; + iovec iov[IOV_MAX]; + + // We loop over all the elements in the queue ... + TAO_Queued_Message *i = this->head_; + while (i != 0) + { + // ... each element fills the iovector ... + i->fill_iov (IOV_MAX, iovcnt, iov); + + // ... the vector is full, no choice but to send some data out. + // We need to loop because a single message can span multiple + // IOV_MAX elements ... + if (iovcnt == IOV_MAX) + { + int retval = + this->drain_queue_helper (iovcnt, iov); + + if (TAO_debug_level > 4) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - TAO_Transport::drain_queue_i, " + "helper retval = %d\n", + retval)); + } + if (retval != 1) + return retval; + + i = this->head_; + continue; + } + // ... notice that this line is only reached if there is still + // room in the iovector ... + i = i->next (); + } + + + if (iovcnt != 0) + { + int retval = + this->drain_queue_helper (iovcnt, iov); + + if (TAO_debug_level > 4) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - TAO_Transport::drain_queue_i, " + "helper retval = %d\n", + retval)); + } + if (retval != 1) + return retval; + } + + if (this->head_ == 0) + return 1; + + return 0; +} + +void +TAO_Transport::cleanup_queue (size_t byte_count) +{ + while (this->head_ != 0 && byte_count > 0) + { + TAO_Queued_Message *i = this->head_; + + if (TAO_debug_level > 4) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - TAO_Transport::cleanup_queue, " + "byte_count = %d, head_is_empty = %d\n", + byte_count, (this->head_ == 0))); + } + + // Update the state of the first message + i->bytes_transferred (byte_count); + + if (TAO_debug_level > 4) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - TAO_Transport::cleanup_queue, " + "after transfer, byte_count = %d, all_sent = %d\n", + byte_count, i->all_data_sent ())); + } + + // ... if all the data was sent the message must be removed from + // the queue... + if (i->all_data_sent ()) + { + i->remove_from_list (this->head_, this->tail_); + i->destroy (); + } + } +} + +int +TAO_Transport::check_buffering_constraints_i (TAO_Stub *stub, + int &must_flush) +{ + // First let's compute the size of the queue: + size_t msg_count = 0; + size_t total_bytes = 0; + for (TAO_Queued_Message *i = this->head_; i != 0; i = i->next ()) + { + msg_count++; + total_bytes += i->message_length (); + } + + int set_timer; + ACE_Time_Value new_deadline; + + int constraints_reached = + stub->sync_strategy ().buffering_constraints_reached (stub, + msg_count, + total_bytes, + must_flush, + this->current_deadline_, + set_timer, + new_deadline); + + // ... set the new timer, also cancel any previous timers ... + if (set_timer) + { + ACE_MT (ACE_GUARD_RETURN (ACE_Lock, + guard, + *this->handler_lock_, + -1)); + + ACE_Event_Handler *eh = this->event_handler_i (); + if (eh != 0) + { + ACE_Reactor *reactor = eh->reactor (); + if (reactor != 0) + { + this->current_deadline_ = new_deadline; + ACE_Time_Value delay = + new_deadline - ACE_OS::gettimeofday (); + + if (this->flush_timer_pending ()) + { + (void) reactor->cancel_timer (this->flush_timer_id_); + } + this->flush_timer_id_ = + reactor->schedule_timer (&this->transport_timer_, + &this->current_deadline_, + delay); + } + } + } + + return constraints_reached; +} + +void +TAO_Transport::report_invalid_event_handler (const char *caller) +{ + if (TAO_debug_level > 0) + { + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) transport %d (tag=%d) %s " + "no longer associated with handler, " + "returning -1 with errno = ENOENT\n", + this->id (), + this->tag_, + caller)); + } +} + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class ACE_Reverse_Lock<ACE_Lock>; +template class ACE_Guard<ACE_Reverse_Lock<ACE_Lock> >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +#pragma instantiate ACE_Reverse_Lock<ACE_Lock> +#pragma instantiate ACE_Guard<ACE_Reverse_Lock<ACE_Lock> > + +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h index 00ca18315cf..65ce053c2ce 100644 --- a/TAO/tao/Transport.h +++ b/TAO/tao/Transport.h @@ -9,7 +9,6 @@ * Define the interface for the Transport component in TAO's * pluggable protocol framework. * - * * @author Fred Kuhns <fredk@cs.wustl.edu> */ //============================================================================= @@ -23,6 +22,8 @@ #include "Exception.h" #include "Transport_Descriptor_Interface.h" #include "Transport_Cache_Manager.h" +#include "Transport_Timer.h" +#include "ace/Strategies.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -36,10 +37,7 @@ class TAO_Wait_Strategy; class TAO_Connection_Handler; class TAO_Pluggable_Messaging; -#include "ace/Message_Queue.h" -#include "ace/Strategies.h" - -typedef ACE_Message_Queue<ACE_NULL_SYNCH> TAO_Transport_Buffering_Queue; +class TAO_Queued_Message; class TAO_Export TAO_Synch_Refcountable : private ACE_Refcountable { @@ -52,12 +50,11 @@ public: int refcount (void) const; protected: - TAO_Synch_Refcountable (ACE_Lock *lock, int refcount); + TAO_Synch_Refcountable (int refcount); - ACE_Lock *refcount_lock_; + TAO_SYNCH_MUTEX mutex_; }; - /** * @class TAO_Transport * @@ -95,10 +92,10 @@ protected: * transport may already be sending another message in a reactive * fashion. * - * Consequently, the Transport must also keep a - * <TT>current_message</TT>, if the current message is not null any - * new messages must be queued. Only once the current message is - * completely sent we can take a message out of the queue. + * Consequently, the Transport must also know if the head of the queue + * has been partially sent. In that case new messages can only follow + * the head. Only once the head is completely sent we can start + * sending new messages. * * <H4>Waiting threads:</H4> One or more threads can be blocked * waiting for the connection to completely send the message. @@ -146,11 +143,6 @@ protected: */ class TAO_Export TAO_Transport : private TAO_Synch_Refcountable { - - friend class TAO_Transport_Sync_Strategy; - friend class TAO_Eager_Buffering_Sync_Strategy; - friend class TAO_Delayed_Buffering_Sync_Strategy; - public: /// default creator, requres the tag value be supplied. TAO_Transport (CORBA::ULong tag, @@ -193,26 +185,8 @@ public: */ TAO_Wait_Strategy *wait_strategy (void) const; - /// Send a request or queue it for later. - /** - * If the right policies are set queue the request for later. - * Otherwise, or if the queue size has reached the configured - * limits, start draining the queue. - * - * If any data is to be sent it blocks until the queue is completely - * drained. - * - * This method serializes on handler_lock_, guaranteeing that only - * thread can execute it on the same instance concurrently. - * - * @todo: this routine will probably go away as part of the - * reorganization to support non-blocking writes. - */ - // @@ lockme - ssize_t send_or_buffer (TAO_Stub *stub, - int two_way, - const ACE_Message_Block *mblk, - const ACE_Time_Value *s = 0); + /// Callback method to reactively drain the outgoing data queue + int handle_output (void); /** * Return the TSS leader follower condition variable used in the @@ -221,21 +195,6 @@ public: */ virtual TAO_SYNCH_CONDITION *leader_follower_condition_variable (void); - /// Queue for buffering transport messages. - virtual TAO_Transport_Buffering_Queue &buffering_queue (void); - - /// Timer id associated with buffering. - long buffering_timer_id (void) const; - void buffering_timer_id (long); - - /// Timeout value associated with buffering. - const ACE_Time_Value &buffering_timeout_value (void) const; - void buffering_timeout_value (const ACE_Time_Value &time); - - /// Send any messages that have been buffered. - // @@ lockme - ssize_t send_buffered_messages (const ACE_Time_Value *max_wait_time = 0); - /** * Initialising the messaging object. This would be used by the * connector side. On the acceptor side the connection handler @@ -252,7 +211,8 @@ public: /** * Called by the cache when the cache is closing in order to fill * in a handle_set in a lock-safe manner. - * @param handle_set the ACE_Handle_Set into which the transport should place any handle registered with the reactor + * @param handle_set the ACE_Handle_Set into which the transport + * should place any handle registered with the reactor */ void provide_handle (ACE_Handle_Set &handle_set); @@ -267,6 +227,12 @@ public: */ void dequeue_all (void); + /// Check if there are messages pending in the queue + /** + * @return 1 if the queue is empty + */ + int queue_is_empty (void); + /// Register the handler with the reactor. /** * This method is used by the Wait_On_Reactor strategy. The @@ -340,9 +306,9 @@ public: * down). In that case, it returns -1 and sets errno to * <code>ENOENT</code>. */ - ssize_t send (const ACE_Message_Block *mblk, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0); + ssize_t send (iovec *iov, int iovcnt, + size_t &bytes_transferred, + const ACE_Time_Value *timeout = 0); /// Read len bytes from into buf. /** @@ -433,9 +399,9 @@ protected: * bytes already on the OS I/O subsystem. * */ - virtual ssize_t send_i (const ACE_Message_Block *mblk, - const ACE_Time_Value *timeout = 0, - size_t *bytes_transferred = 0) = 0; + virtual ssize_t send_i (iovec *iov, int iovcnt, + size_t &bytes_transferred, + const ACE_Time_Value *timeout = 0) = 0; // Read len bytes from into buf. /** @@ -491,7 +457,7 @@ public: virtual int send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, TAO_OutputCDR &stream, - int twoway, + int is_synchronous, ACE_Time_Value *max_time_wait) = 0; @@ -509,7 +475,7 @@ public: // @@ lockme virtual int send_message (TAO_OutputCDR &stream, TAO_Stub *stub = 0, - int twoway = 1, + int is_synchronous = 1, ACE_Time_Value *max_time_wait = 0) = 0; /// Callback to read incoming data @@ -568,8 +534,6 @@ public: */ virtual int reactor_signalling (void); - //@} - /// Method for the connection handler to signify that it /// is being closed and destroyed. virtual void connection_handler_closing (void); @@ -577,14 +541,18 @@ public: /// Register the associated connection handler with the reactor /// for a timer. /** - * At this point, only <code>TAO_Eager_Buffering_Sync_Strategy::timer_check()</code> - * uses this, and it's unclear whether it needs to stay around. But, it's here - * because it uses the associated protocol-specific connection handler, and accesses - * to that must be serialized on the internal lock. - * - * @param arg argument passed to the handle_timeout() method of the event handler + * At this point, only + * <code>TAO_Eager_Buffering_Sync_Strategy::timer_check()</code> + * uses this, and it's unclear whether it needs to stay around. + * But, it's here because it uses the associated protocol-specific + * connection handler, and accesses to that must be serialized on + * the internal lock. + * + * @param arg argument passed to the handle_timeout() method of the + * event handler * @param delay time interval after which the timer will expire - * @param interval time interval after which the timer will be automatically rescheduled + * @param interval time interval after which the timer will be + * automatically rescheduled * @return -1 on failure, a Reactor timer_id value on success * * @see ACE_Reactor::schedule_timer() @@ -594,7 +562,6 @@ public: const ACE_Time_Value &delay, const ACE_Time_Value &interval = ACE_Time_Value::zero); - // Maintain reference counting with these static TAO_Transport* _duplicate (TAO_Transport* transport); static void release (TAO_Transport* transport); @@ -603,34 +570,145 @@ public: int recache_transport (TAO_Transport_Descriptor_Interface* desc); /// Set/Get the Cache Map entry - void cache_map_entry ( - TAO_Transport_Cache_Manager::HASH_MAP_ENTRY *entry); + void cache_map_entry (TAO_Transport_Cache_Manager::HASH_MAP_ENTRY *entry); + TAO_Transport_Cache_Manager::HASH_MAP_ENTRY *cache_map_entry (void); + + /// Send a message block chain, + int send_message_block_chain (const ACE_Message_Block *message_block, + size_t &bytes_transferred, + ACE_Time_Value *max_wait_time = 0); + /// Sent the contents of <message_block> + /** + * @todo This method name sucks, but send_message() was already + * taken by other silly methods! + * + * @param stub The object reference used for this operation, useful + * to obtain the current policies. + * @param is_synchronous If set this method will block until the + * operation is completely written on the wire + * @param message_block The CDR encapsulation of the GIOP message + * that must be sent. The message may consist of + * multiple Message Blocks chained through the cont() + * field. + * @param max_wait_time The maximum time that the operation can + * block, used in the implementation of timeouts. + * + */ + /// the twoway flag or by the current policies in the stub. + int send_message_i (TAO_Stub *stub, + int is_synchronous, + const ACE_Message_Block *message_block, + ACE_Time_Value *max_wait_time); + + /// Send a message block chain, assuming the lock is held + int send_message_block_chain_i (const ACE_Message_Block *message_block, + size_t &bytes_transferred, + ACE_Time_Value *max_wait_time); + /// Cache management void mark_invalid (void); + /// Cache management int make_idle (void); -protected: - // @@ see if one of these calls send_message() - /// Remove the first message from the outgoing queue. - void dequeue_head (void); + /// The timeout callback, invoked when any of the timers related to + /// this transport expire. + /** + * @param current_time The current time as reported from the Reactor + * @param act The Asynchronous Completion Token. Currently it is + * interpreted as follows: + * - If the ACT is the address of this->current_deadline_ the + * queueing timeout has expired and the queue should start + * flushing. + * + * @return Returns 0 if there are no problems, -1 if there is an + * error + * + * @todo In the future this function could be used to expire + * messages (oneways) that have been sitting for too long on + * the queue. + */ + int handle_timeout (const ACE_Time_Value ¤t_time, + const void* act); - /// Update the state of the outgoing queue, assuming that - /// bytes_delivered bytes have been sent already. - void reset_queued_message (ACE_Message_Block *message_block, - size_t bytes_delivered); +private: + /// Send some of the data in the queue. + /** + * As the outgoing data is drained this method is invoked to send as + * much of the current message as possible. + * + * Returns 0 if there is more data to send, -1 if there was an error + * and 1 if the message was completely sent. + */ + int drain_queue (void); - /// Update the state of the outgoing queue, this time a complete - /// message was sent. - void reset_sent_message (ACE_Message_Block *message_block, - size_t bytes_delivered); + /// Implement drain_queue() assuming the lock is held + int drain_queue_i (void); - /// Helper function used to implement the two methods above. - void reset_message (ACE_Message_Block *message_block, - size_t bytes_delivered, - int queued_message); + /// This class needs priviledged access to + /// - queue_is_empty_i() + /// - drain_queue_i() + friend class TAO_Block_Flushing_Strategy; + + /// Check if there are messages pending in the queue + /** + * This version assumes that the lock is already held. Use with + * care! + * + * @return 1 if the queue is empty + */ + int queue_is_empty_i (void); + + /// A helper routine used in drain_queue_i() + int drain_queue_helper (int &iovcnt, iovec iov[]); + + /// This class needs privileged access to: + /// - schedule_output_i() + /// - cancel_output_i() + friend class TAO_Reactive_Flushing_Strategy; + + /// Schedule handle_output() callbacks + int schedule_output_i (void); + + /// Cancel handle_output() callbacks + int cancel_output_i (void); + + /// Cleanup the queue. + /** + * Exactly <byte_count> bytes have been sent, the queue must be + * cleaned up as potentially several messages have been completely + * sent out. + * It leaves on head_ the next message to send out. + */ + void cleanup_queue (size_t byte_count); + + /// Copy the contents of a message block into a Queued_Message + /// TAO_Queued_Message *copy_message_block (const ACE_Message_Block *mb); + + /// Check if the buffering constraints have been reached + int check_buffering_constraints_i (TAO_Stub *stub, int &must_flush); + + /// Send a synchronous message, i.e. block until the message is on + /// the wire + int send_synchronous_message_i (const ACE_Message_Block *message_block, + ACE_Time_Value *max_wait_time); + + /// Check if the flush timer is still pending + int flush_timer_pending (void) const; + + /// The flush timer expired or was explicitly cancelled, mark it as + /// not pending + void reset_flush_timer (void); + + /// Check if the underlying event handler is still valid. + /** + * @return Returns -1 if not, 0 if it is. + */ + int check_event_handler_i (const char *caller); + + /// Print out error messages if the event handler is not valid + void report_invalid_event_handler (const char *caller); -private: /// Prohibited ACE_UNIMPLEMENTED_FUNC (TAO_Transport (const TAO_Transport&)) ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Transport&)) @@ -653,15 +731,6 @@ protected: /// Strategy for waiting for the reply after sending the request. TAO_Wait_Strategy *ws_; - /// Queue for buffering transport messages. - TAO_Transport_Buffering_Queue *buffering_queue_; - - /// Buffering timer id. - long buffering_timer_id_; - - /// Buffering timeout value. - ACE_Time_Value buffering_timeout_value_; - /// Use to check if bidirectional info has been synchronized with /// the peer. /** @@ -683,6 +752,20 @@ protected: */ int bidirectional_flag_; + /// Implement the outgoing data queue + TAO_Queued_Message *head_; + TAO_Queued_Message *tail_; + + /// The queue will start draining no later than <queing_deadline_> + /// *if* the deadline is + ACE_Time_Value current_deadline_; + + /// The timer ID + long flush_timer_id_; + + /// The adapter used to receive timeout callbacks from the Reactor + TAO_Transport_Timer transport_timer_; + /// Lock that insures that activities that *might* use handler-related /// resources (such as a connection handler) get serialized. /** diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl index 48cbed6c5ac..48fac8f557c 100644 --- a/TAO/tao/Transport.inl +++ b/TAO/tao/Transport.inl @@ -1,7 +1,10 @@ // $Id$ - - +ACE_INLINE CORBA::ULong +TAO_Transport::tag (void) const +{ + return this->tag_; +} ACE_INLINE TAO_ORB_Core * TAO_Transport::orb_core (void) const @@ -22,97 +25,55 @@ TAO_Transport::wait_strategy (void) const return this->ws_; } -ACE_INLINE CORBA::ULong -TAO_Transport::tag (void) const -{ - return this->tag_; -} - -ACE_INLINE long -TAO_Transport::buffering_timer_id (void) const -{ - return this->buffering_timer_id_; -} - -ACE_INLINE void -TAO_Transport::buffering_timer_id (long new_value) -{ - this->buffering_timer_id_ = new_value; -} - -ACE_INLINE const ACE_Time_Value & -TAO_Transport::buffering_timeout_value (void) const +ACE_INLINE int +TAO_Transport::bidirectional_flag (void) const { - return this->buffering_timeout_value_; + return this->bidirectional_flag_; } ACE_INLINE void -TAO_Transport::buffering_timeout_value (const ACE_Time_Value &new_value) +TAO_Transport::bidirectional_flag (int flag) { - this->buffering_timeout_value_ = new_value; + this->bidirectional_flag_ = flag; } -ACE_INLINE TAO_Transport_Buffering_Queue & -TAO_Transport::buffering_queue (void) +/*ACE_INLINE TAO_Transport_Cache_Manager::HASH_MAP_ENTRY * +TAO_Transport::cache_map_entry (void) { - if (this->buffering_queue_ == 0) - { - // Infinite high water mark: ACE_UINT32_MAX. - this->buffering_queue_ = - new TAO_Transport_Buffering_Queue (ACE_UINT32_MAX); - } - - return *this->buffering_queue_; + return this->cache_map_entry_; } +*/ ACE_INLINE void -TAO_Transport::dequeue_head (void) +TAO_Transport::cache_map_entry ( + TAO_Transport_Cache_Manager::HASH_MAP_ENTRY *entry) { - // Remove from the head of the queue. - ACE_Message_Block *message_block = 0; - int result = this->buffering_queue_->dequeue_head (message_block); - - // @@ What to do here on failures? - ACE_ASSERT (result != -1); - ACE_UNUSED_ARG (result); - - // Release the memory. - message_block->release (); + this->cache_map_entry_ = entry; } ACE_INLINE int -TAO_Transport::bidirectional_flag (void) const +TAO_Transport::flush_timer_pending (void) const { - return this->bidirectional_flag_; + return this->flush_timer_id_ != -1; } ACE_INLINE void -TAO_Transport::bidirectional_flag (int flag) +TAO_Transport::reset_flush_timer (void) { - this->bidirectional_flag_ = flag; + this->flush_timer_id_ = -1; + this->current_deadline_ = ACE_Time_Value::zero; } -ACE_INLINE void -TAO_Transport::dequeue_all (void) +ACE_INLINE int +TAO_Transport::check_event_handler_i (const char *caller) { - // Flush all queued messages. - if (this->buffering_queue_) + // if there's no associated event handler, then we act like a null + // transport + if (this->event_handler_i () == 0) { - while (!this->buffering_queue_->is_empty ()) - this->dequeue_head (); + this->report_invalid_event_handler (caller); + errno = ENOENT; + return -1; } -} - -/*ACE_INLINE TAO_Transport_Cache_Manager::HASH_MAP_ENTRY * -TAO_Transport::cache_map_entry (void) -{ - return this->cache_map_entry_; -} -*/ - -ACE_INLINE void -TAO_Transport::cache_map_entry ( - TAO_Transport_Cache_Manager::HASH_MAP_ENTRY *entry) -{ - this->cache_map_entry_ = entry; + return 0; } diff --git a/TAO/tao/Transport_Timer.cpp b/TAO/tao/Transport_Timer.cpp new file mode 100644 index 00000000000..709a98414c8 --- /dev/null +++ b/TAO/tao/Transport_Timer.cpp @@ -0,0 +1,19 @@ +// -*- C++ -*- +// $Id$ + +#include "Transport_Timer.h" +#include "Transport.h" + +ACE_RCSID(tao, Transport_Timer, "$Id$") + +TAO_Transport_Timer::TAO_Transport_Timer (TAO_Transport *transport) + : transport_ (transport) +{ +} + +int +TAO_Transport_Timer::handle_timeout (const ACE_Time_Value ¤t_time, + const void *act) +{ + return this->transport_->handle_timeout (current_time, act); +} diff --git a/TAO/tao/Transport_Timer.h b/TAO/tao/Transport_Timer.h new file mode 100644 index 00000000000..e1e2d7b070c --- /dev/null +++ b/TAO/tao/Transport_Timer.h @@ -0,0 +1,54 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file Transport_Timer.h + * + * $Id$ + * + * @author Carlos O'Ryan <coryan@uci.edu> + */ +//============================================================================= + +#ifndef TAO_TRANSPORT_TIMER_H +#define TAO_TRANSPORT_TIMER_H +#include "ace/pre.h" + +#include "TAO_Export.h" +#include "ace/Event_Handler.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class TAO_Transport; + +/** + * @class TAO_Transport_Timer + * + * @brief Allows TAO_Transport instances to receive timeout + * notifications from the Reactor. In other words, implements + * the Adapter Role, of the Adapter Pattern, where the Adaptee + * is a TAO_Transport and the client is the Reactor. + * + */ +class TAO_Export TAO_Transport_Timer : public ACE_Event_Handler +{ +public: + /// Constructor + /** + * @param transport The adaptee + */ + TAO_Transport_Timer (TAO_Transport *transport); + + /// Receive timeout events from the Reactor and forward them to the + /// TAO_Transport + virtual int handle_timeout (const ACE_Time_Value ¤t_time, + const void *act); +private: + /// The Adaptee + TAO_Transport *transport_; +}; + +#include "ace/post.h" +#endif /* TAO_TRANSPORT_TIMER_H */ diff --git a/TAO/tao/TypeCodeFactory/Makefile b/TAO/tao/TypeCodeFactory/Makefile index bfd1598b3eb..ccac91f0ecd 100644 --- a/TAO/tao/TypeCodeFactory/Makefile +++ b/TAO/tao/TypeCodeFactory/Makefile @@ -190,15 +190,6 @@ realclean: clean $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ TypeCodeFactoryC.inl \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Managed_Types.h \ - $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/RequestInfo_Util.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -206,9 +197,18 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/DynamicC.i .obj/TypeCodeFactory_i.o .obj/TypeCodeFactory_i.so .shobj/TypeCodeFactory_i.o .shobj/TypeCodeFactory_i.so: TypeCodeFactory_i.cpp TypeCodeFactory_i.h \ @@ -381,7 +381,6 @@ realclean: clean $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ @@ -417,14 +416,12 @@ realclean: clean $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ @@ -468,6 +465,7 @@ realclean: clean $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -520,7 +518,6 @@ realclean: clean TypeCodeFactory_Adapter_Impl.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/TypeCodeFactory_Adapter.h \ - $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ @@ -616,9 +613,6 @@ realclean: clean $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -628,6 +622,8 @@ realclean: clean $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -644,6 +640,8 @@ realclean: clean $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ TypeCodeFactory_i.h TypeCodeFactory_Loader.h \ $(TAO_ROOT)/tao/Object_Loader.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Object_Loader.i \ TypeCodeFactoryC.h \ $(TAO_ROOT)/tao/Object.h \ @@ -676,15 +674,14 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -710,14 +707,12 @@ realclean: clean $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ @@ -761,6 +756,7 @@ realclean: clean $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp index 4f18da08b86..a74f2521c72 100644 --- a/TAO/tao/default_client.cpp +++ b/TAO/tao/default_client.cpp @@ -195,12 +195,6 @@ TAO_Default_Client_Strategy_Factory::create_wait_strategy (TAO_Transport *transp return ws; } -int -TAO_Default_Client_Strategy_Factory::allow_callback (void) -{ - return (this->wait_strategy_ != TAO_WAIT_ON_READ); -} - ACE_Lock * TAO_Default_Client_Strategy_Factory::create_ft_service_retention_id_lock (void) { diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h index 266a5c6310e..c67562af488 100644 --- a/TAO/tao/default_client.h +++ b/TAO/tao/default_client.h @@ -50,10 +50,9 @@ public: // = Check Client_Strategy_Factory.h for the documentation of the // following methods. - virtual ACE_Lock* create_profile_lock (void); - virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_Transport *transport); - virtual int allow_callback (void); - virtual TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport); + ACE_Lock* create_profile_lock (void); + TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_Transport *transport); + TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport); virtual ACE_Lock *create_ft_service_retention_id_lock (void); private: diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 2a74726468b..11232cc1182 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -11,6 +11,9 @@ #include "tao/Single_Reactor.h" #include "tao/Priority_Mapping.h" +#include "tao/Reactive_Flushing_Strategy.h" +#include "tao/Block_Flushing_Strategy.h" + #include "ace/TP_Reactor.h" #include "ace/Dynamic_Service.h" #include "ace/Arg_Shifter.h" @@ -33,6 +36,7 @@ TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void) reactor_mask_signals_ (1), dynamically_allocated_reactor_ (0), cached_connection_lock_type_ (TAO_THREAD_LOCK) + , flushing_strategy_type_ (TAO_REACTIVE_FLUSHING) { } @@ -194,6 +198,7 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) this->add_to_ior_parser_names (argv[curarg]); } } + else if (ACE_OS::strcasecmp (argv[curarg], "-ORBConnectionCacheLock") == 0) { @@ -210,6 +215,7 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) this->cached_connection_lock_type_ = TAO_NULL_LOCK; } } + else if (ACE_OS::strcasecmp (argv[curarg], "-ORBConnectionLock") == 0) { @@ -230,6 +236,7 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) this->cached_connection_lock_type_ = TAO_NULL_LOCK; } } + else if (ACE_OS::strcasecmp (argv[curarg], "-ORBConnectorLock") == 0) { @@ -251,6 +258,23 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) } } + else if (ACE_OS::strcasecmp (argv[curarg], + "-ORBFlushingStrategy") == 0) + { + curarg++; + if (curarg < argc) + { + char *name = argv[curarg]; + + if (ACE_OS::strcasecmp (name, + "reactive") == 0) + this->flushing_strategy_type_ = TAO_REACTIVE_FLUSHING; + else if (ACE_OS::strcasecmp (name, + "blocking") == 0) + this->flushing_strategy_type_ = TAO_BLOCKING_FLUSHING; + } + } + return 0; } @@ -705,6 +729,21 @@ TAO_Default_Resource_Factory::create_cached_connection_lock (void) return the_lock; } +TAO_Flushing_Strategy * +TAO_Default_Resource_Factory::create_flushing_strategy (void) +{ + TAO_Flushing_Strategy *strategy = 0; + if (this->flushing_strategy_type_ == TAO_REACTIVE_FLUSHING) + ACE_NEW_RETURN (strategy, + TAO_Reactive_Flushing_Strategy, + 0); + else + ACE_NEW_RETURN (strategy, + TAO_Block_Flushing_Strategy, + 0); + return strategy; +} + TAO_Priority_Mapping * TAO_Default_Resource_Factory::get_priority_mapping (void) { diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h index 9df0760d36b..a976e5b285b 100644 --- a/TAO/tao/default_resource.h +++ b/TAO/tao/default_resource.h @@ -6,7 +6,8 @@ * * $Id$ * - * @author Chris CleelandCarlos O'Ryan + * @author Chris Cleeland + * @author Carlos O'Ryan */ //============================================================================= @@ -92,6 +93,7 @@ public: virtual double purge_percentage (void) const; virtual TAO_Priority_Mapping *get_priority_mapping (void); virtual ACE_Lock *create_cached_connection_lock (void); + virtual TAO_Flushing_Strategy *create_flushing_strategy (void); protected: /// Obtain the reactor implementation @@ -162,6 +164,15 @@ private: /// Type of lock used by the cached connector. Lock_Type cached_connection_lock_type_; + + enum Flushing_Strategy_Type + { + TAO_REACTIVE_FLUSHING, + TAO_BLOCKING_FLUSHING + }; + + /// Type of flushing strategy configured + int flushing_strategy_type_; }; #if defined (__ACE_INLINE__) diff --git a/TAO/tests/AMI/exclusive.conf b/TAO/tests/AMI/exclusive.conf index c78e5018593..b269154099f 100644 --- a/TAO/tests/AMI/exclusive.conf +++ b/TAO/tests/AMI/exclusive.conf @@ -1,2 +1,2 @@ -static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBiiopprofilelock null -ORBclientconnectionhandler ST" +static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBclientconnectionhandler ST" diff --git a/TAO/tests/AMI/muxed.conf b/TAO/tests/AMI/muxed.conf index 97bca811c1b..a7f2f5f608a 100644 --- a/TAO/tests/AMI/muxed.conf +++ b/TAO/tests/AMI/muxed.conf @@ -1,2 +1,2 @@ -static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED -ORBiiopprofilelock null -ORBclientconnectionhandler ST" +static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED -ORBProfileLock null -ORBClientConnectionHandler ST" diff --git a/TAO/tests/AMI/run_test.pl b/TAO/tests/AMI/run_test.pl index e1f43afa343..c4643c52be9 100755 --- a/TAO/tests/AMI/run_test.pl +++ b/TAO/tests/AMI/run_test.pl @@ -34,7 +34,7 @@ $SV = new PerlACE::Process ("server", $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp new file mode 100644 index 00000000000..79a75408078 --- /dev/null +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp @@ -0,0 +1,41 @@ +// +// $Id$ +// +#include "AMI_Buffering.h" + +ACE_RCSID(AMI_Buffering, AMI_Buffering, "$Id$") + +AMI_Buffering::AMI_Buffering (CORBA::ORB_ptr orb, + Test::AMI_Buffering_Admin_ptr admin) + : orb_ (CORBA::ORB::_duplicate (orb)) + , admin_ (Test::AMI_Buffering_Admin::_duplicate (admin)) +{ +} + +void +AMI_Buffering::receive_data (const Test::Payload &the_payload, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->admin_->request_received (the_payload.length (), ACE_TRY_ENV); +} + +void +AMI_Buffering::flush (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ +} + +void +AMI_Buffering::sync (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->admin_->flush (ACE_TRY_ENV); +} + +void +AMI_Buffering::shutdown (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->orb_->shutdown (0, ACE_TRY_ENV); +} diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.dsw b/TAO/tests/AMI_Buffering/AMI_Buffering.dsw new file mode 100644 index 00000000000..68c39e32788 --- /dev/null +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.dsw @@ -0,0 +1,53 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "AMI_Buffering Admin"=.\admin.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "AMI_Buffering Client"=.\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "AMI_Buffering Server"=.\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.h b/TAO/tests/AMI_Buffering/AMI_Buffering.h new file mode 100644 index 00000000000..d3f672a97ba --- /dev/null +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.h @@ -0,0 +1,55 @@ +// +// $Id$ +// + +#ifndef AMI_BUFFERING_H +#define AMI_BUFFERING_H +#include "ace/pre.h" + +#include "TestS.h" + +#if defined (_MSC_VER) +# if (_MSC_VER >= 1200) +# pragma warning(push) +# endif /* _MSC_VER >= 1200 */ +# pragma warning (disable:4250) +#endif /* _MSC_VER */ + +/// Implement the Test::AMI_Buffering interface +class AMI_Buffering + : public virtual POA_Test::AMI_Buffering + , public virtual PortableServer::RefCountServantBase +{ +public: + /// Constructor + AMI_Buffering (CORBA::ORB_ptr orb, + Test::AMI_Buffering_Admin_ptr admin); + + // = The skeleton methods + virtual void receive_data (const Test::Payload &the_payload, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual void flush (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual void sync (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + /// Use an ORB reference to shutdown the application. + CORBA::ORB_var orb_; + + /// Report request progress to this interface + Test::AMI_Buffering_Admin_var admin_; +}; + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +# pragma warning(pop) +#endif /* _MSC_VER */ + +#include "ace/post.h" +#endif /* AMI_BUFFERING_H */ diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp new file mode 100644 index 00000000000..241e3d0b325 --- /dev/null +++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp @@ -0,0 +1,49 @@ +// +// $Id$ +// +#include "AMI_Buffering_Admin.h" + +ACE_RCSID(AMI_Buffering, AMI_Buffering_Admin, "$Id$") + +AMI_Buffering_Admin::AMI_Buffering_Admin (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) + , request_count_ (0) + , bytes_received_count_ (0) +{ +} + +CORBA::ULong +AMI_Buffering_Admin::request_count (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return this->request_count_; +} + +CORBA::ULong +AMI_Buffering_Admin::bytes_received_count (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return this->bytes_received_count_; +} + +void +AMI_Buffering_Admin::request_received (CORBA::ULong payload_length, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->request_count_++; + this->bytes_received_count_ += payload_length; +} + +void +AMI_Buffering_Admin::flush (CORBA::Environment &) + ACE_THROW_SPEC (()) +{ +} + +void +AMI_Buffering_Admin::shutdown (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->orb_->shutdown (0, ACE_TRY_ENV); +} diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h new file mode 100644 index 00000000000..c586a32d8e0 --- /dev/null +++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h @@ -0,0 +1,60 @@ +// +// $Id$ +// + +#ifndef AMI_BUFFERING_ADMIN_H +#define AMI_BUFFERING_ADMIN_H +#include "ace/pre.h" + +#include "TestS.h" + +#if defined (_MSC_VER) +# if (_MSC_VER >= 1200) +# pragma warning(push) +# endif /* _MSC_VER >= 1200 */ +# pragma warning (disable:4250) +#endif /* _MSC_VER */ + +/// Implement the Test::AMI_Buffering_Admin interface +class AMI_Buffering_Admin + : public virtual POA_Test::AMI_Buffering_Admin + , public virtual PortableServer::RefCountServantBase +{ +public: + /// Constructor + AMI_Buffering_Admin (CORBA::ORB_ptr orb); + + // = The skeleton methods + virtual CORBA::ULong request_count (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::ULong bytes_received_count (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual void request_received (CORBA::ULong payload_length, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual void flush (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC (()); + + virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + /// Use an ORB reference to shutdown the application. + CORBA::ORB_var orb_; + + /// Keep track of the number of requests received + CORBA::ULong request_count_; + + /// Keep track of the number of requests received + CORBA::ULong bytes_received_count_; +}; + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +# pragma warning(pop) +#endif /* _MSC_VER */ + +#include "ace/post.h" +#endif /* AMI_BUFFERING_H */ diff --git a/TAO/tests/AMI_Buffering/Client_Task.cpp b/TAO/tests/AMI_Buffering/Client_Task.cpp new file mode 100644 index 00000000000..3c74d4aa262 --- /dev/null +++ b/TAO/tests/AMI_Buffering/Client_Task.cpp @@ -0,0 +1,48 @@ +// +// $Id$ +// + +#include "Client_Task.h" + +ACE_RCSID(AMI_Buffering, Client_Task, "$Id$") + +Client_Task::Client_Task (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) + , terminate_loop_ (0) +{ +} + +void +Client_Task::terminate_loop (void) +{ + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); + this->terminate_loop_ = 1; +} + +int +Client_Task::svc (void) +{ + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); + ACE_DECLARE_NEW_CORBA_ENV; + ACE_TRY + { + while (1) + { + // run the even loop for 1 second... + ACE_Time_Value tv (1, 0); + this->orb_->run (tv, ACE_TRY_ENV); + ACE_TRY_CHECK; + + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, -1); + if (this->terminate_loop_ != 0) + break; + } + } + ACE_CATCHANY + { + return -1; + } + ACE_ENDTRY; + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n")); + return 0; +} diff --git a/TAO/tests/AMI_Buffering/Client_Task.h b/TAO/tests/AMI_Buffering/Client_Task.h new file mode 100644 index 00000000000..1e41e68bdc9 --- /dev/null +++ b/TAO/tests/AMI_Buffering/Client_Task.h @@ -0,0 +1,42 @@ +// +// $Id$ +// + +#ifndef AMI_BUFFERING_CLIENT_TASK_H +#define AMI_BUFFERING_CLIENT_TASK_H +#include "ace/pre.h" + +#include "tao/corba.h" +#include "ace/Task.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +/// Implement a Task to run the experiments using multiple threads. +class Client_Task : public ACE_Task_Base +{ +public: + /// Constructor + Client_Task (CORBA::ORB_ptr orb); + + /// Terminate the loop + void terminate_loop (void); + + /// Thread entry point + int svc (void); + +private: + /// Reference to the ORB + CORBA::ORB_var orb_; + + /// A mutex, synchronize access to the termination flag + TAO_SYNCH_MUTEX mutex_; + + /// Termination flag, set to 1 when the client wants this task to + /// exit + int terminate_loop_; +}; + +#include "ace/post.h" +#endif /* AMI_BUFFERING_CLIENT_TASK_H */ diff --git a/TAO/tests/AMI_Buffering/Makefile b/TAO/tests/AMI_Buffering/Makefile new file mode 100644 index 00000000000..11a0556d9f3 --- /dev/null +++ b/TAO/tests/AMI_Buffering/Makefile @@ -0,0 +1,3218 @@ +#---------------------------------------------------------------------------- +# +# $Id$ +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +ifndef TAO_ROOT + TAO_ROOT = $(ACE_ROOT)/TAO +endif # ! TAO_ROOT + +IDL_FILES = Test +IDL_SRC = TestC.cpp TestS.cpp +BIN_UNCHECKED = admin server client + +SRC = $(addsuffix .cpp, \ + $(BIN_UNCHECKED) \ + Reply_Handler \ + Client_Task \ + AMI_Buffering \ + AMI_Buffering_Admin) $(IDL_SRC) + +CLIENT_OBJS = client.o Reply_Handler.o Client_Task.o $(IDL_SRC:.cpp=.o) +SERVER_OBJS = server.o AMI_Buffering.o $(IDL_SRC:.cpp=.o) +ADMIN_OBJS = admin.o AMI_Buffering_Admin.o $(IDL_SRC:.cpp=.o) + +TAO_IDLFLAGS += -Ge 1 -GC +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(TAO_ROOT)/rules.tao.GNU + +ifeq ($(corba_messaging),1) +BIN=$(BIN_UNCHECKED) +endif # corba_messaging + +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +include $(TAO_ROOT)/taoconfig.mk + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- + +.PRECIOUS: $(foreach ext, $(IDL_EXT), Test$(ext)) + +server: $(addprefix $(VDIR),$(SERVER_OBJS)) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) + +admin: $(addprefix $(VDIR),$(ADMIN_OBJS)) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) + +client: $(addprefix $(VDIR),$(CLIENT_OBJS)) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) + +realclean: clean + -$(RM) $(foreach ext, $(IDL_EXT), Test$(ext)) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/admin.o .obj/admin.o .obj/admin.o .obj/admin.o: admin.cpp AMI_Buffering_Admin.h \ + $(ACE_ROOT)/ace/pre.h \ + TestS.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.i \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Transport.h \ + $(TAO_ROOT)/tao/Transport_Timer.h \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(TAO_ROOT)/tao/Transport.inl \ + $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \ + $(TAO_ROOT)/tao/Messaging.h \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.i \ + TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + TestC.i TestS_T.h TestS_T.i TestS_T.cpp TestS.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i + +.obj/server.o .obj/server.o .obj/server.o .obj/server.o: server.cpp AMI_Buffering.h \ + $(ACE_ROOT)/ace/pre.h \ + TestS.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.i \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Transport.h \ + $(TAO_ROOT)/tao/Transport_Timer.h \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(TAO_ROOT)/tao/Transport.inl \ + $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \ + $(TAO_ROOT)/tao/Messaging.h \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.i \ + TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + TestC.i TestS_T.h TestS_T.i TestS_T.cpp TestS.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i + +.obj/client.o .obj/client.o .obj/client.o .obj/client.o: client.cpp Reply_Handler.h \ + $(ACE_ROOT)/ace/pre.h \ + TestS.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.i \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Transport.h \ + $(TAO_ROOT)/tao/Transport_Timer.h \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(TAO_ROOT)/tao/Transport.inl \ + $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \ + $(TAO_ROOT)/tao/Messaging.h \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.i \ + TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + TestC.i TestS_T.h TestS_T.i TestS_T.cpp TestS.i Client_Task.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i + +.obj/Reply_Handler.o .obj/Reply_Handler.o .obj/Reply_Handler.o .obj/Reply_Handler.o: Reply_Handler.cpp Reply_Handler.h \ + $(ACE_ROOT)/ace/pre.h \ + TestS.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.i \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Transport.h \ + $(TAO_ROOT)/tao/Transport_Timer.h \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(TAO_ROOT)/tao/Transport.inl \ + $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \ + $(TAO_ROOT)/tao/Messaging.h \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.i \ + TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + TestC.i TestS_T.h TestS_T.i TestS_T.cpp TestS.i + +.obj/Client_Task.o .obj/Client_Task.o .obj/Client_Task.o .obj/Client_Task.o: Client_Task.cpp Client_Task.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp + +.obj/AMI_Buffering.o .obj/AMI_Buffering.o .obj/AMI_Buffering.o .obj/AMI_Buffering.o: AMI_Buffering.cpp AMI_Buffering.h \ + $(ACE_ROOT)/ace/pre.h \ + TestS.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.i \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Transport.h \ + $(TAO_ROOT)/tao/Transport_Timer.h \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(TAO_ROOT)/tao/Transport.inl \ + $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \ + $(TAO_ROOT)/tao/Messaging.h \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.i \ + TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + TestC.i TestS_T.h TestS_T.i TestS_T.cpp TestS.i + +.obj/AMI_Buffering_Admin.o .obj/AMI_Buffering_Admin.o .obj/AMI_Buffering_Admin.o .obj/AMI_Buffering_Admin.o: AMI_Buffering_Admin.cpp AMI_Buffering_Admin.h \ + $(ACE_ROOT)/ace/pre.h \ + TestS.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.i \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Transport.h \ + $(TAO_ROOT)/tao/Transport_Timer.h \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(TAO_ROOT)/tao/Transport.inl \ + $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \ + $(TAO_ROOT)/tao/Messaging.h \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.i \ + TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + TestC.i TestS_T.h TestS_T.i TestS_T.cpp TestS.i + +.obj/TestC.o .obj/TestC.o .obj/TestC.o .obj/TestC.o: TestC.cpp TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Messaging.h \ + $(TAO_ROOT)/tao/Asynch_Invocation.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Transport.h \ + $(TAO_ROOT)/tao/Transport_Timer.h \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(TAO_ROOT)/tao/Transport.inl \ + $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.i \ + TestC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/RequestInfo_Util.h + +.obj/TestS.o .obj/TestS.o .obj/TestS.o .obj/TestS.o: TestS.cpp TestS.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.i \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Transport.h \ + $(TAO_ROOT)/tao/Transport_Timer.h \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(TAO_ROOT)/tao/Transport.inl \ + $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \ + $(TAO_ROOT)/tao/Messaging.h \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.i \ + TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + TestC.i TestS_T.h TestS_T.i TestS_T.cpp TestS.i \ + $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ + $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ + $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ + $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ + $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ + $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/tao/RequestInfo_Util.h \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ + $(ACE_ROOT)/ace/Dynamic_Service.i \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/performance-tests/Throughput/Makefile.bor b/TAO/tests/AMI_Buffering/Makefile.bor index 19f31a4d882..ebf90391f43 100644 --- a/TAO/performance-tests/Throughput/Makefile.bor +++ b/TAO/tests/AMI_Buffering/Makefile.bor @@ -2,6 +2,6 @@ # $Id$ # -MAKEFILES = server.bor client.bor +MAKEFILES = admin.bor server.bor client.bor !include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/tests/AMI_Buffering/README b/TAO/tests/AMI_Buffering/README new file mode 100644 index 00000000000..7ab74c58127 --- /dev/null +++ b/TAO/tests/AMI_Buffering/README @@ -0,0 +1,32 @@ +/** + +@page AMI_Buffering Test README File + + A regression test for AMI buffering. The test verifies +that the TAO::BufferingConstraint policies are respected by the +ORB. Three separate tests are possible: + +- TAO::BUFFER_MESSAGE_COUNT: The buffer should not be flushed until + enough messages are in the queue. + +- TAO::BUFFER_TIMEOUT: The buffer should not be flushed unless the + specified interval has expired. + +- TAO::BUFFER_MESSAGE_BYTES: The buffer should not be flushed until + enough bytes are in the queue. + + To run the test use run_test.pl script: + +$ ./run_test.pl + + the nightly regression builds impose severe constraints on the +maximum time allowed for a single test. Three separate scripts are +used to stay within those bounds: + +$ ./run_message_count.pl +$ ./run_timeout.pl +$ ./run_message_bytes.pl + + each script returns 0 if the test was successful. + +*/ diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.cpp b/TAO/tests/AMI_Buffering/Reply_Handler.cpp new file mode 100644 index 00000000000..e82471f58be --- /dev/null +++ b/TAO/tests/AMI_Buffering/Reply_Handler.cpp @@ -0,0 +1,82 @@ +// +// $Id$ +// +#include "Reply_Handler.h" + +ACE_RCSID(AMI_Buffering, Reply_Handler, "$Id$") + +Reply_Handler::Reply_Handler (void) +{ +} + +void +Reply_Handler::receive_data (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ +} + +void +Reply_Handler::receive_data_excep (Test::AMI_AMI_BufferingExceptionHolder *holder, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + ACE_TRY + { + holder->raise_receive_data (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "receive_data: "); + } + ACE_ENDTRY; +} + +void +Reply_Handler::sync (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ +} + +void +Reply_Handler::sync_excep (Test::AMI_AMI_BufferingExceptionHolder *holder, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + ACE_TRY + { + holder->raise_sync (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "sync: "); + } + ACE_ENDTRY; +} + +void +Reply_Handler::shutdown (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ +} + +void +Reply_Handler::shutdown_excep (Test::AMI_AMI_BufferingExceptionHolder *holder, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + ACE_TRY + { + holder->raise_shutdown (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "shutdown: "); + } + ACE_ENDTRY; +} diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.h b/TAO/tests/AMI_Buffering/Reply_Handler.h new file mode 100644 index 00000000000..ee0d2665340 --- /dev/null +++ b/TAO/tests/AMI_Buffering/Reply_Handler.h @@ -0,0 +1,52 @@ +// +// $Id$ +// + +#ifndef REPLY_HANDLER_H +#define REPLY_HANDLER_H +#include "ace/pre.h" + +#include "TestS.h" + +#if defined (_MSC_VER) +# if (_MSC_VER >= 1200) +# pragma warning(push) +# endif /* _MSC_VER >= 1200 */ +# pragma warning (disable:4250) +#endif /* _MSC_VER */ + +/// Implement the AMI_AMI_BufferingHandler interface +class Reply_Handler + : public virtual POA_Test::AMI_AMI_BufferingHandler + , public virtual PortableServer::RefCountServantBase +{ +public: + /// Constructor + Reply_Handler (void); + + // = The skeleton methods + virtual void receive_data (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_data_excep (Test::AMI_AMI_BufferingExceptionHolder *holder, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual void sync (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void sync_excep (Test::AMI_AMI_BufferingExceptionHolder *holder, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown_excep (Test::AMI_AMI_BufferingExceptionHolder *holder, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); +}; + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +# pragma warning(pop) +#endif /* _MSC_VER */ + +#include "ace/post.h" +#endif /* REPLY_HANDLER_H */ diff --git a/TAO/tests/AMI_Buffering/Test.idl b/TAO/tests/AMI_Buffering/Test.idl new file mode 100644 index 00000000000..5c757ea0a1b --- /dev/null +++ b/TAO/tests/AMI_Buffering/Test.idl @@ -0,0 +1,55 @@ +// +// $Id$ +// + +/// Put the interfaces in a module, to avoid global namespace pollution +module Test +{ + /// A sequence of octets to generate bigger messages + typedef sequence<octet> Payload; + + /// Clients use this interface to send oneway requests + interface AMI_Buffering + { + /// A simple operation to test the number of requests received. + void receive_data (in Payload the_payload); + + /// An empty operation to force a flush in the ORB queues + oneway void flush (); + + /// Synchronize the state with the Admin object. + /** + * Once flush() has been invoked (with the correct buffering + * policies) we must use sync() to ensure that both the main + * server and the Admin servers are in sync. + */ + void sync (); + + /// Shutdown the server + void shutdown (); + }; + + /// Clients use this interface to query the number of oneway + /// requests received. + interface AMI_Buffering_Admin + { + /// Number of oneway requests received + unsigned long request_count (); + + /// Number of bytes received + unsigned long bytes_received_count (); + + /// The Oneway_Buffering interface uses this method to report any + /// request received. + void request_received (in unsigned long payload_length); + + /// An empty operation to force a flush in the ORB queues + void flush (); + + /// A method to shutdown the ORB + /** + * This method is used to simplify the test shutdown process + */ + void shutdown (); + }; +}; diff --git a/TAO/tests/AMI_Buffering/admin.bor b/TAO/tests/AMI_Buffering/admin.bor new file mode 100644 index 00000000000..220a5c6cf5f --- /dev/null +++ b/TAO/tests/AMI_Buffering/admin.bor @@ -0,0 +1,39 @@ +# +# $Id$ +# + +NAME = admin + +TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 + +OBJFILES = \ + $(OBJDIR)\TestC.obj \ + $(OBJDIR)\TestS.obj \ + $(OBJDIR)\AMI_Buffering_Admin.obj \ + $(OBJDIR)\admin.obj + +CFLAGS = \ + $(ACE_CFLAGS) \ + $(TAO_CFLAGS) \ + $(TAO_PORTABLESERVER_CFLAGS) + +LIBFILES = \ + $(ACE_LIB) \ + $(TAO_LIB) \ + $(TAO_PORTABLESERVER_LIB) + +IDLFILES = \ + $(IDLDIR)\Test.idl + +CPPDIR = . + +IDLDIR = . + +!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> + +# +# IDL Build rules +# + +$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl + $(TAO_IDL) $** diff --git a/TAO/tests/AMI_Buffering/admin.cpp b/TAO/tests/AMI_Buffering/admin.cpp new file mode 100644 index 00000000000..8f6e82d3b48 --- /dev/null +++ b/TAO/tests/AMI_Buffering/admin.cpp @@ -0,0 +1,112 @@ +// $Id$ + +#include "AMI_Buffering_Admin.h" +#include "ace/Get_Opt.h" + +ACE_RCSID(AMI_Buffering, admin, "$Id$") + +const char *ior_output_file = "admin.ior"; + +int +parse_args (int argc, char *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, "o:"); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'o': + ior_output_file = get_opts.optarg; + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-o <iorfile>" + "\n", + argv [0]), + -1); + } + // Indicates sucessful parsing of the command line + return 0; +} + +int +main (int argc, char *argv[]) +{ + ACE_TRY_NEW_ENV + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + ACE_TRY_CHECK; + + CORBA::Object_var poa_object = + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (CORBA::is_nil (root_poa.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Panic: nil RootPOA\n"), + 1); + + PortableServer::POAManager_var poa_manager = + root_poa->the_POAManager (ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (parse_args (argc, argv) != 0) + return 1; + + AMI_Buffering_Admin *AMI_buffering_admin_impl; + ACE_NEW_RETURN (AMI_buffering_admin_impl, + AMI_Buffering_Admin (orb.in ()), + 1); + PortableServer::ServantBase_var owner_transfer(AMI_buffering_admin_impl); + + Test::AMI_Buffering_Admin_var AMI_buffering_admin = + AMI_buffering_admin_impl->_this (ACE_TRY_ENV); + ACE_TRY_CHECK; + + CORBA::String_var ior = + orb->object_to_string (AMI_buffering_admin.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + // If the ior_output_file exists, output the ior to it + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s", + ior_output_file), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); + + poa_manager->activate (ACE_TRY_ENV); + ACE_TRY_CHECK; + + orb->run (ACE_TRY_ENV); + ACE_TRY_CHECK; + + ACE_DEBUG ((LM_DEBUG, "(%P|%t) admin - event loop finished\n")); + + root_poa->destroy (1, 1, ACE_TRY_ENV); + ACE_TRY_CHECK; + + orb->destroy (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Exception caught:"); + return 1; + } + ACE_ENDTRY; + + return 0; +} diff --git a/TAO/tests/AMI_Buffering/admin.dsp b/TAO/tests/AMI_Buffering/admin.dsp new file mode 100644 index 00000000000..79b260204f2 --- /dev/null +++ b/TAO/tests/AMI_Buffering/admin.dsp @@ -0,0 +1,216 @@ +# Microsoft Developer Studio Project File - Name="AMI_Buffering Admin" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=AMI_Buffering Admin - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "admin.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "admin.mak" CFG="AMI_Buffering Admin - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "AMI_Buffering Admin - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "AMI_Buffering Admin - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "AMI_Buffering Admin - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 TAO.lib TAO_PortableServer.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+
+!ELSEIF "$(CFG)" == "AMI_Buffering Admin - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 TAOd.lib TAO_PortableServerd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+
+!ENDIF
+
+# Begin Target
+
+# Name "AMI_Buffering Admin - Win32 Release"
+# Name "AMI_Buffering Admin - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ".cpp"
+# Begin Source File
+
+SOURCE=.\admin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\AMI_Buffering_Admin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestS.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ".h"
+# Begin Source File
+
+SOURCE=.\AMI_Buffering_Admin.h
+# End Source File
+# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter ".idl"
+# Begin Source File
+
+SOURCE=.\Test.idl
+
+!IF "$(CFG)" == "AMI_Buffering Admin - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
+InputPath=.\Test.idl
+InputName=Test
+
+BuildCmds= \
+ ..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "AMI_Buffering Admin - Win32 Debug"
+
+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
+InputPath=.\Test.idl
+InputName=Test
+
+BuildCmds= \
+ ..\..\..\bin\tao_idl -Ge 1 -GC $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter ".i"
+# Begin Source File
+
+SOURCE=.\TestC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestS.i
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/performance-tests/Throughput/client.bor b/TAO/tests/AMI_Buffering/client.bor index 8cbcb24dee6..f293a62e0bd 100644 --- a/TAO/performance-tests/Throughput/client.bor +++ b/TAO/tests/AMI_Buffering/client.bor @@ -8,15 +8,19 @@ TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 OBJFILES = \ $(OBJDIR)\TestC.obj \ - $(OBJDIR)\client.obj + $(OBJDIR)\TestS.obj \ + $(OBJDIR)\Reply_Handler.obj \ + $(OBJDIR)\server.obj CFLAGS = \ $(ACE_CFLAGS) \ - $(TAO_CFLAGS) + $(TAO_CFLAGS) \ + $(TAO_PORTABLESERVER_CFLAGS) LIBFILES = \ $(ACE_LIB) \ - $(TAO_LIB) + $(TAO_LIB) \ + $(TAO_PORTABLESERVER_LIB) IDLFILES = \ $(IDLDIR)\Test.idl diff --git a/TAO/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp new file mode 100644 index 00000000000..04238d4d082 --- /dev/null +++ b/TAO/tests/AMI_Buffering/client.cpp @@ -0,0 +1,863 @@ +// $Id$ + +#include "Reply_Handler.h" +#include "Client_Task.h" +#include "tao/Messaging.h" +#include "tao/TAOC.h" +#include "ace/Get_Opt.h" + +ACE_RCSID(AMI_Buffering, client, "$Id$") + +const char *server_ior = "file://server.ior"; +const char *admin_ior = "file://admin.ior"; +int iterations = 200; + +int run_message_count_test = 0; +int run_timeout_test = 0; +int run_timeout_reactive_test = 0; +int run_buffer_size_test = 0; + +const int PAYLOAD_LENGTH = 1024; +const int BUFFERED_MESSAGES_COUNT = 50; +const int TIMEOUT_MILLISECONDS = 50; +const int BUFFER_SIZE = 64 * PAYLOAD_LENGTH; + +/// Check that no more than 10% of the messages are not sent. +const double LIVENESS_TOLERANCE = 0.9; + +/// Factor in GIOP overhead in the buffer size test +const double GIOP_OVERHEAD = 0.9; + +int +parse_args (int argc, char *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, "k:a:i:ctbr"); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'k': + server_ior = get_opts.optarg; + break; + + case 'a': + admin_ior = get_opts.optarg; + break; + + case 'i': + iterations = ACE_OS::atoi (get_opts.optarg); + break; + + case 'c': + run_message_count_test = 1; + break; + + case 't': + run_timeout_test = 1; + break; + + case 'b': + run_buffer_size_test = 1; + break; + + case 'r': + run_timeout_reactive_test = 1; + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-k <server_ior> " + "-a <admin_ior> " + "-i <iterations> " + "<-c|-t|-b|-r> " + "\n", + argv [0]), + -1); + } + // Indicates sucessful parsing of the command line + return 0; +} + +int +run_message_count (CORBA::ORB_ptr orb, + Test::AMI_Buffering_ptr ami_buffering, + Test::AMI_Buffering_Admin_ptr ami_buffering_admin, + CORBA::Environment &ACE_TRY_ENV); +int +run_timeout (CORBA::ORB_ptr orb, + Test::AMI_Buffering_ptr ami_buffering, + Test::AMI_Buffering_Admin_ptr ami_buffering_admin, + CORBA::Environment &ACE_TRY_ENV); + +int +run_timeout_reactive (CORBA::ORB_ptr orb, + Test::AMI_Buffering_ptr oneway_buffering, + Test::AMI_Buffering_Admin_ptr oneway_buffering_admin, + CORBA::Environment &ACE_TRY_ENV); + +int +run_buffer_size (CORBA::ORB_ptr orb, + Test::AMI_Buffering_ptr ami_buffering, + Test::AMI_Buffering_Admin_ptr ami_buffering_admin, + CORBA::Environment &ACE_TRY_ENV); + +int +main (int argc, char *argv[]) +{ + int test_failed = 0; + ACE_TRY_NEW_ENV + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + ACE_TRY_CHECK; + + CORBA::Object_var poa_object = + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (CORBA::is_nil (root_poa.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Panic: nil RootPOA\n"), + 1); + + PortableServer::POAManager_var poa_manager = + root_poa->the_POAManager (ACE_TRY_ENV); + ACE_TRY_CHECK; + + poa_manager->activate (ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (parse_args (argc, argv) != 0) + return 1; + + CORBA::Object_var tmp = + orb->string_to_object(server_ior, ACE_TRY_ENV); + ACE_TRY_CHECK; + + Test::AMI_Buffering_var ami_buffering = + Test::AMI_Buffering::_narrow(tmp.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (CORBA::is_nil (ami_buffering.in ())) + { + ACE_ERROR_RETURN ((LM_DEBUG, + "Nil Test::AMI_Buffering reference <%s>\n", + server_ior), + 1); + } + + tmp = + orb->string_to_object(admin_ior, ACE_TRY_ENV); + ACE_TRY_CHECK; + + Test::AMI_Buffering_Admin_var ami_buffering_admin = + Test::AMI_Buffering_Admin::_narrow(tmp.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (CORBA::is_nil (ami_buffering_admin.in ())) + { + ACE_ERROR_RETURN ((LM_DEBUG, + "Nil Test::AMI_Buffering_Admin reference <%s>\n", + admin_ior), + 1); + } + + Client_Task client_task (orb.in ()); + if (client_task.activate (THR_NEW_LWP | THR_JOINABLE) == -1) + { + ACE_ERROR ((LM_ERROR, "Error activating client task\n")); + } + + if (run_message_count_test) + { + ACE_DEBUG ((LM_DEBUG, + "Running message count flushing test\n")); + test_failed = + run_message_count (orb.in (), + ami_buffering.in (), + ami_buffering_admin.in (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + } + else if (run_timeout_test) + { + ACE_DEBUG ((LM_DEBUG, + "Running timeout flushing test\n")); + test_failed = + run_timeout (orb.in (), + ami_buffering.in (), + ami_buffering_admin.in (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + } + else if (run_timeout_reactive_test) + { + ACE_DEBUG ((LM_DEBUG, + "Running timeout (reactive) flushing test\n")); + test_failed = + run_timeout_reactive (orb.in (), + ami_buffering.in (), + ami_buffering_admin.in (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + } + else if (run_buffer_size_test) + { + ACE_DEBUG ((LM_DEBUG, + "Running buffer size flushing test\n")); + test_failed = + run_buffer_size (orb.in (), + ami_buffering.in (), + ami_buffering_admin.in (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + } + else + { + ACE_ERROR ((LM_ERROR, + "ERROR: No test was configured\n")); + } + + client_task.terminate_loop (); + + client_task.thr_mgr ()->wait (); + + ami_buffering->shutdown (ACE_TRY_ENV); + ACE_TRY_CHECK; + + ami_buffering_admin->shutdown (ACE_TRY_ENV); + ACE_TRY_CHECK; + + root_poa->destroy (1, 1, ACE_TRY_ENV); + ACE_TRY_CHECK; + + orb->destroy (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Exception caught:"); + return 1; + } + ACE_ENDTRY; + + return test_failed; +} + +int +configure_policies (CORBA::ORB_ptr orb, + const TAO::BufferingConstraint &buffering_constraint, + Test::AMI_Buffering_ptr ami_buffering, + Test::AMI_Buffering_out flusher, + CORBA::Environment &ACE_TRY_ENV) +{ + CORBA::Object_var object = + orb->resolve_initial_references ("PolicyCurrent", ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + CORBA::PolicyCurrent_var policy_current = + CORBA::PolicyCurrent::_narrow (object.in (), ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (CORBA::is_nil (policy_current.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Nil policy current\n")); + return 1; + } + CORBA::Any scope_as_any; + scope_as_any <<= Messaging::SYNC_NONE; + + CORBA::Any buffering_as_any; + buffering_as_any <<= buffering_constraint; + + CORBA::PolicyList policies (2); policies.length (2); + policies[0] = + orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, + scope_as_any, + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + policies[1] = + orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, + buffering_as_any, + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE, + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + policies[0]->destroy (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + policies[1]->destroy (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + TAO::BufferingConstraint flush_constraint; + flush_constraint.mode = TAO::BUFFER_FLUSH; + flush_constraint.message_count = 0; + flush_constraint.message_bytes = 0; + flush_constraint.timeout = 0; + + buffering_as_any <<= flush_constraint; + policies.length (1); + policies[0] = + orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, + buffering_as_any, + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + object = + ami_buffering->_set_policy_overrides (policies, + CORBA::ADD_OVERRIDE, + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + policies[0]->destroy (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + flusher = + Test::AMI_Buffering::_narrow (object.in (), ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + return 0; +} + +int +run_liveness_test (Test::AMI_AMI_BufferingHandler_ptr reply_handler, + Test::AMI_Buffering_ptr ami_buffering, + Test::AMI_Buffering_ptr flusher, + Test::AMI_Buffering_Admin_ptr ami_buffering_admin, + CORBA::Environment &ACE_TRY_ENV) +{ + ACE_DEBUG ((LM_DEBUG, ".... checking for liveness\n")); + int test_failed = 0; + + // Get back in sync with the server... + flusher->flush (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + flusher->sync (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + CORBA::ULong send_count = + ami_buffering_admin->request_count (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + int liveness_test_iterations = int(send_count); + + Test::Payload payload (PAYLOAD_LENGTH); + payload.length (PAYLOAD_LENGTH); + for (int j = 0; j != PAYLOAD_LENGTH; ++j) + payload[j] = CORBA::Octet(j % 256); + + for (int i = 0; i != liveness_test_iterations; ++i) + { + ami_buffering->sendc_receive_data (reply_handler, + payload, + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + send_count++; + + CORBA::ULong receive_count = + ami_buffering_admin->request_count (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + // Once the system has sent enough messages we don't + // expect it to fall too far behind, i.e. at least 90% of the + // messages should be delivered.... + CORBA::ULong expected = + CORBA::ULong (LIVENESS_TOLERANCE * send_count); + + if (receive_count < expected) + { + test_failed = 1; + ACE_ERROR ((LM_ERROR, + "ERROR: Iteration %d " + "not enough messages received %u " + "expected %u\n", + i, receive_count, expected)); + } + } + + return test_failed; +} + +int +run_message_count (CORBA::ORB_ptr orb, + Test::AMI_Buffering_ptr ami_buffering, + Test::AMI_Buffering_Admin_ptr ami_buffering_admin, + CORBA::Environment &ACE_TRY_ENV) +{ + TAO::BufferingConstraint buffering_constraint; + buffering_constraint.mode = TAO::BUFFER_MESSAGE_COUNT; + buffering_constraint.message_count = BUFFERED_MESSAGES_COUNT; + buffering_constraint.message_bytes = 0; + buffering_constraint.timeout = 0; + + Test::AMI_Buffering_var flusher; + int test_failed = + configure_policies (orb, buffering_constraint, + ami_buffering, flusher.out (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (test_failed != 0) + return test_failed; + + Test::Payload payload (PAYLOAD_LENGTH); + payload.length (PAYLOAD_LENGTH); + for (int j = 0; j != PAYLOAD_LENGTH; ++j) + payload[j] = CORBA::Octet(j % 256); + + Reply_Handler *reply_handler_impl; + ACE_NEW_RETURN (reply_handler_impl, + Reply_Handler, + 1); + PortableServer::ServantBase_var owner_transfer(reply_handler_impl); + + Test::AMI_AMI_BufferingHandler_var reply_handler = + reply_handler_impl->_this (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + CORBA::ULong send_count = 0; + for (int i = 0; i != iterations; ++i) + { + // Get back in sync with the server... + flusher->flush (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + flusher->sync (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + CORBA::ULong initial_receive_count = + ami_buffering_admin->request_count (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (initial_receive_count != send_count) + { + test_failed = 1; + ACE_ERROR ((LM_ERROR, + "ERROR: Iteration %d message lost (%u != %u)\n", + i, initial_receive_count, send_count)); + } + + while (1) + { + ami_buffering->sendc_receive_data (reply_handler.in (), + payload, + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + send_count++; + + CORBA::ULong receive_count = + ami_buffering_admin->request_count (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + CORBA::ULong iteration_count = + send_count - initial_receive_count; + if (receive_count != initial_receive_count) + { + if (iteration_count < CORBA::ULong(BUFFERED_MESSAGES_COUNT)) + { + test_failed = 1; + ACE_ERROR ((LM_ERROR, + "ERROR: Iteration %d flush before " + "message count reached. " + "Iteration count = %u, Threshold = %u\n", + i, + iteration_count, BUFFERED_MESSAGES_COUNT)); + } + break; + } + + if (iteration_count > 2 * BUFFERED_MESSAGES_COUNT) + { + test_failed = 1; + ACE_ERROR ((LM_ERROR, + "ERROR: Iteration %d no flush past " + "message count threshold. " + "Iteration count = %u, Threshold = %u\n", + i, + iteration_count, BUFFERED_MESSAGES_COUNT)); + break; + } + } + } + + int liveness_test_failed = + run_liveness_test (reply_handler.in (), + ami_buffering, + flusher.in (), + ami_buffering_admin, + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (liveness_test_failed) + test_failed = 1; + + return test_failed; +} + +int +run_timeout (CORBA::ORB_ptr orb, + Test::AMI_Buffering_ptr ami_buffering, + Test::AMI_Buffering_Admin_ptr ami_buffering_admin, + CORBA::Environment &ACE_TRY_ENV) +{ + TAO::BufferingConstraint buffering_constraint; + buffering_constraint.mode = TAO::BUFFER_TIMEOUT; + buffering_constraint.message_count = 0; + buffering_constraint.message_bytes = 0; + buffering_constraint.timeout = TIMEOUT_MILLISECONDS * 10000; + + Test::AMI_Buffering_var flusher; + int test_failed = + configure_policies (orb, buffering_constraint, + ami_buffering, flusher.out (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (test_failed != 0) + return test_failed; + + Test::Payload payload (PAYLOAD_LENGTH); + payload.length (PAYLOAD_LENGTH); + for (int j = 0; j != PAYLOAD_LENGTH; ++j) + payload[j] = CORBA::Octet(j % 256); + + Reply_Handler *reply_handler_impl; + ACE_NEW_RETURN (reply_handler_impl, + Reply_Handler, + 1); + PortableServer::ServantBase_var owner_transfer(reply_handler_impl); + + Test::AMI_AMI_BufferingHandler_var reply_handler = + reply_handler_impl->_this (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + CORBA::ULong send_count = 0; + for (int i = 0; i != iterations; ++i) + { + // Get back in sync with the server... + flusher->flush (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + flusher->sync (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + CORBA::ULong initial_receive_count = + ami_buffering_admin->request_count (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (initial_receive_count != send_count) + { + test_failed = 1; + ACE_ERROR ((LM_ERROR, + "ERROR: Iteration %d message lost (%u != %u)\n", + i, initial_receive_count, send_count)); + } + + ACE_Time_Value start = ACE_OS::gettimeofday (); + while (1) + { + ami_buffering->sendc_receive_data (reply_handler.in (), + payload, + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + send_count++; + + CORBA::ULong receive_count = + ami_buffering_admin->request_count (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start; + if (receive_count != initial_receive_count) + { + if (elapsed.msec () < TIMEOUT_MILLISECONDS) + { + test_failed = 1; + ACE_ERROR ((LM_ERROR, + "ERROR: Iteration %d flush before " + "timeout expired. " + "Elapsed = %d, Timeout = %d msecs\n", + i, + elapsed.msec (), TIMEOUT_MILLISECONDS)); + } + // terminate the while loop. + break; + } + + if (elapsed.msec () > 2 * TIMEOUT_MILLISECONDS) + { + test_failed = 1; + ACE_ERROR ((LM_ERROR, + "ERROR: Iteration %d no flush past " + "timeout threshold. " + "Elapsed = %d, Timeout = %d msecs\n", + i, + elapsed.msec (), TIMEOUT_MILLISECONDS)); + break; + } + } + } + + int liveness_test_failed = + run_liveness_test (reply_handler.in (), + ami_buffering, + flusher.in (), + ami_buffering_admin, + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (liveness_test_failed) + test_failed = 1; + + return test_failed; +} + +int +run_timeout_reactive (CORBA::ORB_ptr orb, + Test::AMI_Buffering_ptr ami_buffering, + Test::AMI_Buffering_Admin_ptr ami_buffering_admin, + CORBA::Environment &ACE_TRY_ENV) +{ + TAO::BufferingConstraint buffering_constraint; + buffering_constraint.mode = TAO::BUFFER_TIMEOUT; + buffering_constraint.message_count = 0; + buffering_constraint.message_bytes = 0; + buffering_constraint.timeout = TIMEOUT_MILLISECONDS * 10000; + + Test::AMI_Buffering_var flusher; + int test_failed = + configure_policies (orb, buffering_constraint, + ami_buffering, flusher.out (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (test_failed != 0) + return test_failed; + + Test::Payload payload (PAYLOAD_LENGTH); + payload.length (PAYLOAD_LENGTH); + for (int j = 0; j != PAYLOAD_LENGTH; ++j) + payload[j] = CORBA::Octet(j % 256); + + Reply_Handler *reply_handler_impl; + ACE_NEW_RETURN (reply_handler_impl, + Reply_Handler, + 1); + PortableServer::ServantBase_var owner_transfer(reply_handler_impl); + + Test::AMI_AMI_BufferingHandler_var reply_handler = + reply_handler_impl->_this (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + CORBA::ULong send_count = 0; + for (int i = 0; i != iterations; ++i) + { + // Get back in sync with the server... + flusher->flush (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + flusher->sync (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + CORBA::ULong initial_receive_count = + ami_buffering_admin->request_count (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (initial_receive_count != send_count) + { + test_failed = 1; + ACE_ERROR ((LM_ERROR, + "ERROR: Iteration %d message lost (%u != %u)\n", + i, initial_receive_count, send_count)); + } + + ACE_Time_Value start = ACE_OS::gettimeofday (); + for (int j = 0; j != 20; ++j) + { + ami_buffering->sendc_receive_data (reply_handler.in (), + payload, + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + send_count++; + } + while (1) + { + CORBA::ULong receive_count = + ami_buffering_admin->request_count (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + ACE_Time_Value sleep (0, 10000); + orb->run (sleep, ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start; + if (receive_count != initial_receive_count) + { + if (elapsed.msec () < TIMEOUT_MILLISECONDS) + { + test_failed = 1; + ACE_ERROR ((LM_ERROR, + "ERROR: Iteration %d flush before " + "timeout expired. " + "Elapsed = %d, Timeout = %d msecs\n", + i, + elapsed.msec (), TIMEOUT_MILLISECONDS)); + } + // terminate the while loop. + break; + } + + if (elapsed.msec () > 2 * TIMEOUT_MILLISECONDS) + { + test_failed = 1; + ACE_ERROR ((LM_ERROR, + "ERROR: Iteration %d no flush past " + "timeout threshold. " + "Elapsed = %d, Timeout = %d msecs\n", + i, + elapsed.msec (), TIMEOUT_MILLISECONDS)); + break; + } + } + } + +#if 0 + int liveness_test_failed = + run_liveness_test (reply_handler.in (), + ami_buffering, + flusher.in (), + ami_buffering_admin, + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (liveness_test_failed) + test_failed = 1; +#endif /* 0 */ + + + return test_failed; +} + +int +run_buffer_size (CORBA::ORB_ptr orb, + Test::AMI_Buffering_ptr ami_buffering, + Test::AMI_Buffering_Admin_ptr ami_buffering_admin, + CORBA::Environment &ACE_TRY_ENV) +{ + TAO::BufferingConstraint buffering_constraint; + buffering_constraint.mode = TAO::BUFFER_MESSAGE_BYTES; + buffering_constraint.message_count = 0; + buffering_constraint.message_bytes = BUFFER_SIZE; + buffering_constraint.timeout = 0; + + Test::AMI_Buffering_var flusher; + int test_failed = + configure_policies (orb, buffering_constraint, + ami_buffering, flusher.out (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (test_failed != 0) + return test_failed; + + Test::Payload payload (PAYLOAD_LENGTH); + payload.length (PAYLOAD_LENGTH); + + Reply_Handler *reply_handler_impl; + ACE_NEW_RETURN (reply_handler_impl, + Reply_Handler, + 1); + PortableServer::ServantBase_var owner_transfer(reply_handler_impl); + + Test::AMI_AMI_BufferingHandler_var reply_handler = + reply_handler_impl->_this (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + CORBA::ULong bytes_sent = 0; + for (int i = 0; i != iterations; ++i) + { + // Get back in sync with the server... + flusher->flush (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + flusher->sync (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + CORBA::ULong initial_bytes_received = + ami_buffering_admin->bytes_received_count (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (initial_bytes_received != bytes_sent) + { + test_failed = 1; + ACE_ERROR ((LM_ERROR, + "ERROR: Iteration %d data lost (%u != %u)\n", + i, initial_bytes_received, bytes_sent)); + } + + while (1) + { + ami_buffering->sendc_receive_data (reply_handler.in (), + payload, + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + bytes_sent += PAYLOAD_LENGTH; + + CORBA::ULong bytes_received = + ami_buffering_admin->bytes_received_count (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + CORBA::ULong payload_delta = + bytes_sent - initial_bytes_received; + if (bytes_received != initial_bytes_received) + { + // The queue has been flushed, check that enough data + // has been sent. The check cannot be precise because + // the ORB counts the GIOP message overhead, in this + // test we assume the overhead to be less than 10% + + if (payload_delta < CORBA::ULong (GIOP_OVERHEAD * BUFFER_SIZE)) + { + test_failed = 1; + ACE_ERROR ((LM_ERROR, + "ERROR: Iteration %d flush before " + "minimum buffer size was reached. " + "Sent = %u, Minimum buffer = %u bytes\n", + i, + payload_delta, BUFFER_SIZE)); + } + break; + } + + if (payload_delta > 2 * BUFFER_SIZE) + { + test_failed = 1; + ACE_ERROR ((LM_ERROR, + "ERROR: Iteration %d no flush past " + "buffer size threshold. " + "Sent = %u, Minimum buffer = %u bytes\n", + i, + payload_delta, BUFFER_SIZE)); + break; + } + } + } + + int liveness_test_failed = + run_liveness_test (reply_handler.in (), + ami_buffering, + flusher.in (), + ami_buffering_admin, + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (liveness_test_failed) + test_failed = 1; + + return test_failed; +} diff --git a/TAO/tests/AMI_Buffering/client.dsp b/TAO/tests/AMI_Buffering/client.dsp new file mode 100644 index 00000000000..0e90456d554 --- /dev/null +++ b/TAO/tests/AMI_Buffering/client.dsp @@ -0,0 +1,224 @@ +# Microsoft Developer Studio Project File - Name="AMI_Buffering Client" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=AMI_Buffering Client - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "client.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "client.mak" CFG="AMI_Buffering Client - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "AMI_Buffering Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "AMI_Buffering Client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "AMI_Buffering Client - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 tao.lib ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
+
+!ELSEIF "$(CFG)" == "AMI_Buffering Client - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 taod.lib aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
+
+!ENDIF
+
+# Begin Target
+
+# Name "AMI_Buffering Client - Win32 Release"
+# Name "AMI_Buffering Client - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ".cpp"
+# Begin Source File
+
+SOURCE=.\client.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Client_Task.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Reply_Handler.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestS.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\Client_Task.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Reply_Handler.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestC.h
+# End Source File
+# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\Test.idl
+
+!IF "$(CFG)" == "AMI_Buffering Client - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
+InputPath=.\Test.idl
+InputName=Test
+
+BuildCmds= \
+ ..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "AMI_Buffering Client - Win32 Debug"
+
+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
+InputPath=.\Test.idl
+InputName=Test
+
+BuildCmds= \
+ ..\..\..\bin\tao_idl -Ge 1 -GC $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\TestC.i
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/tests/AMI_Buffering/run_buffer_size.pl b/TAO/tests/AMI_Buffering/run_buffer_size.pl new file mode 100755 index 00000000000..d753ab02cf4 --- /dev/null +++ b/TAO/tests/AMI_Buffering/run_buffer_size.pl @@ -0,0 +1,65 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib '../../../bin'; +use PerlACE::Run_Test; + +$admin_iorfile = PerlACE::LocalFile ("admin.ior"); +$server_iorfile = PerlACE::LocalFile ("server.ior"); + +unlink $admin_iorfile; +unlink $server_iorfile; + +my $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +my $SV = new PerlACE::Process ("server", "-o $server_iorfile"); +my $CL = new PerlACE::Process ("client", + " -k file://$server_iorfile " + ."-a file://$admin_iorfile " + ."-b "); + +$AD->Spawn (); + +if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { + print STDERR "ERROR: cannot find file <$admin_iorfile>\n"; + $AD->Kill (); $AD->TimedWait (1); + exit 1; +} + +$SV->Spawn (); + +if (PerlACE::waitforfile_timed ($server_iorfile, 10) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $AD->Kill (); $AD->TimedWait (1); + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$client = $CL->SpawnWaitKill (300); + +if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; +} + +$server = $SV->WaitKill (10); + +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; +} + +$admin = $AD->WaitKill (10); + +if ($admin != 0) { + print STDERR "ERROR: admin returned $admin\n"; + $status = 1; +} + +unlink $server_iorfile; +unlink $admin_iorfile; + +exit $status; diff --git a/TAO/tests/AMI_Buffering/run_message_count.pl b/TAO/tests/AMI_Buffering/run_message_count.pl new file mode 100755 index 00000000000..8d8f727425b --- /dev/null +++ b/TAO/tests/AMI_Buffering/run_message_count.pl @@ -0,0 +1,65 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib '../../../bin'; +use PerlACE::Run_Test; + +$admin_iorfile = PerlACE::LocalFile ("admin.ior"); +$server_iorfile = PerlACE::LocalFile ("server.ior"); + +unlink $admin_iorfile; +unlink $server_iorfile; + +my $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +my $SV = new PerlACE::Process ("server", "-o $server_iorfile"); +my $CL = new PerlACE::Process ("client", + " -k file://$server_iorfile " + ."-a file://$admin_iorfile " + ."-c "); + +$AD->Spawn (); + +if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { + print STDERR "ERROR: cannot find file <$admin_iorfile>\n"; + $AD->Kill (); $AD->TimedWait (1); + exit 1; +} + +$SV->Spawn (); + +if (PerlACE::waitforfile_timed ($server_iorfile, 10) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $AD->Kill (); $AD->TimedWait (1); + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$client = $CL->SpawnWaitKill (300); + +if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; +} + +$server = $SV->WaitKill (10); + +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; +} + +$admin = $AD->WaitKill (10); + +if ($admin != 0) { + print STDERR "ERROR: admin returned $admin\n"; + $status = 1; +} + +unlink $server_iorfile; +unlink $admin_iorfile; + +exit $status; diff --git a/TAO/tests/AMI_Buffering/run_test.pl b/TAO/tests/AMI_Buffering/run_test.pl new file mode 100755 index 00000000000..30593090375 --- /dev/null +++ b/TAO/tests/AMI_Buffering/run_test.pl @@ -0,0 +1,67 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib '../../../bin'; +use PerlACE::Run_Test; + +$admin_iorfile = PerlACE::LocalFile ("admin.ior"); +$server_iorfile = PerlACE::LocalFile ("server.ior"); + +foreach $test_type ("-c", "-t", "-b") { + unlink $admin_iorfile; + unlink $server_iorfile; + + my $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); + my $SV = new PerlACE::Process ("server", "-o $server_iorfile"); + my $CL = new PerlACE::Process ("client", + " -k file://$server_iorfile " + ."-a file://$admin_iorfile " + .$test_type); + + $AD->Spawn (); + + if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { + print STDERR "ERROR: cannot find file <$admin_iorfile>\n"; + $AD->Kill (); $AD->TimedWait (1); + exit 1; + } + + $SV->Spawn (); + + if (PerlACE::waitforfile_timed ($server_iorfile, 10) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $AD->Kill (); $AD->TimedWait (1); + $SV->Kill (); $SV->TimedWait (1); + exit 1; + } + + $client = $CL->SpawnWaitKill (300); + + if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; + } + + $server = $SV->WaitKill (10); + + if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; + } + + $admin = $AD->WaitKill (10); + + if ($admin != 0) { + print STDERR "ERROR: admin returned $admin\n"; + $status = 1; + } +} + +unlink $server_iorfile; +unlink $admin_iorfile; + +exit $status; diff --git a/TAO/tests/AMI_Buffering/run_timeout.pl b/TAO/tests/AMI_Buffering/run_timeout.pl new file mode 100755 index 00000000000..9352c94075d --- /dev/null +++ b/TAO/tests/AMI_Buffering/run_timeout.pl @@ -0,0 +1,65 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib '../../../bin'; +use PerlACE::Run_Test; + +$admin_iorfile = PerlACE::LocalFile ("admin.ior"); +$server_iorfile = PerlACE::LocalFile ("server.ior"); + +unlink $admin_iorfile; +unlink $server_iorfile; + +my $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +my $SV = new PerlACE::Process ("server", "-o $server_iorfile"); +my $CL = new PerlACE::Process ("client", + " -k file://$server_iorfile " + ."-a file://$admin_iorfile " + ."-t "); + +$AD->Spawn (); + +if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { + print STDERR "ERROR: cannot find file <$admin_iorfile>\n"; + $AD->Kill (); $AD->TimedWait (1); + exit 1; +} + +$SV->Spawn (); + +if (PerlACE::waitforfile_timed ($server_iorfile, 10) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $AD->Kill (); $AD->TimedWait (1); + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$client = $CL->SpawnWaitKill (600); + +if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; +} + +$server = $SV->WaitKill (10); + +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; +} + +$admin = $AD->WaitKill (10); + +if ($admin != 0) { + print STDERR "ERROR: admin returned $admin\n"; + $status = 1; +} + +unlink $server_iorfile; +unlink $admin_iorfile; + +exit $status; diff --git a/TAO/tests/AMI_Buffering/run_timeout_reactive.pl b/TAO/tests/AMI_Buffering/run_timeout_reactive.pl new file mode 100755 index 00000000000..31f09190b88 --- /dev/null +++ b/TAO/tests/AMI_Buffering/run_timeout_reactive.pl @@ -0,0 +1,65 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib '../../../bin'; +use PerlACE::Run_Test; + +$admin_iorfile = PerlACE::LocalFile ("admin.ior"); +$server_iorfile = PerlACE::LocalFile ("server.ior"); + +unlink $admin_iorfile; +unlink $server_iorfile; + +my $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +my $SV = new PerlACE::Process ("server", "-o $server_iorfile"); +my $CL = new PerlACE::Process ("client", + " -k file://$server_iorfile " + ."-a file://$admin_iorfile " + ."-r "); + +$AD->Spawn (); + +if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { + print STDERR "ERROR: cannot find file <$admin_iorfile>\n"; + $AD->Kill (); $AD->TimedWait (1); + exit 1; +} + +$SV->Spawn (); + +if (PerlACE::waitforfile_timed ($server_iorfile, 10) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $AD->Kill (); $AD->TimedWait (1); + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$client = $CL->SpawnWaitKill (300); + +if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; +} + +$server = $SV->WaitKill (10); + +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; +} + +$admin = $AD->WaitKill (10); + +if ($admin != 0) { + print STDERR "ERROR: admin returned $admin\n"; + $status = 1; +} + +unlink $server_iorfile; +unlink $admin_iorfile; + +exit $status; diff --git a/TAO/performance-tests/Throughput/server.bor b/TAO/tests/AMI_Buffering/server.bor index aa57a1c7b12..cedc8f09556 100644 --- a/TAO/performance-tests/Throughput/server.bor +++ b/TAO/tests/AMI_Buffering/server.bor @@ -9,8 +9,7 @@ TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 OBJFILES = \ $(OBJDIR)\TestC.obj \ $(OBJDIR)\TestS.obj \ - $(OBJDIR)\Receiver.obj \ - $(OBJDIR)\Receiver_Factory.obj \ + $(OBJDIR)\AMI_Buffering.obj \ $(OBJDIR)\server.obj CFLAGS = \ diff --git a/TAO/tests/AMI_Buffering/server.cpp b/TAO/tests/AMI_Buffering/server.cpp new file mode 100644 index 00000000000..17d74cb83b5 --- /dev/null +++ b/TAO/tests/AMI_Buffering/server.cpp @@ -0,0 +1,135 @@ +// $Id$ + +#include "AMI_Buffering.h" +#include "ace/Get_Opt.h" + +ACE_RCSID(AMI_Buffering, server, "$Id$") + +const char *ior_output_file = "server.ior"; +const char *ior = "file://admin.ior"; + +int +parse_args (int argc, char *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, "o:k:"); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'o': + ior_output_file = get_opts.optarg; + break; + + case 'k': + ior = get_opts.optarg; + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-o <iorfile> " + "-k <ior> " + "\n", + argv [0]), + -1); + } + // Indicates sucessful parsing of the command line + return 0; +} + +int +main (int argc, char *argv[]) +{ + ACE_TRY_NEW_ENV + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + ACE_TRY_CHECK; + + CORBA::Object_var poa_object = + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (CORBA::is_nil (root_poa.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Panic: nil RootPOA\n"), + 1); + + PortableServer::POAManager_var poa_manager = + root_poa->the_POAManager (ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (parse_args (argc, argv) != 0) + return 1; + + CORBA::Object_var tmp = + orb->string_to_object(ior, ACE_TRY_ENV); + ACE_TRY_CHECK; + + Test::AMI_Buffering_Admin_var admin = + Test::AMI_Buffering_Admin::_narrow(tmp.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (CORBA::is_nil (admin.in ())) + { + ACE_ERROR_RETURN ((LM_DEBUG, + "Nil AMI_Buffering_Admin reference <%s>\n", + ior), + 1); + } + + AMI_Buffering *AMI_buffering_impl; + ACE_NEW_RETURN (AMI_buffering_impl, + AMI_Buffering (orb.in (), + admin.in ()), + 1); + PortableServer::ServantBase_var owner_transfer(AMI_buffering_impl); + + Test::AMI_Buffering_var AMI_buffering = + AMI_buffering_impl->_this (ACE_TRY_ENV); + ACE_TRY_CHECK; + + CORBA::String_var ior = + orb->object_to_string (AMI_buffering.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + // If the ior_output_file exists, output the ior to it + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s", + ior_output_file), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); + + poa_manager->activate (ACE_TRY_ENV); + ACE_TRY_CHECK; + + orb->run (ACE_TRY_ENV); + ACE_TRY_CHECK; + + ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); + + root_poa->destroy (1, 1, ACE_TRY_ENV); + ACE_TRY_CHECK; + + orb->destroy (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Exception caught:"); + return 1; + } + ACE_ENDTRY; + + return 0; +} diff --git a/TAO/tests/AMI_Buffering/server.dsp b/TAO/tests/AMI_Buffering/server.dsp new file mode 100644 index 00000000000..65278067a7a --- /dev/null +++ b/TAO/tests/AMI_Buffering/server.dsp @@ -0,0 +1,216 @@ +# Microsoft Developer Studio Project File - Name="AMI_Buffering Server" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=AMI_Buffering Server - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "server.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "server.mak" CFG="AMI_Buffering Server - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "AMI_Buffering Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "AMI_Buffering Server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "AMI_Buffering Server - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 TAO.lib TAO_PortableServer.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+
+!ELSEIF "$(CFG)" == "AMI_Buffering Server - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 TAOd.lib TAO_PortableServerd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+
+!ENDIF
+
+# Begin Target
+
+# Name "AMI_Buffering Server - Win32 Release"
+# Name "AMI_Buffering Server - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ".cpp"
+# Begin Source File
+
+SOURCE=.\AMI_Buffering.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\server.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestS.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ".h"
+# Begin Source File
+
+SOURCE=.\AMI_Buffering.h
+# End Source File
+# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter ".idl"
+# Begin Source File
+
+SOURCE=.\Test.idl
+
+!IF "$(CFG)" == "AMI_Buffering Server - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
+InputPath=.\Test.idl
+InputName=Test
+
+BuildCmds= \
+ ..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "AMI_Buffering Server - Win32 Debug"
+
+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
+InputPath=.\Test.idl
+InputName=Test
+
+BuildCmds= \
+ ..\..\..\bin\tao_idl -Ge 1 -GC $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter ".i"
+# Begin Source File
+
+SOURCE=.\TestC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestS.i
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/tests/AMI_Buffering/svc.conf b/TAO/tests/AMI_Buffering/svc.conf new file mode 100644 index 00000000000..9fb75aeb0dd --- /dev/null +++ b/TAO/tests/AMI_Buffering/svc.conf @@ -0,0 +1,4 @@ +# +# $Id$ +# +static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED" diff --git a/TAO/tests/BiDirectional/client.dsp b/TAO/tests/BiDirectional/client.dsp index 0259223e000..3eeedd54497 100644 --- a/TAO/tests/BiDirectional/client.dsp +++ b/TAO/tests/BiDirectional/client.dsp @@ -51,8 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib tao.lib TAO_PortableServer.lib TAO_BiDirGIOP.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\BiDir_GIOP"
-# SUBTRACT LINK32 /pdb:none
+# ADD LINK32 ace.lib tao.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
!ELSEIF "$(CFG)" == "BiDir Client - Win32 Debug"
diff --git a/TAO/tests/BiDirectional/server.dsp b/TAO/tests/BiDirectional/server.dsp index a61d3072ef8..947e0de2c36 100644 --- a/TAO/tests/BiDirectional/server.dsp +++ b/TAO/tests/BiDirectional/server.dsp @@ -51,8 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib tao.lib TAO_PortableServer.lib TAO_BiDirGIOP.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\BiDir_GIOP"
-# SUBTRACT LINK32 /pdb:none
+# ADD LINK32 ace.lib tao.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
!ELSEIF "$(CFG)" == "BiDir Server - Win32 Debug"
diff --git a/TAO/tests/BiDirectional_NestedUpcall/run_test.pl b/TAO/tests/BiDirectional_NestedUpcall/run_test.pl index d448613167e..ef75660138f 100755 --- a/TAO/tests/BiDirectional_NestedUpcall/run_test.pl +++ b/TAO/tests/BiDirectional_NestedUpcall/run_test.pl @@ -24,14 +24,14 @@ if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { exit 1; } -$client = $CL->SpawnWaitKill (20); +$client = $CL->TimedWait (20); if ($client != 0) { print STDERR "ERROR: client returned $client\n"; $status = 1; } -$server = $SV->WaitKill (20); +$server = $SV->WaitKill (10); if ($server != 0) { print STDERR "ERROR: server returned $server\n"; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Simple_Two_Stage_With_QoS.dsw b/TAO/tests/Big_Oneways/Big_Oneways.dsw index 11d34f19656..33c4973b960 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Simple_Two_Stage_With_QoS.dsw +++ b/TAO/tests/Big_Oneways/Big_Oneways.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ###############################################################################
-Project: "sender"=.\sender.dsp - Package Owner=<4>
+Project: "Big_Oneways Client"=.\client.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -15,7 +15,7 @@ Package=<4> ###############################################################################
-Project: "receiver"=.\receiver.dsp - Package Owner=<4>
+Project: "Big_Oneways Server"=.\server.dsp - Package Owner=<4>
Package=<5>
{{{
diff --git a/TAO/tests/Big_Oneways/Coordinator.cpp b/TAO/tests/Big_Oneways/Coordinator.cpp new file mode 100644 index 00000000000..52fa351d814 --- /dev/null +++ b/TAO/tests/Big_Oneways/Coordinator.cpp @@ -0,0 +1,83 @@ +// +// $Id$ +// +#include "Coordinator.h" + +ACE_RCSID(Big_Oneways, Coordinator, "$Id$") + +Coordinator::Coordinator (CORBA::ULong peer_count) + : peers_ (0) + , peer_count_ (0) + , peer_max_ (peer_count) +{ + ACE_NEW (this->peers_, Test::Peer_var[this->peer_max_]); +} + +Coordinator::~Coordinator (void) +{ + delete[] this->peers_; +} + +int +Coordinator::has_all_peers (void) const +{ + return this->peer_count_ == this->peer_max_; +} + +void +Coordinator::create_session_list (Test::Session_Control_ptr session_control, + CORBA::ULong payload_size, + CORBA::ULong thread_count, + CORBA::ULong message_count, + Test::Session_List &session_list, + CORBA::Environment &ACE_TRY_ENV) +{ + session_list.length (this->peer_count_); + CORBA::ULong count = 0; + for (Test::Peer_var *i = this->peers_; + i != this->peers_ + this->peer_count_; + ++i) + { + session_list[count++] = + (*i)->create_session (session_control, + payload_size, + thread_count, + message_count, + this->peer_count_, + ACE_TRY_ENV); + ACE_CHECK; + } +} + +void +Coordinator::shutdown_all_peers (CORBA::Environment &ACE_TRY_ENV) +{ + for (Test::Peer_var *i = this->peers_; + i != this->peers_ + this->peer_count_; + ++i) + { + ACE_TRY + { + (*i)->shutdown (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Coordinator::shutdown, ignored"); + } + ACE_ENDTRY; + } +} + +void +Coordinator::add_peer (Test::Peer_ptr peer, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + if (this->peer_count_ >= this->peer_max_) + return; + + this->peers_[this->peer_count_++] = + Test::Peer::_duplicate (peer); +} diff --git a/TAO/tests/Big_Oneways/Coordinator.h b/TAO/tests/Big_Oneways/Coordinator.h new file mode 100644 index 00000000000..e754658f952 --- /dev/null +++ b/TAO/tests/Big_Oneways/Coordinator.h @@ -0,0 +1,65 @@ +// +// $Id$ +// + +#ifndef BIG_ONEWAYS_COORDINATOR_H +#define BIG_ONEWAYS_COORDINATOR_H +#include "ace/pre.h" + +#include "TestS.h" + +#if defined (_MSC_VER) +# if (_MSC_VER >= 1200) +# pragma warning(push) +# endif /* _MSC_VER >= 1200 */ +# pragma warning (disable:4250) +#endif /* _MSC_VER */ + +/// Implement the Test::Coordinator interface +class Coordinator + : public virtual POA_Test::Coordinator + , public virtual PortableServer::RefCountServantBase +{ +public: + /// Constructor + Coordinator (CORBA::ULong peer_count); + + /// Destructor + virtual ~Coordinator (void); + + /// Check if all the peers have registered already + int has_all_peers (void) const; + + /// Check a session on each peer + void create_session_list (Test::Session_Control_ptr session_control, + CORBA::ULong payload_size, + CORBA::ULong thread_count, + CORBA::ULong message_count, + Test::Session_List &session_list, + CORBA::Environment &ACE_TRY_ENV); + + /// Shutdown all the peers + void shutdown_all_peers (CORBA::Environment &ACE_TRY_ENV); + + // = The skeleton methods + virtual void add_peer (Test::Peer_ptr peer, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + /// Store a reference to each peer + Test::Peer_var *peers_; + + /// Current number of elements in the array + size_t peer_count_; + + /// Array's capacity + size_t peer_max_; +}; + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +# pragma warning(pop) +#endif /* _MSC_VER */ + +#include "ace/post.h" +#endif /* BIG_ONEWAYS_COORDINATOR_H */ diff --git a/TAO/tests/Big_Oneways/Makefile b/TAO/tests/Big_Oneways/Makefile new file mode 100644 index 00000000000..46b00dcc5c0 --- /dev/null +++ b/TAO/tests/Big_Oneways/Makefile @@ -0,0 +1,1700 @@ +#---------------------------------------------------------------------------- +# +# $Id$ +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +ifndef TAO_ROOT + TAO_ROOT = $(ACE_ROOT)/TAO +endif # ! TAO_ROOT + +LDLIBS = -lTAO + +IDL_FILES = Test +IDL_SRC = TestC.cpp TestS.cpp +BIN = server client + +SRC = $(addsuffix .cpp, $(BIN) Coordinator Peer Session Session_Control Session_Task) $(IDL_SRC) + +CLIENT_OBJS = client.o TestC.o TestS.o Peer.o Session.o Session_Task.o +SERVER_OBJS = server.o TestC.o TestS.o Coordinator.o Session_Control.o + +TAO_IDLFLAGS += -Ge 1 +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(TAO_ROOT)/rules.tao.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +include $(TAO_ROOT)/taoconfig.mk + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- + +.PRECIOUS: $(foreach ext, $(IDL_EXT), Test$(ext)) + +server: $(addprefix $(VDIR),$(SERVER_OBJS)) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) + +client: $(addprefix $(VDIR),$(CLIENT_OBJS)) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) + +realclean: clean + -$(RM) $(foreach ext, $(IDL_EXT), Test$(ext)) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Coordinator.h \ + $(ACE_ROOT)/ace/pre.h \ + TestS.h TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + TestS_T.h TestS_T.cpp TestS_T.i Session_Control.h \ + $(ACE_ROOT)/ace/Get_Opt.h + +.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Peer.h \ + $(ACE_ROOT)/ace/pre.h \ + TestS.h TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + TestS_T.h TestS_T.cpp TestS_T.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i + +.obj/Coordinator.o .obj/Coordinator.so .shobj/Coordinator.o .shobj/Coordinator.so: Coordinator.cpp Coordinator.h \ + $(ACE_ROOT)/ace/pre.h \ + TestS.h TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + TestS_T.h TestS_T.cpp TestS_T.i + +.obj/Peer.o .obj/Peer.so .shobj/Peer.o .shobj/Peer.so: Peer.cpp Peer.h \ + $(ACE_ROOT)/ace/pre.h \ + TestS.h TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + TestS_T.h TestS_T.cpp TestS_T.i Session.h Session_Task.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Task_T.i + +.obj/Session.o .obj/Session.so .shobj/Session.o .shobj/Session.so: Session.cpp Session.h \ + $(ACE_ROOT)/ace/pre.h \ + TestS.h TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + TestS_T.h TestS_T.cpp TestS_T.i Session_Task.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(TAO_ROOT)/tao/debug.h + +.obj/Session_Control.o .obj/Session_Control.so .shobj/Session_Control.o .shobj/Session_Control.so: Session_Control.cpp Session_Control.h \ + $(ACE_ROOT)/ace/pre.h \ + TestS.h TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + TestS_T.h TestS_T.cpp TestS_T.i + +.obj/Session_Task.o .obj/Session_Task.so .shobj/Session_Task.o .shobj/Session_Task.so: Session_Task.cpp Session_Task.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Task_T.i \ + Session.h TestS.h TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + TestS_T.h TestS_T.cpp TestS_T.i + +.obj/TestC.o .obj/TestC.so .shobj/TestC.o .shobj/TestC.so: TestC.cpp TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/RequestInfo_Util.h \ + TestC.i + +.obj/TestS.o .obj/TestS.so .shobj/TestS.o .shobj/TestS.so: TestS.cpp TestS.h TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + TestS_T.h TestS_T.cpp TestS_T.i \ + $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ + $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ + $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/RequestInfo_Util.h \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(ACE_ROOT)/ace/Dynamic_Service.i \ + TestS.i + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tests/Big_Oneways/Peer.cpp b/TAO/tests/Big_Oneways/Peer.cpp new file mode 100644 index 00000000000..e5cf894acba --- /dev/null +++ b/TAO/tests/Big_Oneways/Peer.cpp @@ -0,0 +1,51 @@ +// +// $Id$ +// +#include "Peer.h" +#include "Session.h" + +ACE_RCSID(Big_Oneways, Peer, "$Id$") + +Peer::Peer (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) +{ +} + +Peer::~Peer (void) +{ +} + +Test::Session_ptr +Peer::create_session (Test::Session_Control_ptr control, + CORBA::ULong payload_size, + CORBA::ULong thread_count, + CORBA::ULong message_count, + CORBA::ULong peer_count, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + Session *session_impl; + ACE_NEW_THROW_EX (session_impl, + Session (control, + payload_size, + thread_count, + message_count, + peer_count), + CORBA::NO_MEMORY ()); + ACE_CHECK_RETURN (Test::Session::_nil ()); + PortableServer::ServantBase_var transfer_ownership (session_impl); + + return session_impl->_this (ACE_TRY_ENV); +} + +void +Peer::shutdown (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Peer::shutdown, waiting for threads\n")); + + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Peer::shutdown, shutting down ORB\n")); + this->orb_->shutdown (0, ACE_TRY_ENV); +} diff --git a/TAO/tests/Big_Oneways/Peer.h b/TAO/tests/Big_Oneways/Peer.h new file mode 100644 index 00000000000..ed34b0eb6fa --- /dev/null +++ b/TAO/tests/Big_Oneways/Peer.h @@ -0,0 +1,51 @@ +// +// $Id$ +// + +#ifndef BIG_ONEWAYS_PEER_H +#define BIG_ONEWAYS_PEER_H +#include "ace/pre.h" + +#include "TestS.h" + +#if defined (_MSC_VER) +# if (_MSC_VER >= 1200) +# pragma warning(push) +# endif /* _MSC_VER >= 1200 */ +# pragma warning (disable:4250) +#endif /* _MSC_VER */ + +/// Implement the Test::Peer interface +class Peer + : public virtual POA_Test::Peer + , public virtual PortableServer::RefCountServantBase +{ +public: + /// Constructor + Peer (CORBA::ORB_ptr orb); + + /// Destructor + virtual ~Peer (void); + + // = The skeleton methods + virtual Test::Session_ptr create_session (Test::Session_Control_ptr control, + CORBA::ULong payload_size, + CORBA::ULong thread_count, + CORBA::ULong message_count, + CORBA::ULong peer_count, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + /// Keep a pointer to the ORB to shutdown cleanly + CORBA::ORB_var orb_; +}; + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +# pragma warning(pop) +#endif /* _MSC_VER */ + +#include "ace/post.h" +#endif /* BIG_ONEWAYS_PEER_H */ diff --git a/TAO/tests/Big_Oneways/README b/TAO/tests/Big_Oneways/README new file mode 100644 index 00000000000..ed389e9009c --- /dev/null +++ b/TAO/tests/Big_Oneways/README @@ -0,0 +1,21 @@ +/** + +@page Big_Oneways Test README File + + This is a stress test for the non-blocking I/O features in the +ORB. The test connects multiple peer processes together. Each +process sends messages to all its peers, using multiple threads to +generate the messages. Without non-blocking I/O the system soon +deadlocks. + + This is part of the regression testsuite for: + +http://ace.cs.wustl.edu/bugzilla/show_bug.cgi?id=132 + + To run the test use the run_test.pl script: + +$ ./run_test.pl + + the script returns 0 if the test was successful. + +*/ diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp new file mode 100644 index 00000000000..0ce9bd9f2ce --- /dev/null +++ b/TAO/tests/Big_Oneways/Session.cpp @@ -0,0 +1,277 @@ +// +// $Id$ +// +#include "Session.h" +#include "tao/debug.h" + +ACE_RCSID(Big_Oneways, Session, "$Id$") + +Session::Session (Test::Session_Control_ptr control, + CORBA::ULong payload_size, + CORBA::ULong thread_count, + CORBA::ULong message_count, + CORBA::ULong peer_count) + : control_ (Test::Session_Control::_duplicate (control)) + , running_ (0) + , payload_size_ (payload_size) + , thread_count_ (thread_count) + , message_count_ (message_count) + , active_thread_count_ (0) + , expected_messages_ (thread_count * message_count * (peer_count - 1)) + , task_ (this) + , barrier_ (thread_count + 1) +{ +} + +Session::~Session (void) +{ +} + +int +Session::svc (void) +{ + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Session::svc, start\n")); + + this->barrier_.wait (); + + /// Automatically decrease the reference count at the end of the + /// thread + PortableServer::ServantBase_var auto_decrement (this); + + ACE_DECLARE_NEW_CORBA_ENV; + + ACE_TRY + { + // Use the same payload over and over + Test::Payload payload (this->payload_size_); + payload.length (this->payload_size_); + + for (CORBA::ULong j = 0; j != this->payload_size_; ++j) + { + payload[j] = j % 256; + } + + // Get the number of peers just once. + CORBA::ULong session_count = + this->other_sessions_.length (); + + this->validate_connections (ACE_TRY_ENV); + ACE_TRY_CHECK; + + for (CORBA::ULong i = 0; i != this->message_count_; ++i) + { +#if 0 + if (i % 500 == 0) + { + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Session::svc, " + "sending message %d\n", + i)); + } +#endif /* 0 */ + for (CORBA::ULong j = 0; j != session_count; ++j) + { + this->other_sessions_[j]->receive_payload (payload, + ACE_TRY_ENV); + ACE_TRY_CHECK; + } + } + + { + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1); + this->active_thread_count_--; + if (this->more_work ()) + { + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Session::svc, end\n")); + return 0; + } + } + this->terminate (1, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Session::svc - "); + return -1; + } + ACE_ENDTRY; + + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Session::svc, end\n")); + return 0; +} + +void +Session::validate_connections (CORBA::Environment &ACE_TRY_ENV) +{ + CORBA::ULong session_count = + this->other_sessions_.length (); + for (CORBA::ULong i = 0; i != 100; ++i) + { + for (CORBA::ULong j = 0; j != session_count; ++j) + { + ACE_TRY + { + this->other_sessions_[j]->ping (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY {} ACE_ENDTRY; + } + } + ACE_DEBUG ((LM_DEBUG, "(%P|%t) connections are ready\n")); +} + +void +Session::start (const Test::Session_List &other_sessions, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + Test::Already_Running, + Test::No_Peers)) +{ + if (other_sessions.length () == 0) + ACE_THROW (Test::No_Peers ()); + + { + ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); + if (this->running_) + ACE_THROW (Test::Already_Running ()); + + this->other_sessions_ = other_sessions; + + for (CORBA::ULong i = 0; i != this->thread_count_; ++i) + { + // Increase the reference count because the new thread will have + // access to this object.... + ACE_TRY + { + this->_add_ref (ACE_TRY_ENV); + ACE_TRY_CHECK; + if (this->task_.activate ( + THR_NEW_LWP | THR_JOINABLE, 1, 1) == -1) + { + this->_remove_ref (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + else + { + this->running_ = 1; + this->active_thread_count_++; + } + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Session::start, ignored"); + } + ACE_ENDTRY; + } + + if (this->active_thread_count_ != this->thread_count_) + return; + + this->barrier_.wait (); + + if (this->running_ != 0) + return; + } + /// None of the threads are running, this session is useless at + /// this point, report the problem and destroy the local objects + this->terminate (0, ACE_TRY_ENV); +} + +void +Session::ping (CORBA::Environment &) ACE_THROW_SPEC (()) +{ +} + +void +Session::receive_payload (const Test::Payload &the_payload, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + if (the_payload.length () != this->payload_size_) + { + ACE_ERROR ((LM_ERROR, + "ERROR: (%P|%t) Session::receive_payload, " + "unexpected payload size (%d != %d)\n", + the_payload.length (), this->payload_size_)); + } + + { + ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); + this->expected_messages_--; + + int verbose = 0; +#if 0 + verbose = this->expected_messages_ % 500 == 0; + if (this->expected_messages_ < 500) + verbose = (this->expected_messages_ % 100 == 0); + if (this->expected_messages_ < 100) + verbose = (this->expected_messages_ % 10 == 0); +#endif /* 0 */ + if (this->expected_messages_ < 5) + verbose = 1; + + if (verbose) + { + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Session::receive_payload, " + "%d messages to go\n", + this->expected_messages_)); + } + if (this->more_work ()) + return; + } + this->terminate (1, ACE_TRY_ENV); +} + + +void +Session::destroy (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Make sure local resources are released + + PortableServer::POA_var poa = + this->_default_POA (ACE_TRY_ENV); + ACE_CHECK; + PortableServer::ObjectId_var oid = + poa->servant_to_id (this, ACE_TRY_ENV); + ACE_CHECK; + poa->deactivate_object (oid.in (), ACE_TRY_ENV); + ACE_CHECK; +} + +int +Session::more_work (void) const +{ + if (this->expected_messages_ > 0 + || this->active_thread_count_ > 0 + || this->running_ == 0) + return 1; + + return 0; +} + +void +Session::terminate (CORBA::Boolean success, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC (()) +{ + // Make sure that global resources are released + ACE_TRY_EX(GLOBAL) + { + this->control_->session_finished (success, + ACE_TRY_ENV); + ACE_TRY_CHECK_EX(GLOBAL); + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Session::terminate, ignored"); + } + ACE_ENDTRY; + +} diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h new file mode 100644 index 00000000000..71a05cbe5d1 --- /dev/null +++ b/TAO/tests/Big_Oneways/Session.h @@ -0,0 +1,110 @@ +// +// $Id$ +// + +#ifndef BIG_ONEWAYS_SESSION_H +#define BIG_ONEWAYS_SESSION_H +#include "ace/pre.h" + +#include "TestS.h" +#include "Session_Task.h" + +#if defined (_MSC_VER) +# if (_MSC_VER >= 1200) +# pragma warning(push) +# endif /* _MSC_VER >= 1200 */ +# pragma warning (disable:4250) +#endif /* _MSC_VER */ + +/// Implement the Test::Session interface +class Session + : public virtual POA_Test::Session + , public virtual PortableServer::RefCountServantBase +{ +public: + /// Constructor + Session (Test::Session_Control_ptr control, + CORBA::ULong payload_size, + CORBA::ULong thread_count, + CORBA::ULong message_count, + CORBA::ULong peer_count); + + /// Destructor + virtual ~Session (void); + + /// Run one of the experiment threads + int svc (void); + + // = The skeleton methods + virtual void start (const Test::Session_List &other_sessions, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + Test::Already_Running, + Test::No_Peers)); + + virtual void ping (CORBA::Environment &) ACE_THROW_SPEC (()); + + virtual void receive_payload (const Test::Payload &the_payload, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual void destroy (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + /// Helper function used to report any problems and destroy local + /// resources + void terminate (CORBA::Boolean success, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC (()); + + /// Return 1 if all the work in this session has been completed + int more_work (void) const; + + /// Make sure that all threads have connections avaiable to the + /// other sessions. + void validate_connections (CORBA::Environment &ACE_TRY_ENV); + +private: + /// Synchronize the internal state + ACE_SYNCH_MUTEX mutex_; + + /// Keep a reference to the Session_Control, this is used to report + /// when the test finishes. + Test::Session_Control_var control_; + + /// Keep track of wether the test is running. + int running_; + + /// The other session objects participating in the test + Test::Session_List other_sessions_; + + /// Size of each message + CORBA::ULong payload_size_; + + /// Number of threads + CORBA::ULong thread_count_; + + /// Number of messages to send + CORBA::ULong message_count_; + + /// The number of threads currently running, when this reaches 0 the + /// session destroys itself. + CORBA::ULong active_thread_count_; + + /// Number of messages expected + CORBA::ULong expected_messages_; + + /// Helper class to run svc() in a separate thread + Session_Task task_; + + /// Barrier to start all threads simultaenously + ACE_Thread_Barrier barrier_; +}; + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +# pragma warning(pop) +#endif /* _MSC_VER */ + +#include "ace/post.h" +#endif /* BIG_ONEWAYS_SESSION_H */ diff --git a/TAO/tests/Big_Oneways/Session_Control.cpp b/TAO/tests/Big_Oneways/Session_Control.cpp new file mode 100644 index 00000000000..f0f5c3bd4b4 --- /dev/null +++ b/TAO/tests/Big_Oneways/Session_Control.cpp @@ -0,0 +1,75 @@ +// +// $Id$ +// +#include "Session_Control.h" + +ACE_RCSID(Big_Oneways, Session_Control, "$Id$") + +Session_Control::Session_Control (CORBA::ULong session_count) + : session_count_ (session_count) + , success_ (1) +{ +} + +int +Session_Control::all_sessions_finished (void) const +{ + return this->session_count_ == 0; +} + +Session_Control::~Session_Control (void) +{ + if (this->session_count_ == 0 && this->success_) + { + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Session_Control::~Session_control, " + " good, all sessions did finish\n")); + } + else if (session_count_ != 0) + { + ACE_ERROR ((LM_ERROR, + "ERROR: (%P|%t) Session_Control::~Session_control, " + " %d sessions did not finish\n", + this->session_count_)); + } + else + { + ACE_ERROR ((LM_ERROR, + "ERROR: (%P|%t) Session_Control::~Session_control, " + " some sessions failed\n")); + } +} + +void +Session_Control::session_finished (CORBA::Boolean success, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); + if (this->session_count_ == 0) + { + ACE_ERROR ((LM_ERROR, + "ERROR: (%P|%t) Session_Control::session_finished, " + "unexpected callback\n")); + } + if (success == 0) + this->success_ = 0; + + this->session_count_--; + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Session_Control::session_finished, " + "%d sessions to go\n", + this->session_count_)); + if (session_count_ == 0) + { + PortableServer::POA_var poa = + this->_default_POA (ACE_TRY_ENV); + ACE_CHECK; + PortableServer::ObjectId_var oid = + poa->servant_to_id (this, ACE_TRY_ENV); + ACE_CHECK; + poa->deactivate_object (oid.in (), ACE_TRY_ENV); + ACE_CHECK; + } + +} diff --git a/TAO/tests/Big_Oneways/Session_Control.h b/TAO/tests/Big_Oneways/Session_Control.h new file mode 100644 index 00000000000..09c19dbaaba --- /dev/null +++ b/TAO/tests/Big_Oneways/Session_Control.h @@ -0,0 +1,57 @@ +// +// $Id$ +// + +#ifndef BIG_ONEWAYS_SESSION_CONTROL_H +#define BIG_ONEWAYS_SESSION_CONTROL_H +#include "ace/pre.h" + +#include "TestS.h" + +#if defined (_MSC_VER) +# if (_MSC_VER >= 1200) +# pragma warning(push) +# endif /* _MSC_VER >= 1200 */ +# pragma warning (disable:4250) +#endif /* _MSC_VER */ + +/// Implement the Test::Session_Control interface +class Session_Control + : public virtual POA_Test::Session_Control + , public virtual PortableServer::RefCountServantBase +{ +public: + /// Constructor + /** + * @param session_count Number of session objects in the experiment. + */ + Session_Control (CORBA::ULong session_count); + + /// Destructor + virtual ~Session_Control (void); + + /// Return 1 when all sessions have finished + int all_sessions_finished (void) const; + + // = The skeleton methods + virtual void session_finished (CORBA::Boolean success, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + /// Synchronize the internal state + ACE_SYNCH_MUTEX mutex_; + + /// The type of test + CORBA::ULong session_count_; + + /// Set to falso if any session reported a failure + CORBA::Boolean success_; +}; + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +# pragma warning(pop) +#endif /* _MSC_VER */ + +#include "ace/post.h" +#endif /* BIG_ONEWAYS_SESSION_CONTROL_H */ diff --git a/TAO/tests/Big_Oneways/Session_Task.cpp b/TAO/tests/Big_Oneways/Session_Task.cpp new file mode 100644 index 00000000000..bd992a66e5d --- /dev/null +++ b/TAO/tests/Big_Oneways/Session_Task.cpp @@ -0,0 +1,19 @@ +// +// $Id$ +// + +#include "Session_Task.h" +#include "Session.h" + +ACE_RCSID(Big_Oneways, Session_Task, "$Id$") + +Session_Task::Session_Task (Session *session) + : session_ (session) +{ +} + +int +Session_Task::svc (void) +{ + return this->session_->svc (); +} diff --git a/TAO/tests/Big_Oneways/Session_Task.h b/TAO/tests/Big_Oneways/Session_Task.h new file mode 100644 index 00000000000..2ef3bf69925 --- /dev/null +++ b/TAO/tests/Big_Oneways/Session_Task.h @@ -0,0 +1,33 @@ +// +// $Id$ +// + +#ifndef BIG_ONEWAYS_SESSION_TASK_H +#define BIG_ONEWAYS_SESSION_TASK_H +#include "ace/pre.h" + +#include "ace/Task.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class Session; + +/// Implement a Task to run the experiments using multiple threads. +class Session_Task : public ACE_Task_Base +{ +public: + /// Constructor + Session_Task (Session *session); + + /// Thread entry point + int svc (void); + +private: + /// Reference to the test interface + Session *session_; +}; + +#include "ace/post.h" +#endif /* BIG_ONEWAYS_SESSION_TASK_H */ diff --git a/TAO/tests/Big_Oneways/Test.idl b/TAO/tests/Big_Oneways/Test.idl new file mode 100644 index 00000000000..60065cf85fc --- /dev/null +++ b/TAO/tests/Big_Oneways/Test.idl @@ -0,0 +1,83 @@ +// +// $Id$ +// + +module Test +{ + /// The message type, just used to send a lot of data on each + /// request + typedef sequence<octet> Payload; + + /// A session is a single instance of the test + interface Session; + typedef sequence<Session> Session_List; + + /// A session control is used to determine if all the Session in an + /// experiment have finished. + /** + * @param success If false then the session failed, the experiment + * is successful only if all sessions finish successfully + */ + interface Session_Control + { + void session_finished (in boolean success); + }; + + /// A Peer is used to create sessions + interface Peer + { + /// Create a new session + /** + * @param payload_size The size of each message + * @param thread_count The number of threads that each session + * must create + * @param message_count How many messages does each thread send. + */ + Session create_session (in Session_Control control, + in unsigned long payload_size, + in unsigned long thread_count, + in unsigned long message_count, + in unsigned long peer_count); + + /// Shutdown the peer + oneway void shutdown (); + }; + + /// The Session already has an experiment running. + exception Already_Running {}; + + /// The experiment requires at least two Sessions + exception No_Peers {}; + + interface Session + { + /// Start the test, send messages to all the peers + /** + * @param other_sessions The list of sessions participating in the + * experiment, this list must not include the session + * receiving the start() call. + */ + void start (in Session_List other_sessions) + raises (Already_Running, No_Peers); + + /// Ping the session, used to validate all connections + void ping (); + + /// Receive the payload + oneway void receive_payload (in Payload the_payload); + + /// Destroy the Session object + void destroy (); + }; + + interface Coordinator + { + /// Add a new peer. + /** + * The coordinator starts the test by calling <send_oneways> on + * all peers. How does it decide to do that is application + * specific. + */ + void add_peer (in Peer the_peer); + }; +}; diff --git a/TAO/tests/Big_Oneways/client.cpp b/TAO/tests/Big_Oneways/client.cpp new file mode 100644 index 00000000000..542c9ed70ed --- /dev/null +++ b/TAO/tests/Big_Oneways/client.cpp @@ -0,0 +1,116 @@ +// $Id$ + +#include "Peer.h" +#include "ace/Get_Opt.h" +#include "ace/Thread_Manager.h" + +ACE_RCSID(Big_Oneways, client, "$Id$") + +const char *ior = "file://test.ior"; + +int +parse_args (int argc, char *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, "k:"); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'k': + ior = get_opts.optarg; + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-k <ior> " + "\n", + argv [0]), + -1); + } + // Indicates sucessful parsing of the command line + return 0; +} + +int +main (int argc, char *argv[]) +{ + ACE_TRY_NEW_ENV + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + ACE_TRY_CHECK; + + CORBA::Object_var poa_object = + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (CORBA::is_nil (poa_object.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Panic got a nil RootPOA\n"), + 1); + + PortableServer::POAManager_var poa_manager = + root_poa->the_POAManager (ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (parse_args (argc, argv) != 0) + return 1; + + CORBA::Object_var tmp = + orb->string_to_object(ior, ACE_TRY_ENV); + ACE_TRY_CHECK; + + Test::Coordinator_var coordinator = + Test::Coordinator::_narrow(tmp.in (), ACE_TRY_ENV); + if (CORBA::is_nil (coordinator.in ())) + { + ACE_ERROR_RETURN ((LM_DEBUG, + "Nil coordinator reference <%s>\n", + ior), + 1); + } + + Peer *peer_impl; + ACE_NEW_RETURN (peer_impl, + Peer (orb.in ()), + 1); + PortableServer::ServantBase_var peer_owner_transfer(peer_impl); + + Test::Peer_var peer = + peer_impl->_this (ACE_TRY_ENV); + + poa_manager->activate (ACE_TRY_ENV); + ACE_TRY_CHECK; + + coordinator->add_peer (peer.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + orb->run (ACE_TRY_ENV); + ACE_TRY_CHECK; + + // Wait for all the threads. + ACE_Thread_Manager::instance ()->wait (); + + root_poa->destroy (1, 1, ACE_TRY_ENV); + ACE_TRY_CHECK; + + orb->destroy (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Exception caught:"); + return 1; + } + ACE_ENDTRY; + + return 0; +} diff --git a/TAO/tests/Big_Oneways/client.dsp b/TAO/tests/Big_Oneways/client.dsp new file mode 100644 index 00000000000..46f4d73be04 --- /dev/null +++ b/TAO/tests/Big_Oneways/client.dsp @@ -0,0 +1,232 @@ +# Microsoft Developer Studio Project File - Name="Big_Oneways Client" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Big_Oneways Client - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "client.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "client.mak" CFG="Big_Oneways Client - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "Big_Oneways Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Big_Oneways Client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "Big_Oneways Client - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 TAO.lib TAO_PortableServer.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+
+!ELSEIF "$(CFG)" == "Big_Oneways Client - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 TAOd.lib TAO_PortableServerd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+
+!ENDIF
+
+# Begin Target
+
+# Name "Big_Oneways Client - Win32 Release"
+# Name "Big_Oneways Client - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ".cpp"
+# Begin Source File
+
+SOURCE=.\client.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Peer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Session.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Session_Task.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestS.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ".h"
+# Begin Source File
+
+SOURCE=.\Peer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Session.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Session_Task.h
+# End Source File
+# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter ".idl"
+# Begin Source File
+
+SOURCE=.\Test.idl
+
+!IF "$(CFG)" == "Big_Oneways Client - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
+InputPath=.\Test.idl
+InputName=Test
+
+BuildCmds= \
+ ..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "Big_Oneways Client - Win32 Debug"
+
+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
+InputPath=.\Test.idl
+InputName=Test
+
+BuildCmds= \
+ ..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter ".i"
+# Begin Source File
+
+SOURCE=.\TestC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestS.i
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/tests/Big_Oneways/run_test.pl b/TAO/tests/Big_Oneways/run_test.pl new file mode 100755 index 00000000000..a272f7d976d --- /dev/null +++ b/TAO/tests/Big_Oneways/run_test.pl @@ -0,0 +1,78 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib '../../../bin'; +use PerlACE::Run_Test; +use Getopt::Std; + +local ($opt_i, $opt_b); + +if (!getopts ('i:b:')) { + print "Usage: run_test.pl [-b payload_size] [-i iterations]\n"; + exit 1; +} + +my $server_args = " -p 3"; +if (defined $opt_i) { + $server_args .= " -i ".$opt_i; +} +if (defined $opt_b) { + $server_args .= " -b ".$opt_b; +} + +$iorfile = PerlACE::LocalFile ("server.ior"); + +unlink $iorfile; +$SV = new PerlACE::Process ("server", "-o $iorfile $server_args"); +$CL1 = new PerlACE::Process ("client", " -k file://$iorfile"); +$CL2 = new PerlACE::Process ("client", " -k file://$iorfile"); +$CL3 = new PerlACE::Process ("client", " -k file://$iorfile"); + + +$SV->Spawn (); + +if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$CL1->Spawn (); +$CL2->Spawn (); +$CL3->Spawn (); + +$client1 = $CL1->WaitKill (300); + +if ($client1 != 0) { + print STDERR "ERROR: client 1 returned $client1\n"; + $status = 1; +} + +$client2 = $CL2->WaitKill (300); + +if ($client2 != 0) { + print STDERR "ERROR: client 2 returned $client2\n"; + $status = 1; +} + +$client3 = $CL3->WaitKill (300); + +if ($client3 != 0) { + print STDERR "ERROR: client 3 returned $client3\n"; + $status = 1; +} + +$server = $SV->TerminateWaitKill (5); + +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; +} + +unlink $iorfile; + +exit $status; diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp new file mode 100644 index 00000000000..b09e4283d0c --- /dev/null +++ b/TAO/tests/Big_Oneways/server.cpp @@ -0,0 +1,218 @@ +// $Id$ + +#include "Coordinator.h" +#include "Session_Control.h" +#include "ace/Get_Opt.h" + +ACE_RCSID(Big_Oneways, server, "$Id$") + +const char *ior_output_file = "test.ior"; +CORBA::ULong peer_count = 4; +CORBA::ULong payload_size = 1024; +CORBA::ULong message_count = 1000; +CORBA::ULong thread_count = 4; + +int +parse_args (int argc, char *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, "o:p:b:i:n:"); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'o': + ior_output_file = get_opts.optarg; + break; + + case 'p': + peer_count = ACE_OS::atoi (get_opts.optarg); + break; + + case 'b': + payload_size = ACE_OS::atoi (get_opts.optarg); + break; + + case 'i': + message_count = ACE_OS::atoi (get_opts.optarg); + break; + + case 'n': + thread_count = ACE_OS::atoi (get_opts.optarg); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-o <iorfile> " + "-p <peer_count> " + "-b <payload_size> " + "-i <message_count> " + "-n <thread_count> " + "\n", + argv [0]), + -1); + } + // Indicates sucessful parsing of the command line + return 0; +} + +int +main (int argc, char *argv[]) +{ + ACE_TRY_NEW_ENV + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + ACE_TRY_CHECK; + + CORBA::Object_var poa_object = + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (CORBA::is_nil (poa_object.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Panic got a nil RootPOA\n"), + 1); + + PortableServer::POAManager_var poa_manager = + root_poa->the_POAManager (ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (parse_args (argc, argv) != 0) + return 1; + + Coordinator *coordinator_impl; + ACE_NEW_RETURN (coordinator_impl, + Coordinator (peer_count), + 1); + PortableServer::ServantBase_var coordinator_owner_transfer(coordinator_impl); + + Test::Coordinator_var coordinator = + coordinator_impl->_this (ACE_TRY_ENV); + + CORBA::String_var ior = + orb->object_to_string (coordinator.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + // If the ior_output_file exists, output the ior to it + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s", + ior_output_file), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); + + poa_manager->activate (ACE_TRY_ENV); + ACE_TRY_CHECK; + + ACE_DEBUG ((LM_DEBUG, "Waiting for peers . . . ")); + for (int i = 0; + i != 60 && !coordinator_impl->has_all_peers (); + ++i) + { + ACE_Time_Value tv (1, 0); + orb->run (tv, ACE_TRY_ENV); + } + ACE_DEBUG ((LM_DEBUG, "done.\n")); + + if (!coordinator_impl->has_all_peers ()) + { + ACE_ERROR ((LM_DEBUG, + "ERROR: timeout, some peers failed to register\n")); + return 1; + } + + Session_Control *session_control_impl; + ACE_NEW_RETURN (session_control_impl, + Session_Control (peer_count), + 1); + PortableServer::ServantBase_var session_control_owner_transfer(session_control_impl); + + Test::Session_Control_var session_control = + session_control_impl->_this (ACE_TRY_ENV); + + Test::Session_List session_list; + coordinator_impl->create_session_list (session_control.in (), + payload_size, + thread_count, + message_count, + session_list, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + ACE_ASSERT (session_list.length () == peer_count); + + CORBA::ULong j; + for (j = 0; j != peer_count; ++j) + { + // Make a copy of the sessions, excluding the j-th element + Test::Session_List other_sessions (peer_count - 1); + other_sessions.length (peer_count - 1); + CORBA::ULong count = 0; + for (CORBA::ULong k = 0; k != peer_count; ++k) + { + if (k == j) + continue; + other_sessions[count++] = + Test::Session::_duplicate (session_list[k]); + } + + session_list[j]->start (other_sessions, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + } + + ACE_DEBUG ((LM_DEBUG, "Waiting for sessions . . . \n")); + for (int k = 0; + k != 300 && !session_control_impl->all_sessions_finished (); + ++k) + { + ACE_Time_Value tv (1, 0); + orb->run (tv, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + + if (!session_control_impl->all_sessions_finished ()) + { + ACE_ERROR ((LM_ERROR, + "ERROR: timeout waiting for sessions\n")); + return 1; + } + + ACE_DEBUG ((LM_DEBUG, "All sessions finished . . . \n")); + + for (j = 0; j != peer_count; ++j) + { + session_list[j]->destroy (ACE_TRY_ENV); + ACE_TRY_CHECK; + + } + + coordinator_impl->shutdown_all_peers (ACE_TRY_ENV); + ACE_TRY_CHECK; + + root_poa->destroy (1, 1, ACE_TRY_ENV); + ACE_TRY_CHECK; + + orb->destroy (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Exception caught:"); + return 1; + } + ACE_ENDTRY; + + return 0; +} diff --git a/TAO/tests/Big_Oneways/server.dsp b/TAO/tests/Big_Oneways/server.dsp new file mode 100644 index 00000000000..5c8ad88f157 --- /dev/null +++ b/TAO/tests/Big_Oneways/server.dsp @@ -0,0 +1,224 @@ +# Microsoft Developer Studio Project File - Name="Big_Oneways Server" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Big_Oneways Server - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "server.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "server.mak" CFG="Big_Oneways Server - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "Big_Oneways Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Big_Oneways Server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "Big_Oneways Server - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 TAO.lib TAO_PortableServer.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+
+!ELSEIF "$(CFG)" == "Big_Oneways Server - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 TAOd.lib TAO_PortableServerd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+
+!ENDIF
+
+# Begin Target
+
+# Name "Big_Oneways Server - Win32 Release"
+# Name "Big_Oneways Server - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ".cpp"
+# Begin Source File
+
+SOURCE=.\Coordinator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\server.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Session_Control.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestS.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ".h"
+# Begin Source File
+
+SOURCE=.\Coordinator.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Session_Control.h
+# End Source File
+# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter ".idl"
+# Begin Source File
+
+SOURCE=.\Test.idl
+
+!IF "$(CFG)" == "Big_Oneways Server - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
+InputPath=.\Test.idl
+InputName=Test
+
+BuildCmds= \
+ ..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "Big_Oneways Server - Win32 Debug"
+
+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
+InputPath=.\Test.idl
+InputName=Test
+
+BuildCmds= \
+ ..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter ".i"
+# Begin Source File
+
+SOURCE=.\TestC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestS.i
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Modify_QoS.dsw b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.dsw index 11d34f19656..8d2d7675f89 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Modify_QoS.dsw +++ b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ###############################################################################
-Project: "sender"=.\sender.dsp - Package Owner=<4>
+Project: "Big_Request_Muxing Client"=.\client.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -15,7 +15,7 @@ Package=<4> ###############################################################################
-Project: "receiver"=.\receiver.dsp - Package Owner=<4>
+Project: "Big_Request_Muxing Server"=.\server.dsp - Package Owner=<4>
Package=<5>
{{{
diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.cpp b/TAO/tests/Big_Request_Muxing/Client_Task.cpp new file mode 100644 index 00000000000..cdb06663c5e --- /dev/null +++ b/TAO/tests/Big_Request_Muxing/Client_Task.cpp @@ -0,0 +1,89 @@ +// +// $Id$ +// + +#include "Client_Task.h" + +ACE_RCSID(Big_Request_Muxing, Client_Task, "$Id$") + +Client_Task::Client_Task (ACE_Thread_Manager *thr_mgr, + Test::Payload_Receiver_ptr payload_receiver, + CORBA::Long event_count, + CORBA::ULong event_size, + CORBA::ORB_ptr orb, + Messaging::SyncScope sync_scope) + : ACE_Task_Base (thr_mgr) + , payload_receiver_ (Test::Payload_Receiver::_duplicate (payload_receiver)) + , event_count_ (event_count) + , event_size_ (event_size) + , orb_ (CORBA::ORB::_duplicate (orb)) + , sync_scope_ (sync_scope) +{ +} + +int +Client_Task::svc (void) +{ + Test::Payload payload (this->event_size_); + payload.length (this->event_size_); + + for (CORBA::ULong j = 0; j != payload.length (); ++j) + payload[j] = (j % 256); + + ACE_DECLARE_NEW_CORBA_ENV; + ACE_TRY + { + this->validate_connection (ACE_TRY_ENV); + ACE_TRY_CHECK; + + CORBA::Object_var object = + this->orb_->resolve_initial_references ("PolicyCurrent", + ACE_TRY_ENV); + ACE_TRY_CHECK; + CORBA::PolicyCurrent_var policy_current = + CORBA::PolicyCurrent::_narrow (object.in (), ACE_TRY_ENV); + + CORBA::Any scope_as_any; + scope_as_any <<= this->sync_scope_; + + + CORBA::PolicyList policy_list (1); + policy_list.length (1); + policy_list[0] = + this->orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, + scope_as_any, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + policy_current->set_policy_overrides (policy_list, + CORBA::ADD_OVERRIDE, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + for (int i = 0; i != this->event_count_; ++i) + { + this->payload_receiver_->more_data (payload, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + } + ACE_CATCHANY + { + return -1; + } + ACE_ENDTRY; + return 0; +} + +void +Client_Task::validate_connection (CORBA::Environment &ACE_TRY_ENV) +{ + ACE_TRY + { + for (int i = 0; i != 100; ++i) + { + (void) this->payload_receiver_->get_message_count (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + } + ACE_CATCHANY {} ACE_ENDTRY; +} diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.h b/TAO/tests/Big_Request_Muxing/Client_Task.h new file mode 100644 index 00000000000..8bb3bc69cfb --- /dev/null +++ b/TAO/tests/Big_Request_Muxing/Client_Task.h @@ -0,0 +1,56 @@ +// +// $Id$ +// + +#ifndef BIG_REQUEST_MUXING_CLIENT_TASK_H +#define BIG_REQUEST_MUXING_CLIENT_TASK_H +#include "ace/pre.h" + +#include "TestC.h" +// #include "tao/Messaging.h" +#include "ace/Task.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +/// Implement a Task to run the experiments using multiple threads. +class Client_Task : public ACE_Task_Base +{ +public: + /// Constructor + Client_Task (ACE_Thread_Manager *thr_mgr, + Test::Payload_Receiver_ptr receiver, + CORBA::Long event_count, + CORBA::ULong event_size, + CORBA::ORB_ptr orb, + Messaging::SyncScope sync_scope); + + /// Thread entry point + int svc (void); + +private: + /// Make sure that all threads have connections available to + /// workaround bug 189 + void validate_connection (CORBA::Environment &ACE_TRY_ENV); + +private: + /// Reference to the test interface + Test::Payload_Receiver_var payload_receiver_; + + /// Total number of events + CORBA::Long event_count_; + + /// Size of each message + CORBA::ULong event_size_; + + /// Keep a reference to the ORB, used to initialize the SyncScope + /// policy + CORBA::ORB_var orb_; + + /// The SyncScope used in this Task + Messaging::SyncScope sync_scope_; +}; + +#include "ace/post.h" +#endif /* BIG_REQUEST_MUXING_CLIENT_TASK_H */ diff --git a/TAO/tests/Big_Request_Muxing/Makefile b/TAO/tests/Big_Request_Muxing/Makefile new file mode 100644 index 00000000000..54f2eb56db7 --- /dev/null +++ b/TAO/tests/Big_Request_Muxing/Makefile @@ -0,0 +1,1173 @@ +#---------------------------------------------------------------------------- +# +# $Id$ +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +ifndef TAO_ROOT + TAO_ROOT = $(ACE_ROOT)/TAO +endif # ! TAO_ROOT + +LDLIBS = -lTAO + +IDL_FILES = Test +IDL_SRC = TestC.cpp TestS.cpp +BIN = server client + +SRC = $(addsuffix .cpp, $(BIN) Client_Task Payload_Receiver) $(IDL_SRC) + +CLIENT_OBJS = client.o TestC.o Client_Task.o +SERVER_OBJS = server.o TestC.o TestS.o Payload_Receiver.o + +TAO_IDLFLAGS += -Ge 1 +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(TAO_ROOT)/rules.tao.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +include $(TAO_ROOT)/taoconfig.mk + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- + +.PRECIOUS: $(foreach ext, $(IDL_EXT), Test$(ext)) + +server: $(addprefix $(VDIR),$(SERVER_OBJS)) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) + +client: $(addprefix $(VDIR),$(CLIENT_OBJS)) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) + +realclean: clean + -$(RM) $(foreach ext, $(IDL_EXT), Test$(ext)) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Payload_Receiver.h \ + $(ACE_ROOT)/ace/pre.h \ + TestS.h TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + TestS_T.h TestS_T.cpp TestS_T.i \ + $(ACE_ROOT)/ace/Get_Opt.h + +.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Client_Task.h \ + $(ACE_ROOT)/ace/pre.h \ + TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Get_Opt.h + +.obj/Client_Task.o .obj/Client_Task.so .shobj/Client_Task.o .shobj/Client_Task.so: Client_Task.cpp Client_Task.h \ + $(ACE_ROOT)/ace/pre.h \ + TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Task_T.i + +.obj/Payload_Receiver.o .obj/Payload_Receiver.so .shobj/Payload_Receiver.o .shobj/Payload_Receiver.so: Payload_Receiver.cpp Payload_Receiver.h \ + $(ACE_ROOT)/ace/pre.h \ + TestS.h TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + TestS_T.h TestS_T.cpp TestS_T.i + +.obj/TestC.o .obj/TestC.so .shobj/TestC.o .shobj/TestC.so: TestC.cpp TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/RequestInfo_Util.h \ + TestC.i + +.obj/TestS.o .obj/TestS.so .shobj/TestS.o .shobj/TestS.so: TestS.cpp TestS.h TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + TestS_T.h TestS_T.cpp TestS_T.i \ + $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ + $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ + $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/RequestInfo_Util.h \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(ACE_ROOT)/ace/Dynamic_Service.i \ + TestS.i + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp new file mode 100644 index 00000000000..a4179b53960 --- /dev/null +++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp @@ -0,0 +1,28 @@ +// +// $Id$ +// +#include "Payload_Receiver.h" + +ACE_RCSID(Big_Request_Muxing, Payload_Receiver, "$Id$") + +Payload_Receiver::Payload_Receiver (void) + : message_count_ (0) + , byte_count_ (0) +{ +} + +void +Payload_Receiver::more_data (const Test::Payload &payload, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->message_count_++; + this->byte_count_ += payload.length (); +} + +CORBA::Long +Payload_Receiver::get_message_count (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return this->message_count_; +} diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h new file mode 100644 index 00000000000..73787c62451 --- /dev/null +++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h @@ -0,0 +1,50 @@ +// +// $Id$ +// + +#ifndef BIG_REQUEST_MUXING_PAYLOAD_RECEIVER_H +#define BIG_REQUEST_MUXING_PAYLOAD_RECEIVER_H +#include "ace/pre.h" + +#include "TestS.h" + +#if defined (_MSC_VER) +# if (_MSC_VER >= 1200) +# pragma warning(push) +# endif /* _MSC_VER >= 1200 */ +# pragma warning (disable:4250) +#endif /* _MSC_VER */ + +/// Implement the Test::Payload_Receiver interface +/** + * Simply print count how many bytes were received. + */ +class Payload_Receiver + : public virtual POA_Test::Payload_Receiver + , public virtual PortableServer::RefCountServantBase +{ +public: + /// Constructor + Payload_Receiver (void); + + // = The skeleton methods + virtual void more_data (const Test::Payload &payload, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long get_message_count (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + /// Count the number of messages received + CORBA::ULong message_count_; + + /// Count the number of bytes received + CORBA::ULong byte_count_; +}; + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +# pragma warning(pop) +#endif /* _MSC_VER */ + +#include "ace/post.h" +#endif /* BIG_REQUEST_MUXING_PAYLOAD_RECEIVER_H */ diff --git a/TAO/tests/Big_Request_Muxing/README b/TAO/tests/Big_Request_Muxing/README new file mode 100644 index 00000000000..227c7d2ce71 --- /dev/null +++ b/TAO/tests/Big_Request_Muxing/README @@ -0,0 +1,24 @@ +/** + +@page Big_Request_Muxing Test README File + + This is a stress test for the non-blocking I/O features in the +ORB when used to send oneways and reliable oneways. A client process +creates multiple threads, each thread sends (large) oneway requests +with different levels of reliability. The main thread runs the ORB +event loop. The thread also configures connection muxing in the ORB, +forcing all the threads to share the same connection. This level of +concurrency is designed to test as many code sequences in the ORB +output data as possible. + + This is part of the regression testsuite for: + +http://ace.cs.wustl.edu/bugzilla/show_bug.cgi?id=132 + + To run the test use the run_test.pl script: + +$ ./run_test.pl + + the script returns 0 if the test was successful. + +*/ diff --git a/TAO/tests/Big_Request_Muxing/Test.idl b/TAO/tests/Big_Request_Muxing/Test.idl new file mode 100644 index 00000000000..167d8513c63 --- /dev/null +++ b/TAO/tests/Big_Request_Muxing/Test.idl @@ -0,0 +1,17 @@ +// +// $Id$ +// + +module Test +{ + typedef sequence<octet> Payload; + + interface Payload_Receiver + { + /// Send the data using a twoway operat + oneway void more_data (in Payload the_payload); + + /// Return the number of messages received so far + long get_message_count (); + }; +}; diff --git a/TAO/tests/Big_Request_Muxing/client.cpp b/TAO/tests/Big_Request_Muxing/client.cpp new file mode 100644 index 00000000000..38a06a91e97 --- /dev/null +++ b/TAO/tests/Big_Request_Muxing/client.cpp @@ -0,0 +1,123 @@ +// $Id$ + +#include "Client_Task.h" +#include "ace/Get_Opt.h" + +ACE_RCSID(Muxing, client, "$Id$") + +const char *ior = "file://test.ior"; + +int +parse_args (int argc, char *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, "k:"); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'k': + ior = get_opts.optarg; + break; + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-k <ior>" + "\n", + argv [0]), + -1); + } + // Indicates sucessful parsing of the command line + return 0; +} + +int +main (int argc, char *argv[]) +{ + ACE_TRY_NEW_ENV + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (parse_args (argc, argv) != 0) + return 1; + + CORBA::Object_var tmp = + orb->string_to_object(ior, ACE_TRY_ENV); + ACE_TRY_CHECK; + + Test::Payload_Receiver_var payload_receiver = + Test::Payload_Receiver::_narrow(tmp.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (CORBA::is_nil (payload_receiver.in ())) + { + ACE_ERROR_RETURN ((LM_DEBUG, + "Nil coordinator reference <%s>\n", + ior), + 1); + } + + + Client_Task task0 (ACE_Thread_Manager::instance (), + payload_receiver.in (), + 1000, + 4096, + orb.in (), + Messaging::SYNC_WITH_TARGET); + Client_Task task1 (ACE_Thread_Manager::instance (), + payload_receiver.in (), + 1000, + 4096, + orb.in (), + Messaging::SYNC_WITH_TRANSPORT); + Client_Task task2 (ACE_Thread_Manager::instance (), + payload_receiver.in (), + 1000, + 4096, + orb.in (), + Messaging::SYNC_NONE); + + ACE_DEBUG ((LM_DEBUG, "(%P) Activating threads\n")); + if (task0.activate (THR_NEW_LWP | THR_JOINABLE, 2, 1) == -1) + { + ACE_ERROR ((LM_ERROR, "Error activating client task\n")); + } + if (task1.activate (THR_NEW_LWP | THR_JOINABLE, 2, 1) == -1) + { + ACE_ERROR ((LM_ERROR, "Error activating client task\n")); + } + if (task2.activate (THR_NEW_LWP | THR_JOINABLE, 2, 1) == -1) + { + ACE_ERROR ((LM_ERROR, "Error activating client task\n")); + } + + ACE_Time_Value tv (120, 0); + orb->run (tv, ACE_TRY_ENV); + ACE_TRY_CHECK; + + ACE_Thread_Manager::instance ()->wait (); + ACE_DEBUG ((LM_DEBUG, "(%P) Threads finished\n")); + + CORBA::Long count = + payload_receiver->get_message_count (ACE_TRY_ENV); + ACE_TRY_CHECK; + + ACE_DEBUG ((LM_DEBUG, "(%P) - Payload_Receiver got %d messages\n", + count)); + + orb->destroy (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Exception caught:"); + return 1; + } + ACE_ENDTRY; + + return 0; +} diff --git a/TAO/tests/Big_Request_Muxing/client.dsp b/TAO/tests/Big_Request_Muxing/client.dsp new file mode 100644 index 00000000000..cdef9e7e7f6 --- /dev/null +++ b/TAO/tests/Big_Request_Muxing/client.dsp @@ -0,0 +1,212 @@ +# Microsoft Developer Studio Project File - Name="Big_Request_Muxing Client" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Big_Request_Muxing Client - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "client.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "client.mak" CFG="Big_Request_Muxing Client - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "Big_Request_Muxing Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Big_Request_Muxing Client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "Big_Request_Muxing Client - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 TAO.lib TAO_PortableServer.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+
+!ELSEIF "$(CFG)" == "Big_Request_Muxing Client - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 TAOd.lib TAO_PortableServerd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+
+!ENDIF
+
+# Begin Target
+
+# Name "Big_Request_Muxing Client - Win32 Release"
+# Name "Big_Request_Muxing Client - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ".cpp"
+# Begin Source File
+
+SOURCE=.\client.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Client_Task.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestC.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ".h"
+# Begin Source File
+
+SOURCE=.\Client_Task.h
+# End Source File
+# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter ".idl"
+# Begin Source File
+
+SOURCE=.\Test.idl
+
+!IF "$(CFG)" == "Big_Request_Muxing Client - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
+InputPath=.\Test.idl
+InputName=Test
+
+BuildCmds= \
+ ..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "Big_Request_Muxing Client - Win32 Debug"
+
+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
+InputPath=.\Test.idl
+InputName=Test
+
+BuildCmds= \
+ ..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter ".i"
+# Begin Source File
+
+SOURCE=.\TestC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestS.i
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/tests/Big_Request_Muxing/run_test.pl b/TAO/tests/Big_Request_Muxing/run_test.pl new file mode 100755 index 00000000000..8c7fea7d379 --- /dev/null +++ b/TAO/tests/Big_Request_Muxing/run_test.pl @@ -0,0 +1,52 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib '../../../bin'; +use PerlACE::Run_Test; + +$iorfile = PerlACE::LocalFile ("server.ior"); +unlink $iorfile; + +$SV = new PerlACE::Process ("server", "-o $iorfile"); +$CL1 = new PerlACE::Process ("client", " -k file://$iorfile"); +$CL2 = new PerlACE::Process ("client", " -k file://$iorfile"); + +$SV->Spawn (); + +if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$CL1->Spawn (60); +$CL2->Spawn (60); + +$client1 = $CL1->WaitKill (300); + +if ($client1 != 0) { + print STDERR "ERROR: client 1 returned $client1\n"; + $status = 1; +} + +$client2 = $CL2->WaitKill (300); + +if ($client2 != 0) { + print STDERR "ERROR: client 2 returned $client2\n"; + $status = 1; +} + +$server = $SV->TerminateWaitKill (5); + +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; +} + +unlink $iorfile; + +exit $status; diff --git a/TAO/performance-tests/Throughput/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp index 0788a406ab0..fb64629eb8d 100644 --- a/TAO/performance-tests/Throughput/server.cpp +++ b/TAO/tests/Big_Request_Muxing/server.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "Receiver_Factory.h" +#include "Payload_Receiver.h" #include "ace/Get_Opt.h" -ACE_RCSID(Throughput, server, "$Id$") +ACE_RCSID(Big_Request_Muxing, server, "$Id$") const char *ior_output_file = "test.ior"; @@ -61,18 +61,18 @@ main (int argc, char *argv[]) if (parse_args (argc, argv) != 0) return 1; - Receiver_Factory *receiver_factory_impl; - ACE_NEW_RETURN (receiver_factory_impl, - Receiver_Factory (orb.in ()), + Payload_Receiver *payload_receiver_impl; + ACE_NEW_RETURN (payload_receiver_impl, + Payload_Receiver, 1); - PortableServer::ServantBase_var receiver_factory_owner_transfer(receiver_factory_impl); + PortableServer::ServantBase_var receiver_owner_transfer(payload_receiver_impl); - Test::Receiver_Factory_var receiver_factory = - receiver_factory_impl->_this (ACE_TRY_ENV); + Test::Payload_Receiver_var payload_receiver = + payload_receiver_impl->_this (ACE_TRY_ENV); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (receiver_factory.in (), ACE_TRY_ENV); + orb->object_to_string (payload_receiver.in (), ACE_TRY_ENV); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -88,10 +88,11 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_TRY_ENV); ACE_TRY_CHECK; - orb->run (ACE_TRY_ENV); + ACE_Time_Value tv (240, 0); + orb->run (tv, ACE_TRY_ENV); ACE_TRY_CHECK; - ACE_DEBUG ((LM_DEBUG, "Server event loop finished\n")); + ACE_DEBUG ((LM_DEBUG, "Now terminating test\n")); root_poa->destroy (1, 1, ACE_TRY_ENV); ACE_TRY_CHECK; diff --git a/TAO/tests/Big_Request_Muxing/server.dsp b/TAO/tests/Big_Request_Muxing/server.dsp new file mode 100644 index 00000000000..2225f1577e3 --- /dev/null +++ b/TAO/tests/Big_Request_Muxing/server.dsp @@ -0,0 +1,216 @@ +# Microsoft Developer Studio Project File - Name="Big_Request_Muxing Server" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Big_Request_Muxing Server - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "server.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "server.mak" CFG="Big_Request_Muxing Server - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "Big_Request_Muxing Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Big_Request_Muxing Server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "Big_Request_Muxing Server - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 TAO.lib TAO_PortableServer.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+
+!ELSEIF "$(CFG)" == "Big_Request_Muxing Server - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 TAOd.lib TAO_PortableServerd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+
+!ENDIF
+
+# Begin Target
+
+# Name "Big_Request_Muxing Server - Win32 Release"
+# Name "Big_Request_Muxing Server - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ".cpp"
+# Begin Source File
+
+SOURCE=.\Payload_Receiver.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\server.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestS.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ".h"
+# Begin Source File
+
+SOURCE=.\Payload_Receiver.h
+# End Source File
+# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter ".idl"
+# Begin Source File
+
+SOURCE=.\Test.idl
+
+!IF "$(CFG)" == "Big_Request_Muxing Server - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
+InputPath=.\Test.idl
+InputName=Test
+
+BuildCmds= \
+ ..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "Big_Request_Muxing Server - Win32 Debug"
+
+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
+InputPath=.\Test.idl
+InputName=Test
+
+BuildCmds= \
+ ..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter ".i"
+# Begin Source File
+
+SOURCE=.\TestC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestS.i
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/tests/Big_Request_Muxing/svc.conf b/TAO/tests/Big_Request_Muxing/svc.conf new file mode 100644 index 00000000000..9fb75aeb0dd --- /dev/null +++ b/TAO/tests/Big_Request_Muxing/svc.conf @@ -0,0 +1,4 @@ +# +# $Id$ +# +static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED" diff --git a/TAO/tests/Big_Twoways/Coordinator.cpp b/TAO/tests/Big_Twoways/Coordinator.cpp new file mode 100644 index 00000000000..52fa351d814 --- /dev/null +++ b/TAO/tests/Big_Twoways/Coordinator.cpp @@ -0,0 +1,83 @@ +// +// $Id$ +// +#include "Coordinator.h" + +ACE_RCSID(Big_Oneways, Coordinator, "$Id$") + +Coordinator::Coordinator (CORBA::ULong peer_count) + : peers_ (0) + , peer_count_ (0) + , peer_max_ (peer_count) +{ + ACE_NEW (this->peers_, Test::Peer_var[this->peer_max_]); +} + +Coordinator::~Coordinator (void) +{ + delete[] this->peers_; +} + +int +Coordinator::has_all_peers (void) const +{ + return this->peer_count_ == this->peer_max_; +} + +void +Coordinator::create_session_list (Test::Session_Control_ptr session_control, + CORBA::ULong payload_size, + CORBA::ULong thread_count, + CORBA::ULong message_count, + Test::Session_List &session_list, + CORBA::Environment &ACE_TRY_ENV) +{ + session_list.length (this->peer_count_); + CORBA::ULong count = 0; + for (Test::Peer_var *i = this->peers_; + i != this->peers_ + this->peer_count_; + ++i) + { + session_list[count++] = + (*i)->create_session (session_control, + payload_size, + thread_count, + message_count, + this->peer_count_, + ACE_TRY_ENV); + ACE_CHECK; + } +} + +void +Coordinator::shutdown_all_peers (CORBA::Environment &ACE_TRY_ENV) +{ + for (Test::Peer_var *i = this->peers_; + i != this->peers_ + this->peer_count_; + ++i) + { + ACE_TRY + { + (*i)->shutdown (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Coordinator::shutdown, ignored"); + } + ACE_ENDTRY; + } +} + +void +Coordinator::add_peer (Test::Peer_ptr peer, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + if (this->peer_count_ >= this->peer_max_) + return; + + this->peers_[this->peer_count_++] = + Test::Peer::_duplicate (peer); +} diff --git a/TAO/tests/Big_Twoways/Coordinator.h b/TAO/tests/Big_Twoways/Coordinator.h new file mode 100644 index 00000000000..e754658f952 --- /dev/null +++ b/TAO/tests/Big_Twoways/Coordinator.h @@ -0,0 +1,65 @@ +// +// $Id$ +// + +#ifndef BIG_ONEWAYS_COORDINATOR_H +#define BIG_ONEWAYS_COORDINATOR_H +#include "ace/pre.h" + +#include "TestS.h" + +#if defined (_MSC_VER) +# if (_MSC_VER >= 1200) +# pragma warning(push) +# endif /* _MSC_VER >= 1200 */ +# pragma warning (disable:4250) +#endif /* _MSC_VER */ + +/// Implement the Test::Coordinator interface +class Coordinator + : public virtual POA_Test::Coordinator + , public virtual PortableServer::RefCountServantBase +{ +public: + /// Constructor + Coordinator (CORBA::ULong peer_count); + + /// Destructor + virtual ~Coordinator (void); + + /// Check if all the peers have registered already + int has_all_peers (void) const; + + /// Check a session on each peer + void create_session_list (Test::Session_Control_ptr session_control, + CORBA::ULong payload_size, + CORBA::ULong thread_count, + CORBA::ULong message_count, + Test::Session_List &session_list, + CORBA::Environment &ACE_TRY_ENV); + + /// Shutdown all the peers + void shutdown_all_peers (CORBA::Environment &ACE_TRY_ENV); + + // = The skeleton methods + virtual void add_peer (Test::Peer_ptr peer, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + /// Store a reference to each peer + Test::Peer_var *peers_; + + /// Current number of elements in the array + size_t peer_count_; + + /// Array's capacity + size_t peer_max_; +}; + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +# pragma warning(pop) +#endif /* _MSC_VER */ + +#include "ace/post.h" +#endif /* BIG_ONEWAYS_COORDINATOR_H */ diff --git a/TAO/tests/Big_Twoways/Makefile b/TAO/tests/Big_Twoways/Makefile new file mode 100644 index 00000000000..46b00dcc5c0 --- /dev/null +++ b/TAO/tests/Big_Twoways/Makefile @@ -0,0 +1,1700 @@ +#---------------------------------------------------------------------------- +# +# $Id$ +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +ifndef TAO_ROOT + TAO_ROOT = $(ACE_ROOT)/TAO +endif # ! TAO_ROOT + +LDLIBS = -lTAO + +IDL_FILES = Test +IDL_SRC = TestC.cpp TestS.cpp +BIN = server client + +SRC = $(addsuffix .cpp, $(BIN) Coordinator Peer Session Session_Control Session_Task) $(IDL_SRC) + +CLIENT_OBJS = client.o TestC.o TestS.o Peer.o Session.o Session_Task.o +SERVER_OBJS = server.o TestC.o TestS.o Coordinator.o Session_Control.o + +TAO_IDLFLAGS += -Ge 1 +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(TAO_ROOT)/rules.tao.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +include $(TAO_ROOT)/taoconfig.mk + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- + +.PRECIOUS: $(foreach ext, $(IDL_EXT), Test$(ext)) + +server: $(addprefix $(VDIR),$(SERVER_OBJS)) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) + +client: $(addprefix $(VDIR),$(CLIENT_OBJS)) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) + +realclean: clean + -$(RM) $(foreach ext, $(IDL_EXT), Test$(ext)) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Coordinator.h \ + $(ACE_ROOT)/ace/pre.h \ + TestS.h TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + TestS_T.h TestS_T.cpp TestS_T.i Session_Control.h \ + $(ACE_ROOT)/ace/Get_Opt.h + +.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Peer.h \ + $(ACE_ROOT)/ace/pre.h \ + TestS.h TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + TestS_T.h TestS_T.cpp TestS_T.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i + +.obj/Coordinator.o .obj/Coordinator.so .shobj/Coordinator.o .shobj/Coordinator.so: Coordinator.cpp Coordinator.h \ + $(ACE_ROOT)/ace/pre.h \ + TestS.h TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + TestS_T.h TestS_T.cpp TestS_T.i + +.obj/Peer.o .obj/Peer.so .shobj/Peer.o .shobj/Peer.so: Peer.cpp Peer.h \ + $(ACE_ROOT)/ace/pre.h \ + TestS.h TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + TestS_T.h TestS_T.cpp TestS_T.i Session.h Session_Task.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Task_T.i + +.obj/Session.o .obj/Session.so .shobj/Session.o .shobj/Session.so: Session.cpp Session.h \ + $(ACE_ROOT)/ace/pre.h \ + TestS.h TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + TestS_T.h TestS_T.cpp TestS_T.i Session_Task.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(TAO_ROOT)/tao/debug.h + +.obj/Session_Control.o .obj/Session_Control.so .shobj/Session_Control.o .shobj/Session_Control.so: Session_Control.cpp Session_Control.h \ + $(ACE_ROOT)/ace/pre.h \ + TestS.h TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + TestS_T.h TestS_T.cpp TestS_T.i + +.obj/Session_Task.o .obj/Session_Task.so .shobj/Session_Task.o .shobj/Session_Task.so: Session_Task.cpp Session_Task.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Task_T.i \ + Session.h TestS.h TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + TestS_T.h TestS_T.cpp TestS_T.i + +.obj/TestC.o .obj/TestC.so .shobj/TestC.o .shobj/TestC.so: TestC.cpp TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/RequestInfo_Util.h \ + TestC.i + +.obj/TestS.o .obj/TestS.so .shobj/TestS.o .shobj/TestS.so: TestS.cpp TestS.h TestC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + TestS_T.h TestS_T.cpp TestS_T.i \ + $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ + $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ + $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/RequestInfo_Util.h \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(ACE_ROOT)/ace/Dynamic_Service.i \ + TestS.i + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tests/Big_Twoways/Peer.cpp b/TAO/tests/Big_Twoways/Peer.cpp new file mode 100644 index 00000000000..e5cf894acba --- /dev/null +++ b/TAO/tests/Big_Twoways/Peer.cpp @@ -0,0 +1,51 @@ +// +// $Id$ +// +#include "Peer.h" +#include "Session.h" + +ACE_RCSID(Big_Oneways, Peer, "$Id$") + +Peer::Peer (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) +{ +} + +Peer::~Peer (void) +{ +} + +Test::Session_ptr +Peer::create_session (Test::Session_Control_ptr control, + CORBA::ULong payload_size, + CORBA::ULong thread_count, + CORBA::ULong message_count, + CORBA::ULong peer_count, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + Session *session_impl; + ACE_NEW_THROW_EX (session_impl, + Session (control, + payload_size, + thread_count, + message_count, + peer_count), + CORBA::NO_MEMORY ()); + ACE_CHECK_RETURN (Test::Session::_nil ()); + PortableServer::ServantBase_var transfer_ownership (session_impl); + + return session_impl->_this (ACE_TRY_ENV); +} + +void +Peer::shutdown (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Peer::shutdown, waiting for threads\n")); + + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Peer::shutdown, shutting down ORB\n")); + this->orb_->shutdown (0, ACE_TRY_ENV); +} diff --git a/TAO/tests/Big_Twoways/Peer.h b/TAO/tests/Big_Twoways/Peer.h new file mode 100644 index 00000000000..ed34b0eb6fa --- /dev/null +++ b/TAO/tests/Big_Twoways/Peer.h @@ -0,0 +1,51 @@ +// +// $Id$ +// + +#ifndef BIG_ONEWAYS_PEER_H +#define BIG_ONEWAYS_PEER_H +#include "ace/pre.h" + +#include "TestS.h" + +#if defined (_MSC_VER) +# if (_MSC_VER >= 1200) +# pragma warning(push) +# endif /* _MSC_VER >= 1200 */ +# pragma warning (disable:4250) +#endif /* _MSC_VER */ + +/// Implement the Test::Peer interface +class Peer + : public virtual POA_Test::Peer + , public virtual PortableServer::RefCountServantBase +{ +public: + /// Constructor + Peer (CORBA::ORB_ptr orb); + + /// Destructor + virtual ~Peer (void); + + // = The skeleton methods + virtual Test::Session_ptr create_session (Test::Session_Control_ptr control, + CORBA::ULong payload_size, + CORBA::ULong thread_count, + CORBA::ULong message_count, + CORBA::ULong peer_count, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + /// Keep a pointer to the ORB to shutdown cleanly + CORBA::ORB_var orb_; +}; + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +# pragma warning(pop) +#endif /* _MSC_VER */ + +#include "ace/post.h" +#endif /* BIG_ONEWAYS_PEER_H */ diff --git a/TAO/tests/Big_Twoways/README b/TAO/tests/Big_Twoways/README new file mode 100644 index 00000000000..ed389e9009c --- /dev/null +++ b/TAO/tests/Big_Twoways/README @@ -0,0 +1,21 @@ +/** + +@page Big_Oneways Test README File + + This is a stress test for the non-blocking I/O features in the +ORB. The test connects multiple peer processes together. Each +process sends messages to all its peers, using multiple threads to +generate the messages. Without non-blocking I/O the system soon +deadlocks. + + This is part of the regression testsuite for: + +http://ace.cs.wustl.edu/bugzilla/show_bug.cgi?id=132 + + To run the test use the run_test.pl script: + +$ ./run_test.pl + + the script returns 0 if the test was successful. + +*/ diff --git a/TAO/tests/Big_Twoways/Session.cpp b/TAO/tests/Big_Twoways/Session.cpp new file mode 100644 index 00000000000..de4153c50e0 --- /dev/null +++ b/TAO/tests/Big_Twoways/Session.cpp @@ -0,0 +1,250 @@ +// +// $Id$ +// +#include "Session.h" +#include "tao/debug.h" + +ACE_RCSID(Big_Oneways, Session, "$Id$") + +Session::Session (Test::Session_Control_ptr control, + CORBA::ULong payload_size, + CORBA::ULong thread_count, + CORBA::ULong message_count, + CORBA::ULong peer_count) + : control_ (Test::Session_Control::_duplicate (control)) + , running_ (0) + , payload_size_ (payload_size) + , thread_count_ (thread_count) + , message_count_ (message_count) + , active_thread_count_ (0) + , expected_messages_ (thread_count * message_count * (peer_count - 1)) + , task_ (this) + , barrier_ (thread_count + 1) +{ +} + +Session::~Session (void) +{ +} + +int +Session::svc (void) +{ + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Session::svc, start\n")); + + this->barrier_.wait (); + + /// Automatically decrease the reference count at the end of the + /// thread + PortableServer::ServantBase_var auto_decrement (this); + + ACE_DECLARE_NEW_CORBA_ENV; + + ACE_TRY + { + // Use the same payload over and over + Test::Payload payload (this->payload_size_); + payload.length (this->payload_size_); + + // Get the number of peers just once. + CORBA::ULong session_count = + this->other_sessions_.length (); + + for (CORBA::ULong i = 0; i != this->message_count_; ++i) + { +#if 0 + if (i % 500 == 0) + { + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Session::svc, " + "sending message %d\n", + i)); + } +#endif /* 0 */ + for (CORBA::ULong j = 0; j != session_count; ++j) + { + Test::Payload_var received = + this->other_sessions_[j]->echo_payload (payload, + ACE_TRY_ENV); + ACE_TRY_CHECK; + } + } + + { + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1); + this->active_thread_count_--; + if (this->more_work ()) + { + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Session::svc, end\n")); + return 0; + } + } + this->terminate (1, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Session::svc - "); + return -1; + } + ACE_ENDTRY; + + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Session::svc, end\n")); + return 0; +} + +void +Session::start (const Test::Session_List &other_sessions, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + Test::Already_Running, + Test::No_Peers)) +{ + if (other_sessions.length () == 0) + ACE_THROW (Test::No_Peers ()); + + { + ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); + if (this->running_) + ACE_THROW (Test::Already_Running ()); + + this->other_sessions_ = other_sessions; + + for (CORBA::ULong i = 0; i != this->thread_count_; ++i) + { + // Increase the reference count because the new thread will have + // access to this object.... + ACE_TRY + { + this->_add_ref (ACE_TRY_ENV); + ACE_TRY_CHECK; + if (this->task_.activate ( + THR_NEW_LWP | THR_JOINABLE, 1, 1) == -1) + { + this->_remove_ref (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + else + { + this->running_ = 1; + this->active_thread_count_++; + } + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Session::start, ignored"); + } + ACE_ENDTRY; + } + + if (this->active_thread_count_ != this->thread_count_) + return; + + this->barrier_.wait (); + + if (this->running_ != 0) + return; + } + /// None of the threads are running, this session is useless at + /// this point, report the problem and destroy the local objects + this->terminate (0, ACE_TRY_ENV); +} + +Test::Payload * +Session::echo_payload (const Test::Payload &the_payload, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + if (the_payload.length () != this->payload_size_) + { + ACE_ERROR ((LM_ERROR, + "ERROR: (%P|%t) Session::echo_payload, " + "unexpected payload size (%d != %d)\n", + the_payload.length (), this->payload_size_)); + } + + Test::Payload_var retval (new Test::Payload (the_payload)); + + { + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, + retval._retn ()); + this->expected_messages_--; + + int verbose = 0; +#if 0 + verbose = this->expected_messages_ % 500 == 0; + if (this->expected_messages_ < 500) + verbose = (this->expected_messages_ % 100 == 0); + if (this->expected_messages_ < 100) + verbose = (this->expected_messages_ % 10 == 0); +#endif /* 0 */ + if (this->expected_messages_ < 5) + verbose = 1; + + if (verbose) + { + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Session::echo_payload, " + "%d messages to go\n", + this->expected_messages_)); + } + if (this->more_work ()) + return retval._retn (); + } + this->terminate (1, ACE_TRY_ENV); + + return retval._retn (); +} + + +void +Session::destroy (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Make sure local resources are released + + PortableServer::POA_var poa = + this->_default_POA (ACE_TRY_ENV); + ACE_CHECK; + PortableServer::ObjectId_var oid = + poa->servant_to_id (this, ACE_TRY_ENV); + ACE_CHECK; + poa->deactivate_object (oid.in (), ACE_TRY_ENV); + ACE_CHECK; +} + +int +Session::more_work (void) const +{ + if (this->expected_messages_ > 0 + || this->active_thread_count_ > 0 + || this->running_ == 0) + return 1; + + return 0; +} + +void +Session::terminate (CORBA::Boolean success, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC (()) +{ + // Make sure that global resources are released + ACE_TRY_EX(GLOBAL) + { + this->control_->session_finished (success, + ACE_TRY_ENV); + ACE_TRY_CHECK_EX(GLOBAL); + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Session::terminate, ignored"); + } + ACE_ENDTRY; + +} diff --git a/TAO/tests/Big_Twoways/Session.h b/TAO/tests/Big_Twoways/Session.h new file mode 100644 index 00000000000..1caf5a37506 --- /dev/null +++ b/TAO/tests/Big_Twoways/Session.h @@ -0,0 +1,104 @@ +// +// $Id$ +// + +#ifndef BIG_ONEWAYS_SESSION_H +#define BIG_ONEWAYS_SESSION_H +#include "ace/pre.h" + +#include "TestS.h" +#include "Session_Task.h" + +#if defined (_MSC_VER) +# if (_MSC_VER >= 1200) +# pragma warning(push) +# endif /* _MSC_VER >= 1200 */ +# pragma warning (disable:4250) +#endif /* _MSC_VER */ + +/// Implement the Test::Session interface +class Session + : public virtual POA_Test::Session + , public virtual PortableServer::RefCountServantBase +{ +public: + /// Constructor + Session (Test::Session_Control_ptr control, + CORBA::ULong payload_size, + CORBA::ULong thread_count, + CORBA::ULong message_count, + CORBA::ULong peer_count); + + /// Destructor + virtual ~Session (void); + + /// Run one of the experiment threads + int svc (void); + + // = The skeleton methods + virtual void start (const Test::Session_List &other_sessions, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + Test::Already_Running, + Test::No_Peers)); + + virtual Test::Payload* echo_payload (const Test::Payload &the_payload, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual void destroy (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + /// Helper function used to report any problems and destroy local + /// resources + void terminate (CORBA::Boolean success, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC (()); + + /// Return 1 if all the work in this session has been completed + int more_work (void) const; + +private: + /// Synchronize the internal state + ACE_SYNCH_MUTEX mutex_; + + /// Keep a reference to the Session_Control, this is used to report + /// when the test finishes. + Test::Session_Control_var control_; + + /// Keep track of wether the test is running. + int running_; + + /// The other session objects participating in the test + Test::Session_List other_sessions_; + + /// Size of each message + CORBA::ULong payload_size_; + + /// Number of threads + CORBA::ULong thread_count_; + + /// Number of messages to send + CORBA::ULong message_count_; + + /// The number of threads currently running, when this reaches 0 the + /// session destroys itself. + CORBA::ULong active_thread_count_; + + /// Number of messages expected + CORBA::ULong expected_messages_; + + /// Helper class to run svc() in a separate thread + Session_Task task_; + + /// Barrier to start all threads simultaenously + ACE_Thread_Barrier barrier_; +}; + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +# pragma warning(pop) +#endif /* _MSC_VER */ + +#include "ace/post.h" +#endif /* BIG_ONEWAYS_SESSION_H */ diff --git a/TAO/tests/Big_Twoways/Session_Control.cpp b/TAO/tests/Big_Twoways/Session_Control.cpp new file mode 100644 index 00000000000..f0f5c3bd4b4 --- /dev/null +++ b/TAO/tests/Big_Twoways/Session_Control.cpp @@ -0,0 +1,75 @@ +// +// $Id$ +// +#include "Session_Control.h" + +ACE_RCSID(Big_Oneways, Session_Control, "$Id$") + +Session_Control::Session_Control (CORBA::ULong session_count) + : session_count_ (session_count) + , success_ (1) +{ +} + +int +Session_Control::all_sessions_finished (void) const +{ + return this->session_count_ == 0; +} + +Session_Control::~Session_Control (void) +{ + if (this->session_count_ == 0 && this->success_) + { + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Session_Control::~Session_control, " + " good, all sessions did finish\n")); + } + else if (session_count_ != 0) + { + ACE_ERROR ((LM_ERROR, + "ERROR: (%P|%t) Session_Control::~Session_control, " + " %d sessions did not finish\n", + this->session_count_)); + } + else + { + ACE_ERROR ((LM_ERROR, + "ERROR: (%P|%t) Session_Control::~Session_control, " + " some sessions failed\n")); + } +} + +void +Session_Control::session_finished (CORBA::Boolean success, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); + if (this->session_count_ == 0) + { + ACE_ERROR ((LM_ERROR, + "ERROR: (%P|%t) Session_Control::session_finished, " + "unexpected callback\n")); + } + if (success == 0) + this->success_ = 0; + + this->session_count_--; + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Session_Control::session_finished, " + "%d sessions to go\n", + this->session_count_)); + if (session_count_ == 0) + { + PortableServer::POA_var poa = + this->_default_POA (ACE_TRY_ENV); + ACE_CHECK; + PortableServer::ObjectId_var oid = + poa->servant_to_id (this, ACE_TRY_ENV); + ACE_CHECK; + poa->deactivate_object (oid.in (), ACE_TRY_ENV); + ACE_CHECK; + } + +} diff --git a/TAO/tests/Big_Twoways/Session_Control.h b/TAO/tests/Big_Twoways/Session_Control.h new file mode 100644 index 00000000000..09c19dbaaba --- /dev/null +++ b/TAO/tests/Big_Twoways/Session_Control.h @@ -0,0 +1,57 @@ +// +// $Id$ +// + +#ifndef BIG_ONEWAYS_SESSION_CONTROL_H +#define BIG_ONEWAYS_SESSION_CONTROL_H +#include "ace/pre.h" + +#include "TestS.h" + +#if defined (_MSC_VER) +# if (_MSC_VER >= 1200) +# pragma warning(push) +# endif /* _MSC_VER >= 1200 */ +# pragma warning (disable:4250) +#endif /* _MSC_VER */ + +/// Implement the Test::Session_Control interface +class Session_Control + : public virtual POA_Test::Session_Control + , public virtual PortableServer::RefCountServantBase +{ +public: + /// Constructor + /** + * @param session_count Number of session objects in the experiment. + */ + Session_Control (CORBA::ULong session_count); + + /// Destructor + virtual ~Session_Control (void); + + /// Return 1 when all sessions have finished + int all_sessions_finished (void) const; + + // = The skeleton methods + virtual void session_finished (CORBA::Boolean success, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + /// Synchronize the internal state + ACE_SYNCH_MUTEX mutex_; + + /// The type of test + CORBA::ULong session_count_; + + /// Set to falso if any session reported a failure + CORBA::Boolean success_; +}; + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +# pragma warning(pop) +#endif /* _MSC_VER */ + +#include "ace/post.h" +#endif /* BIG_ONEWAYS_SESSION_CONTROL_H */ diff --git a/TAO/tests/Big_Twoways/Session_Task.cpp b/TAO/tests/Big_Twoways/Session_Task.cpp new file mode 100644 index 00000000000..bd992a66e5d --- /dev/null +++ b/TAO/tests/Big_Twoways/Session_Task.cpp @@ -0,0 +1,19 @@ +// +// $Id$ +// + +#include "Session_Task.h" +#include "Session.h" + +ACE_RCSID(Big_Oneways, Session_Task, "$Id$") + +Session_Task::Session_Task (Session *session) + : session_ (session) +{ +} + +int +Session_Task::svc (void) +{ + return this->session_->svc (); +} diff --git a/TAO/tests/Big_Twoways/Session_Task.h b/TAO/tests/Big_Twoways/Session_Task.h new file mode 100644 index 00000000000..2ef3bf69925 --- /dev/null +++ b/TAO/tests/Big_Twoways/Session_Task.h @@ -0,0 +1,33 @@ +// +// $Id$ +// + +#ifndef BIG_ONEWAYS_SESSION_TASK_H +#define BIG_ONEWAYS_SESSION_TASK_H +#include "ace/pre.h" + +#include "ace/Task.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class Session; + +/// Implement a Task to run the experiments using multiple threads. +class Session_Task : public ACE_Task_Base +{ +public: + /// Constructor + Session_Task (Session *session); + + /// Thread entry point + int svc (void); + +private: + /// Reference to the test interface + Session *session_; +}; + +#include "ace/post.h" +#endif /* BIG_ONEWAYS_SESSION_TASK_H */ diff --git a/TAO/tests/Big_Twoways/Test.idl b/TAO/tests/Big_Twoways/Test.idl new file mode 100644 index 00000000000..04255aa1262 --- /dev/null +++ b/TAO/tests/Big_Twoways/Test.idl @@ -0,0 +1,80 @@ +// +// $Id$ +// + +module Test +{ + /// The message type, just used to send a lot of data on each + /// request + typedef sequence<octet> Payload; + + /// A session is a single instance of the test + interface Session; + typedef sequence<Session> Session_List; + + /// A session control is used to determine if all the Session in an + /// experiment have finished. + /** + * @param success If false then the session failed, the experiment + * is successful only if all sessions finish successfully + */ + interface Session_Control + { + void session_finished (in boolean success); + }; + + /// A Peer is used to create sessions + interface Peer + { + /// Create a new session + /** + * @param payload_size The size of each message + * @param thread_count The number of threads that each session + * must create + * @param message_count How many messages does each thread send. + */ + Session create_session (in Session_Control control, + in unsigned long payload_size, + in unsigned long thread_count, + in unsigned long message_count, + in unsigned long peer_count); + + /// Shutdown the peer + oneway void shutdown (); + }; + + /// The Session already has an experiment running. + exception Already_Running {}; + + /// The experiment requires at least two Sessions + exception No_Peers {}; + + interface Session + { + /// Start the test, send messages to all the peers + /** + * @param other_sessions The list of sessions participating in the + * experiment, this list must not include the session + * receiving the start() call. + */ + void start (in Session_List other_sessions) + raises (Already_Running, No_Peers); + + /// Echo back the payload + Payload echo_payload (in Payload the_payload); + + /// Destroy the Session object + void destroy (); + }; + + interface Coordinator + { + /// Add a new peer. + /** + * The coordinator starts the test by calling <send_oneways> on + * all peers. How does it decide to do that is application + * specific. + */ + void add_peer (in Peer the_peer); + }; +}; diff --git a/TAO/tests/Big_Twoways/client.cpp b/TAO/tests/Big_Twoways/client.cpp new file mode 100644 index 00000000000..542c9ed70ed --- /dev/null +++ b/TAO/tests/Big_Twoways/client.cpp @@ -0,0 +1,116 @@ +// $Id$ + +#include "Peer.h" +#include "ace/Get_Opt.h" +#include "ace/Thread_Manager.h" + +ACE_RCSID(Big_Oneways, client, "$Id$") + +const char *ior = "file://test.ior"; + +int +parse_args (int argc, char *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, "k:"); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'k': + ior = get_opts.optarg; + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-k <ior> " + "\n", + argv [0]), + -1); + } + // Indicates sucessful parsing of the command line + return 0; +} + +int +main (int argc, char *argv[]) +{ + ACE_TRY_NEW_ENV + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + ACE_TRY_CHECK; + + CORBA::Object_var poa_object = + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (CORBA::is_nil (poa_object.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Panic got a nil RootPOA\n"), + 1); + + PortableServer::POAManager_var poa_manager = + root_poa->the_POAManager (ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (parse_args (argc, argv) != 0) + return 1; + + CORBA::Object_var tmp = + orb->string_to_object(ior, ACE_TRY_ENV); + ACE_TRY_CHECK; + + Test::Coordinator_var coordinator = + Test::Coordinator::_narrow(tmp.in (), ACE_TRY_ENV); + if (CORBA::is_nil (coordinator.in ())) + { + ACE_ERROR_RETURN ((LM_DEBUG, + "Nil coordinator reference <%s>\n", + ior), + 1); + } + + Peer *peer_impl; + ACE_NEW_RETURN (peer_impl, + Peer (orb.in ()), + 1); + PortableServer::ServantBase_var peer_owner_transfer(peer_impl); + + Test::Peer_var peer = + peer_impl->_this (ACE_TRY_ENV); + + poa_manager->activate (ACE_TRY_ENV); + ACE_TRY_CHECK; + + coordinator->add_peer (peer.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + orb->run (ACE_TRY_ENV); + ACE_TRY_CHECK; + + // Wait for all the threads. + ACE_Thread_Manager::instance ()->wait (); + + root_poa->destroy (1, 1, ACE_TRY_ENV); + ACE_TRY_CHECK; + + orb->destroy (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Exception caught:"); + return 1; + } + ACE_ENDTRY; + + return 0; +} diff --git a/TAO/tests/Big_Twoways/run_test.pl b/TAO/tests/Big_Twoways/run_test.pl new file mode 100755 index 00000000000..7cbfa22085d --- /dev/null +++ b/TAO/tests/Big_Twoways/run_test.pl @@ -0,0 +1,86 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib '../../../bin'; +use PerlACE::Run_Test; +use Getopt::Std; + +local ($opt_i, $opt_b); + +if (!getopts ('i:b:')) { + print "Usage: run_test.pl [-b payload_size] [-i iterations]\n"; + exit 1; +} + +my $server_args = " -p 4"; +if (defined $opt_i) { + $server_args .= " -i ".$opt_i; +} +if (defined $opt_b) { + $server_args .= " -b ".$opt_b; +} + +$iorfile = PerlACE::LocalFile ("server.ior"); + +unlink $iorfile; +$SV = new PerlACE::Process ("server", "-o $iorfile $server_args"); +$CL1 = new PerlACE::Process ("client", " -k file://$iorfile"); +$CL2 = new PerlACE::Process ("client", " -k file://$iorfile"); +$CL3 = new PerlACE::Process ("client", " -k file://$iorfile"); +$CL4 = new PerlACE::Process ("client", " -k file://$iorfile"); + +$SV->Spawn (); + +if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$CL1->Spawn (); +$CL2->Spawn (); +$CL3->Spawn (); +$CL4->Spawn (); + +$client1 = $CL1->WaitKill (300); + +if ($client1 != 0) { + print STDERR "ERROR: client 1 returned $client1\n"; + $status = 1; +} + +$client2 = $CL2->WaitKill (300); + +if ($client2 != 0) { + print STDERR "ERROR: client 2 returned $client2\n"; + $status = 1; +} + +$client3 = $CL3->WaitKill (300); + +if ($client3 != 0) { + print STDERR "ERROR: client 3 returned $client3\n"; + $status = 1; +} + +$client4 = $CL4->WaitKill (300); + +if ($client4 != 0) { + print STDERR "ERROR: client 4 returned $client3\n"; + $status = 1; +} + +$server = $SV->TerminateWaitKill (5); + +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; +} + +unlink $iorfile; + +exit $status; diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp new file mode 100644 index 00000000000..becf7ab3861 --- /dev/null +++ b/TAO/tests/Big_Twoways/server.cpp @@ -0,0 +1,218 @@ +// $Id$ + +#include "Coordinator.h" +#include "Session_Control.h" +#include "ace/Get_Opt.h" + +ACE_RCSID(Big_Oneways, server, "$Id$") + +const char *ior_output_file = "test.ior"; +CORBA::ULong peer_count = 4; +CORBA::ULong payload_size = 1024; +CORBA::ULong message_count = 1000; +CORBA::ULong thread_count = 4; + +int +parse_args (int argc, char *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, "o:p:b:i:n:"); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'o': + ior_output_file = get_opts.optarg; + break; + + case 'p': + peer_count = ACE_OS::atoi (get_opts.optarg); + break; + + case 'b': + payload_size = ACE_OS::atoi (get_opts.optarg); + break; + + case 'i': + message_count = ACE_OS::atoi (get_opts.optarg); + break; + + case 'n': + thread_count = ACE_OS::atoi (get_opts.optarg); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-o <iorfile> " + "-p <peer_count> " + "-b <payload_size> " + "-i <message_count> " + "-n <thread_count> " + "\n", + argv [0]), + -1); + } + // Indicates sucessful parsing of the command line + return 0; +} + +int +main (int argc, char *argv[]) +{ + ACE_TRY_NEW_ENV + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + ACE_TRY_CHECK; + + CORBA::Object_var poa_object = + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (CORBA::is_nil (poa_object.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Panic got a nil RootPOA\n"), + 1); + + PortableServer::POAManager_var poa_manager = + root_poa->the_POAManager (ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (parse_args (argc, argv) != 0) + return 1; + + Coordinator *coordinator_impl; + ACE_NEW_RETURN (coordinator_impl, + Coordinator (peer_count), + 1); + PortableServer::ServantBase_var coordinator_owner_transfer(coordinator_impl); + + Test::Coordinator_var coordinator = + coordinator_impl->_this (ACE_TRY_ENV); + + CORBA::String_var ior = + orb->object_to_string (coordinator.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + // If the ior_output_file exists, output the ior to it + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s", + ior_output_file), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); + + poa_manager->activate (ACE_TRY_ENV); + ACE_TRY_CHECK; + + ACE_DEBUG ((LM_DEBUG, "Waiting for peers . . . ")); + for (int i = 0; + i != 30 && !coordinator_impl->has_all_peers (); + ++i) + { + ACE_Time_Value tv (1, 0); + orb->run (tv, ACE_TRY_ENV); + } + ACE_DEBUG ((LM_DEBUG, "done.\n")); + + if (!coordinator_impl->has_all_peers ()) + { + ACE_ERROR ((LM_DEBUG, + "ERROR: timeout, some peers failed to register\n")); + return 1; + } + + Session_Control *session_control_impl; + ACE_NEW_RETURN (session_control_impl, + Session_Control (peer_count), + 1); + PortableServer::ServantBase_var session_control_owner_transfer(session_control_impl); + + Test::Session_Control_var session_control = + session_control_impl->_this (ACE_TRY_ENV); + + Test::Session_List session_list; + coordinator_impl->create_session_list (session_control.in (), + payload_size, + thread_count, + message_count, + session_list, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + ACE_ASSERT (session_list.length () == peer_count); + + CORBA::ULong j; + for (j = 0; j != peer_count; ++j) + { + // Make a copy of the sessions, excluding the j-th element + Test::Session_List other_sessions (peer_count - 1); + other_sessions.length (peer_count - 1); + CORBA::ULong count = 0; + for (CORBA::ULong k = 0; k != peer_count; ++k) + { + if (k == j) + continue; + other_sessions[count++] = + Test::Session::_duplicate (session_list[k]); + } + + session_list[j]->start (other_sessions, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + } + + ACE_DEBUG ((LM_DEBUG, "Waiting for sessions . . . \n")); + for (int k = 0; + k != 300 && !session_control_impl->all_sessions_finished (); + ++k) + { + ACE_Time_Value tv (1, 0); + orb->run (tv, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + + if (!session_control_impl->all_sessions_finished ()) + { + ACE_ERROR ((LM_ERROR, + "ERROR: timeout waiting for sessions\n")); + return 1; + } + + ACE_DEBUG ((LM_DEBUG, "All sessions finished . . . \n")); + + for (j = 0; j != peer_count; ++j) + { + session_list[j]->destroy (ACE_TRY_ENV); + ACE_TRY_CHECK; + + } + + coordinator_impl->shutdown_all_peers (ACE_TRY_ENV); + ACE_TRY_CHECK; + + root_poa->destroy (1, 1, ACE_TRY_ENV); + ACE_TRY_CHECK; + + orb->destroy (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Exception caught:"); + return 1; + } + ACE_ENDTRY; + + return 0; +} diff --git a/TAO/tests/Blocking_Sync_None/Test.idl b/TAO/tests/Blocking_Sync_None/Test.idl index 5e8a1360b7e..46596465827 100644 --- a/TAO/tests/Blocking_Sync_None/Test.idl +++ b/TAO/tests/Blocking_Sync_None/Test.idl @@ -21,6 +21,6 @@ module Test in unsigned long sleep_microseconds); /// Shutdown the server - oneway void shutdown (); + void shutdown (); }; }; diff --git a/TAO/tests/Collocation/Coll_Tester.cpp b/TAO/tests/Collocation/Coll_Tester.cpp index 26c220166de..7e687b28019 100644 --- a/TAO/tests/Collocation/Coll_Tester.cpp +++ b/TAO/tests/Collocation/Coll_Tester.cpp @@ -20,15 +20,6 @@ Collocation_Test::Collocation_Test (void) // no-op. } -void -Collocation_Test::shutdown (CORBA::Environment &ACE_TRY_ENV) -{ - this->root_poa_->destroy (1, 1, ACE_TRY_ENV); - ACE_CHECK; - this->orb_->destroy (ACE_TRY_ENV); - ACE_CHECK; -} - int Collocation_Test::init (int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) { diff --git a/TAO/tests/Collocation/Coll_Tester.h b/TAO/tests/Collocation/Coll_Tester.h index 584710a098a..0912feb048f 100644 --- a/TAO/tests/Collocation/Coll_Tester.h +++ b/TAO/tests/Collocation/Coll_Tester.h @@ -29,8 +29,6 @@ class Collocation_Test public: Collocation_Test (void); - void shutdown (CORBA::Environment &ACE_TRY_ENV); - int init (int argc, char *argv[], CORBA::Environment &); // Initializing the Collocation_Test object. diff --git a/TAO/tests/Collocation/Collocation.bor b/TAO/tests/Collocation/Collocation.bor index 34639d39ba8..bf32c1f9270 100644 --- a/TAO/tests/Collocation/Collocation.bor +++ b/TAO/tests/Collocation/Collocation.bor @@ -6,7 +6,7 @@ NAME = Collocation OBJFILES = \ $(OBJDIR)\Coll_Tester.obj \ - $(OBJDIR)\Collocation.obj + $(OBJDIR)\main.obj CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/tests/Collocation/Collocation.dsp b/TAO/tests/Collocation/Collocation.dsp index cb78ce9f185..d8ce78d5094 100644 --- a/TAO/tests/Collocation/Collocation.dsp +++ b/TAO/tests/Collocation/Collocation.dsp @@ -93,7 +93,7 @@ SOURCE=.\Coll_Tester.cpp # End Source File
# Begin Source File
-SOURCE=.\Collocation.cpp
+SOURCE=.\main.cpp
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/TAO/tests/Collocation/Collocation.dsw b/TAO/tests/Collocation/Collocation.dsw index d4f2e11a3eb..d43488c0151 100644 --- a/TAO/tests/Collocation/Collocation.dsw +++ b/TAO/tests/Collocation/Collocation.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ###############################################################################
-Project: "Coll_Test_Stubs DLL"=.\Coll_Test_Stubs.dsp - Package Owner=<4>
+Project: "Diamond"=.\Diamond.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -11,11 +11,14 @@ Package=<5> Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name Coll_Test_Stubs
+ End Project Dependency
}}}
###############################################################################
-Project: "Collocation"=.\Collocation.dsp - Package Owner=<4>
+Project: "Coll_Test_Stubs"=.\Coll_Test_Stubs.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -23,17 +26,11 @@ Package=<5> Package=<4>
{{{
- Begin Project Dependency
- Project_Dep_Name Diamond
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name Diamond DLL
- End Project Dependency
}}}
###############################################################################
-Project: "Diamond DLL"=.\Diamond.dsp - Package Owner=<4>
+Project: "Collocation"=.\Collocation.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -42,7 +39,7 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name Coll_Test_Stubs DLL
+ Project_Dep_Name Diamond
End Project Dependency
}}}
@@ -59,4 +56,3 @@ Package=<3> }}}
###############################################################################
-
diff --git a/TAO/tests/Collocation/Makefile.test b/TAO/tests/Collocation/Makefile.test index 7783e68fa5c..c5b79138535 100644 --- a/TAO/tests/Collocation/Makefile.test +++ b/TAO/tests/Collocation/Makefile.test @@ -20,7 +20,7 @@ LDLIBS = -lCollocation_Test_Stub \ SRC = Coll_Tester.cpp -BIN = Collocation +BIN = main #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/tests/Collocation/README b/TAO/tests/Collocation/README index 7aba7ebf6b3..62fe5832311 100644 --- a/TAO/tests/Collocation/README +++ b/TAO/tests/Collocation/README @@ -1,6 +1,6 @@ -This program performs a series of sanity check on the collocation -support in TAO. It also serves as an example of how to separate stub -and skeleton + implementation from the main program. +This program performs a series of sanity check on the collocation support +in TAO. It also serves as an example of how to separate stub and skeleton ++ implementation from the main program. After building the example, you'll get: diff --git a/TAO/tests/Collocation/Collocation.cpp b/TAO/tests/Collocation/main.cpp index b61625d0c6f..84ce376b7fc 100644 --- a/TAO/tests/Collocation/Collocation.cpp +++ b/TAO/tests/Collocation/main.cpp @@ -8,18 +8,15 @@ ACE_RCSID(Collocation, main, "$Id$") int main (int argc, char *argv[]) { + Collocation_Test coll_test; + ACE_TRY_NEW_ENV { - Collocation_Test coll_test; - coll_test.init (argc, argv, ACE_TRY_ENV); ACE_TRY_CHECK; coll_test.run (ACE_TRY_ENV); ACE_TRY_CHECK; - - coll_test.shutdown (ACE_TRY_ENV); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/DSI_Gateway/Makefile b/TAO/tests/DSI_Gateway/Makefile index ca42c763969..78c54fe783c 100644 --- a/TAO/tests/DSI_Gateway/Makefile +++ b/TAO/tests/DSI_Gateway/Makefile @@ -53,7 +53,7 @@ gateway: $(addprefix $(VDIR),$(GATEWAY_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK) client: $(addprefix $(VDIR),$(CLIENT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) $(TAO_CLNT_LIBS) $(POSTLINK) realclean: clean -$(RM) $(foreach ext, $(IDL_EXT), test$(ext)) diff --git a/TAO/tests/LongWrites/Coordinator.cpp b/TAO/tests/LongWrites/Coordinator.cpp index 8520ae19963..d9e382e42d0 100644 --- a/TAO/tests/LongWrites/Coordinator.cpp +++ b/TAO/tests/LongWrites/Coordinator.cpp @@ -5,8 +5,11 @@ ACE_RCSID(LongWrites, Coordinator, "$Id$") -Coordinator::Coordinator (void) - : shutdown_called_ (0) +Coordinator::Coordinator (CORBA::ULong initial_payload_size, + CORBA::Long test_iterations) + : initial_payload_size_ (initial_payload_size) + , test_iterations_ (test_iterations) + , shutdown_called_ (0) , pairs_count_ (0) , pairs_length_ (16) { @@ -59,12 +62,13 @@ Coordinator::start (CORBA::Environment &ACE_TRY_ENV) } } - CORBA::ULong event_size = 256 * 1024; + CORBA::ULong event_size = this->initial_payload_size_; ACE_DEBUG ((LM_DEBUG, "Running with payload = %d\n", event_size)); for (size_t j = 0; j != this->pairs_count_; ++j) { - this->pairs_[j].sender->send_events (100, event_size, + this->pairs_[j].sender->send_events (this->test_iterations_, + event_size, ACE_TRY_ENV); ACE_CHECK; } diff --git a/TAO/tests/LongWrites/Coordinator.h b/TAO/tests/LongWrites/Coordinator.h index db00336489a..9fe37a8e699 100644 --- a/TAO/tests/LongWrites/Coordinator.h +++ b/TAO/tests/LongWrites/Coordinator.h @@ -22,7 +22,8 @@ class Coordinator { public: /// Constructor - Coordinator (void); + Coordinator (CORBA::ULong initial_payload_size, + CORBA::Long test_iterations); /// Destructor virtual ~Coordinator (void); @@ -46,13 +47,27 @@ public: }; private: + /// Initial payload size + CORBA::ULong initial_payload_size_; + + /// Number of iterations performed by each server. + CORBA::Long test_iterations_; + + /// Synchronize internal data structure ACE_SYNCH_MUTEX mutex_; + /// Set to 1 once the test has shutdown int shutdown_called_; + /** @name List of pairs + * + * Implement a simple list of pairs + */ + //@{ size_t pairs_count_; size_t pairs_length_; Pair* pairs_; + //@} }; #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/tests/LongWrites/Makefile b/TAO/tests/LongWrites/Makefile index 07e5024de83..011d622d2c3 100644 --- a/TAO/tests/LongWrites/Makefile +++ b/TAO/tests/LongWrites/Makefile @@ -18,9 +18,9 @@ IDL_FILES = Test IDL_SRC = TestC.cpp TestS.cpp BIN = server client -SRC = $(addsuffix .cpp, $(BIN) Receiver Sender Coordinator) $(IDL_SRC) +SRC = $(addsuffix .cpp, $(BIN) Receiver Sender Sender_Task Coordinator) $(IDL_SRC) -CLIENT_OBJS = client.o TestC.o TestS.o Receiver.o Sender.o +CLIENT_OBJS = client.o TestC.o TestS.o Receiver.o Sender.o Sender_Task.o SERVER_OBJS = server.o TestC.o TestS.o Coordinator.o TAO_IDLFLAGS += -Ge 1 diff --git a/TAO/tests/LongWrites/Receiver.cpp b/TAO/tests/LongWrites/Receiver.cpp index 6425de4a18a..7d7f23ea44c 100644 --- a/TAO/tests/LongWrites/Receiver.cpp +++ b/TAO/tests/LongWrites/Receiver.cpp @@ -11,6 +11,13 @@ Receiver::Receiver (void) { } +CORBA::ULong +Receiver::message_count (void) +{ + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); + return this->message_count_; +} + void Receiver::dump_results () { @@ -31,5 +38,25 @@ Receiver::receive_data (const Test::Payload &payload, this->message_count_++; this->byte_count_ += payload.length (); - ACE_DEBUG ((LM_DEBUG, "Receiver::receive_data\n")); + if (this->message_count_ % 100 == 0) + { + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Receiver::receive_data %d\n", + this->message_count_)); + } +} + +void +Receiver::receive_data_oneway (const Test::Payload &payload, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->receive_data (payload, ACE_TRY_ENV); +} + +Test::Payload * +Receiver::return_data (const Test::Payload &payload, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return new Test::Payload (payload); } diff --git a/TAO/tests/LongWrites/Receiver.h b/TAO/tests/LongWrites/Receiver.h index 5242259d81f..8a0b50d1d05 100644 --- a/TAO/tests/LongWrites/Receiver.h +++ b/TAO/tests/LongWrites/Receiver.h @@ -27,6 +27,9 @@ public: /// Constructor Receiver (void); + /// Return the number of messages received so far + CORBA::ULong message_count (void); + /// Print out the results void dump_results (void); @@ -34,6 +37,12 @@ public: virtual void receive_data (const Test::Payload &payload, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_data_oneway (const Test::Payload &payload, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Test::Payload *return_data (const Test::Payload &payload, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); private: ACE_SYNCH_MUTEX mutex_; diff --git a/TAO/tests/LongWrites/Sender.cpp b/TAO/tests/LongWrites/Sender.cpp index 3d7926feb3b..e3dab2ee42b 100644 --- a/TAO/tests/LongWrites/Sender.cpp +++ b/TAO/tests/LongWrites/Sender.cpp @@ -5,10 +5,13 @@ ACE_RCSID(LongWrites, Sender, "$Id$") -Sender::Sender (void) - : receiver_count_ (0) +Sender::Sender (int test_type) + : test_type_ (test_type) + , receiver_count_ (0) , receiver_length_ (16) , shutdown_called_ (0) + , event_count_ (0) + , sender_task_ (this) { ACE_NEW (this->receivers_, Test::Receiver_var[this->receiver_length_]); } @@ -18,6 +21,17 @@ Sender::~Sender (void) delete[] this->receivers_; } +int +Sender::test_done (CORBA::ULong message_count) +{ + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); + return + (this->event_count_ != 0 + && this->receiver_count_ != 0 + && this->shutdown_called_ != 0 + && (4 * this->receiver_count_ + * this->event_count_ <= message_count)); +} int Sender::shutdown_called (void) @@ -28,9 +42,10 @@ Sender::shutdown_called (void) void Sender::add_receiver (Test::Receiver_ptr receiver, - CORBA::Environment &) + CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { + ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); if (this->receiver_count_ == this->receiver_length_) { this->receiver_length_ *= 2; @@ -47,35 +62,79 @@ Sender::add_receiver (Test::Receiver_ptr receiver, void Sender::send_events (CORBA::Long event_count, - CORBA::ULong event_size, - CORBA::Environment &ACE_TRY_ENV) + CORBA::ULong event_size, + CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { + { + ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); + this->event_count_ = event_count; + } + + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Sender::send_events - starting threads\n")); + + this->sender_task_.run_test (4, event_count, event_size); + + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Sender::send_events - threads are active\n")); +} + +int +Sender::run_test (CORBA::Long event_count, + CORBA::ULong event_size) +{ + ACE_DECLARE_NEW_CORBA_ENV; + Test::Payload payload(event_size); payload.length(event_size); + for (CORBA::ULong j = 0; j != event_size; ++j) + { + payload[j] = CORBA::Octet(j % 256); + } for (CORBA::Long i = 0; i != event_count; ++i) { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) - running iteration %d\n", i)); for (size_t j = 0; j != this->receiver_count_; ++j) { ACE_TRY { - this->receivers_[j]->receive_data (payload, - ACE_TRY_ENV); - ACE_TRY_CHECK; + if (this->test_type_ == Sender::TEST_ONEWAY) + { + this->receivers_[j]->receive_data_oneway (payload, + ACE_TRY_ENV); + ACE_TRY_CHECK; + } + else if (this->test_type_ == Sender::TEST_WRITE) + { + this->receivers_[j]->receive_data (payload, + ACE_TRY_ENV); + ACE_TRY_CHECK; + } + else + { + Test::Payload_var retval = + this->receivers_[j]->return_data (payload, + ACE_TRY_ENV); + ACE_TRY_CHECK; + } + } + ACE_CATCH (CORBA::TRANSIENT, ignored) + { } ACE_CATCHANY { + return -1; } ACE_ENDTRY; } } + return 0; } void Sender::shutdown (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) shutting down\n")); ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); + ACE_DEBUG ((LM_DEBUG, "(%P|%t) shutting down\n")); this->shutdown_called_ = 1; } diff --git a/TAO/tests/LongWrites/Sender.h b/TAO/tests/LongWrites/Sender.h index 0bcbea6d50e..219d108174a 100644 --- a/TAO/tests/LongWrites/Sender.h +++ b/TAO/tests/LongWrites/Sender.h @@ -7,6 +7,7 @@ #include "ace/pre.h" #include "TestS.h" +#include "Sender_Task.h" #if defined (_MSC_VER) # if (_MSC_VER >= 1200) @@ -22,14 +23,36 @@ class Sender { public: /// Constructor - Sender (void); + Sender (int test_type); /// Destructor virtual ~Sender (void); + /// Control the type of test + enum { + /// Run the test using receive_data_oneway() operations + TEST_ONEWAY, + /// Run the test using receive_data() operations + TEST_WRITE, + /// Run the test using return_data() operations + TEST_READ_WRITE, + }; + + /// Run the test in a separate thread + int run_test (CORBA::Long event_count, + CORBA::ULong event_size); + + /// Return 1 after <shutdown> is invoked and all the messages are + /// received. + int test_done (CORBA::ULong message_count); + /// Return 1 after <shutdown> is invoked int shutdown_called (void); + /// Return 1 if the test is finished, assuming <message_count> + /// messages have been received by the local Receiver + int iteration_done (CORBA::ULong messsage_count); + // = The skeleton methods virtual void add_receiver (Test::Receiver_ptr receiver, CORBA::Environment &ACE_TRY_ENV) @@ -42,13 +65,25 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); private: + /// The type of test + int test_type_; + + /// Synchronize the internal state ACE_SYNCH_MUTEX mutex_; + /// Keep track of all the receivers size_t receiver_count_; size_t receiver_length_; Test::Receiver_var *receivers_; + /// Set to 1 if the shutdown() operations was called. int shutdown_called_; + + /// Setup event count + CORBA::ULong event_count_; + + /// Used to run the threads + Sender_Task sender_task_; }; #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/tests/LongWrites/Sender_Task.cpp b/TAO/tests/LongWrites/Sender_Task.cpp new file mode 100644 index 00000000000..42a94d37f3e --- /dev/null +++ b/TAO/tests/LongWrites/Sender_Task.cpp @@ -0,0 +1,33 @@ +// +// $Id$ +// + +#include "Sender_Task.h" +#include "Sender.h" + +ACE_RCSID(LongWrites, Sender_Task, "$Id$") + +Sender_Task::Sender_Task (Sender *sender) + : sender_ (sender) + , event_count_ (0) + , event_size_ (0) +{ +} + +int +Sender_Task::run_test (int thread_count, + CORBA::Long event_count, + CORBA::ULong event_size) +{ + this->event_count_ = event_count; + this->event_size_ = event_size; + + return this->activate (THR_NEW_LWP | THR_JOINABLE, thread_count, 1); +} + +int +Sender_Task::svc (void) +{ + return this->sender_->run_test (this->event_count_, + this->event_size_); +} diff --git a/TAO/tests/LongWrites/Sender_Task.h b/TAO/tests/LongWrites/Sender_Task.h new file mode 100644 index 00000000000..562923a9df7 --- /dev/null +++ b/TAO/tests/LongWrites/Sender_Task.h @@ -0,0 +1,45 @@ +// +// $Id$ +// + +#ifndef LONGWRITES_SENDER_TASK_H +#define LONGWRITES_SENDER_TASK_H +#include "ace/pre.h" + +#include "tao/corbafwd.h" +#include "ace/Task.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class Sender; + +/// Implement a Task to run the experiments using multiple threads. +class Sender_Task : public ACE_Task_Base +{ +public: + /// Constructor + Sender_Task (Sender *sender); + + /// Run the experiment using the configuration below + int run_test (int thread_count, + CORBA::Long event_count, + CORBA::ULong event_size); + + /// Thread entry point + int svc (void); + +private: + /// Reference to the test interface + Sender *sender_; + + /// Total number of events + CORBA::Long event_count_; + + /// Size of each message + CORBA::ULong event_size_; +}; + +#include "ace/post.h" +#endif /* LONGWRITES_SENDER_TASK_H */ diff --git a/TAO/tests/LongWrites/Test.idl b/TAO/tests/LongWrites/Test.idl index 43d2eb7c3a3..de5dcee47ae 100644 --- a/TAO/tests/LongWrites/Test.idl +++ b/TAO/tests/LongWrites/Test.idl @@ -8,7 +8,13 @@ module Test interface Receiver { /// Receive a big payload - oneway void receive_data (in Payload the_payload); + oneway void receive_data_oneway (in Payload the_payload); + + /// Receive a big payload, using a twoway + void receive_data (in Payload the_payload); + + /// Return the same data, useful to check the server side + Payload return_data (in Payload the_payload); }; interface Sender { @@ -20,7 +26,7 @@ module Test in unsigned long event_size); /// Shutdown the sender - oneway void shutdown(); + void shutdown(); }; interface Coordinator { diff --git a/TAO/tests/LongWrites/client.cpp b/TAO/tests/LongWrites/client.cpp index 5557ded8776..2c890404d66 100644 --- a/TAO/tests/LongWrites/client.cpp +++ b/TAO/tests/LongWrites/client.cpp @@ -8,23 +8,39 @@ ACE_RCSID(LongWrites, client, "$Id$") const char *ior = "file://test.ior"; +int test_type = Sender::TEST_ONEWAY; + int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, "k:t:"); int c; while ((c = get_opts ()) != -1) switch (c) { case 'k': - ior = get_opts.optarg; - break; + ior = get_opts.optarg; + break; + case 't': + if (ACE_OS_String::strcasecmp(get_opts.optarg, "ONEWAY") == 0) + test_type = Sender::TEST_ONEWAY; + else if (ACE_OS_String::strcasecmp(get_opts.optarg, "WRITE") == 0) + test_type = Sender::TEST_WRITE; + else if (ACE_OS_String::strcasecmp(get_opts.optarg, "READ_WRITE") == 0) + test_type = Sender::TEST_READ_WRITE; + else + ACE_ERROR_RETURN ((LM_ERROR, + "Unknown test type %s\n", + get_opts.optarg), 1); + break; + case '?': default: ACE_ERROR_RETURN ((LM_ERROR, "usage: %s " - "-k <ior>" + "-k <ior> " + "-t <test_type (ONEWAY,WRITE,READ_WRITE)> " "\n", argv [0]), -1); @@ -90,7 +106,7 @@ main (int argc, char *argv[]) Sender *sender_impl; ACE_NEW_RETURN (sender_impl, - Sender, + Sender (test_type), 1); PortableServer::ServantBase_var sender_owner_transfer(sender_impl); @@ -105,18 +121,38 @@ main (int argc, char *argv[]) ACE_TRY_ENV); ACE_TRY_CHECK; - while (!sender_impl->shutdown_called ()) + for (int i = 0; i != 600; ++i) { ACE_Time_Value tv(1, 0); orb->run (tv, ACE_TRY_ENV); ACE_TRY_CHECK; + + CORBA::ULong message_count = + receiver_impl->message_count (); + if (sender_impl->test_done (message_count)) + break; } + ACE_DEBUG ((LM_DEBUG, "(%P|%t) - client event loop done\n")); + + ACE_Thread_Manager::instance ()->wait (); + + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) client - threads finished\n")); root_poa->destroy (1, 1, ACE_TRY_ENV); ACE_TRY_CHECK; orb->destroy (ACE_TRY_ENV); ACE_TRY_CHECK; + + CORBA::ULong message_count = + receiver_impl->message_count (); + if (!sender_impl->test_done (message_count)) + { + ACE_ERROR ((LM_ERROR, + "ERROR: missing messages, only received %d\n", + message_count)); + } } ACE_CATCHANY { @@ -126,5 +162,6 @@ main (int argc, char *argv[]) } ACE_ENDTRY; + ACE_DEBUG ((LM_DEBUG, "(%P|%t) - client finished\n")); return 0; } diff --git a/TAO/tests/LongWrites/run_test.pl b/TAO/tests/LongWrites/run_test.pl index 71eafcca0b4..8b6f21474a8 100755 --- a/TAO/tests/LongWrites/run_test.pl +++ b/TAO/tests/LongWrites/run_test.pl @@ -7,54 +7,76 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../bin'; use PerlACE::Run_Test; +use Getopt::Std; + +local ($opt_i, $opt_p); + +if (!getopts ('i:p:')) { + print "Usage: run_test.pl [-p payload_size] [-i iterations]\n"; + exit 1; +} + +my $server_args = ""; +if (defined $opt_i) { + $server_args .= " -i ".$opt_i; +} +if (defined $opt_p) { + $server_args .= " -p ".$opt_p; +} $iorfile = PerlACE::LocalFile ("server.ior"); -unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $iorfile"); -$CL1 = new PerlACE::Process ("client", " -k file://$iorfile "); -$CL2 = new PerlACE::Process ("client", " -k file://$iorfile "); -$CL3 = new PerlACE::Process ("client", " -k file://$iorfile "); +foreach my $i ("ONEWAY") { # , "WRITE", "READ_WRITE") { + + print "================ Running test $i ================\n"; + + + unlink $iorfile; + $SV = new PerlACE::Process ("server", "-o $iorfile $server_args"); + $CL1 = new PerlACE::Process ("client", " -k file://$iorfile -t $i"); + $CL2 = new PerlACE::Process ("client", " -k file://$iorfile -t $i"); + $CL3 = new PerlACE::Process ("client", " -k file://$iorfile -t $i"); -$SV->Spawn (); + $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { + if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; -} + } -$CL1->Spawn (60); -$CL2->Spawn (60); -$CL3->Spawn (60); + $CL1->Spawn (1200); + $CL2->Spawn (1200); + $CL3->Spawn (1200); -$client1 = $CL1->WaitKill (60); + $client1 = $CL1->WaitKill (60); -if ($client1 != 0) { + if ($client1 != 0) { print STDERR "ERROR: client 1 returned $client1\n"; $status = 1; -} + } -$client2 = $CL2->WaitKill (60); + $client2 = $CL2->WaitKill (60); -if ($client2 != 0) { + if ($client2 != 0) { print STDERR "ERROR: client 2 returned $client2\n"; $status = 1; -} + } -$client3 = $CL3->WaitKill (60); + $client3 = $CL3->WaitKill (60); -if ($client3 != 0) { + if ($client3 != 0) { print STDERR "ERROR: client 3 returned $client3\n"; $status = 1; -} + } -$server = $SV->TerminateWaitKill (5); + $server = $SV->TerminateWaitKill (5); -if ($server != 0) { + if ($server != 0) { print STDERR "ERROR: server returned $server\n"; $status = 1; + } } unlink $iorfile; diff --git a/TAO/tests/LongWrites/server.cpp b/TAO/tests/LongWrites/server.cpp index b57cafb201c..b431d67845b 100644 --- a/TAO/tests/LongWrites/server.cpp +++ b/TAO/tests/LongWrites/server.cpp @@ -8,23 +8,37 @@ ACE_RCSID(LongWrites, server, "$Id$") const char *ior_output_file = "test.ior"; +CORBA::ULong initial_event_size = 64 * 1024; +CORBA::Long test_iterations = 50; + int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, "o:p:i:"); int c; while ((c = get_opts ()) != -1) switch (c) { case 'o': - ior_output_file = get_opts.optarg; - break; + ior_output_file = get_opts.optarg; + break; + + case 'p': + initial_event_size = ACE_OS::atoi (get_opts.optarg); + break; + + case 'i': + test_iterations = ACE_OS::atoi (get_opts.optarg); + break; + case '?': default: ACE_ERROR_RETURN ((LM_ERROR, "usage: %s " - "-o <iorfile>" + "-o <iorfile> " + "-p <payload_size> " + "-i <test_iterations> " "\n", argv [0]), -1); @@ -64,7 +78,8 @@ main (int argc, char *argv[]) Coordinator *coordinator_impl; ACE_NEW_RETURN (coordinator_impl, - Coordinator, + Coordinator (initial_event_size, + test_iterations), 1); PortableServer::ServantBase_var coordinator_owner_transfer(coordinator_impl); @@ -73,7 +88,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (coordinator.in (), ACE_TRY_ENV); + orb->object_to_string (coordinator.in (), ACE_TRY_ENV); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -82,7 +97,7 @@ main (int argc, char *argv[]) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", ior_output_file), - 1); + 1); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); diff --git a/TAO/tests/MT_Timeout/Client_Task.cpp b/TAO/tests/MT_Timeout/Client_Task.cpp index 9885febb6a7..2939a32df88 100644 --- a/TAO/tests/MT_Timeout/Client_Task.cpp +++ b/TAO/tests/MT_Timeout/Client_Task.cpp @@ -21,7 +21,6 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb, , timeout_ (timeout) , successful_calls_ (0) , timed_out_calls_ (0) - , too_big_difference_ (0) { } @@ -38,12 +37,6 @@ Client_Task::timed_out_calls (void) const } int -Client_Task::too_big_difference_calls (void) const -{ - return this->too_big_difference_; -} - -int Client_Task::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); @@ -181,10 +174,10 @@ Client_Task::one_iteration (CORBA::Environment &ACE_TRY_ENV) // *way* off, this is an error. if (difference > 10) { - this->too_big_difference_++; ACE_ERROR ((LM_ERROR, - "(%P|%t) Elapsed time = %d, expected %d\n", + "ERROR: Elapsed time = %d, expected %d\n", elapsed_milliseconds, max_milliseconds)); + return -1; } } } diff --git a/TAO/tests/MT_Timeout/Client_Task.h b/TAO/tests/MT_Timeout/Client_Task.h index add5700ce85..1db19c3a068 100644 --- a/TAO/tests/MT_Timeout/Client_Task.h +++ b/TAO/tests/MT_Timeout/Client_Task.h @@ -46,10 +46,6 @@ public: /// Return the total number of timed out calls int timed_out_calls (void) const; - /// Return the number of calls with a too huge difference in - /// timeout versus actual response arrival. - int too_big_difference_calls (void) const; - /// Thread entry point int svc (void); @@ -82,8 +78,6 @@ private: /// Count how many calls timed out int timed_out_calls_; - int too_big_difference_; - /// Implement the Monitor Object Pattern. TAO_SYNCH_MUTEX mutex_; }; diff --git a/TAO/tests/MT_Timeout/client.cpp b/TAO/tests/MT_Timeout/client.cpp index bb4926b7bc9..a7c6e7ed5e5 100644 --- a/TAO/tests/MT_Timeout/client.cpp +++ b/TAO/tests/MT_Timeout/client.cpp @@ -109,27 +109,6 @@ main (int argc, char *argv[]) task0.successful_calls (), task0.timed_out_calls ())); - // No more than 5 % of the calls are allowed to have a too big - // difference - if (task0.too_big_difference_calls () > iterations/20 - || task1.too_big_difference_calls () > iterations/20) - { - ACE_DEBUG ((LM_DEBUG, - "ERROR: Too many calls have a too big difference between " - "timeout and elapsed time (task0: %d, task1: %d)\n", - task0.too_big_difference_calls (), - task1.too_big_difference_calls ())); - } - else if (task0.too_big_difference_calls () != 0 - || task1.too_big_difference_calls () != 0) - { - ACE_DEBUG ((LM_DEBUG, - "Warning: some calls (task0: %d, task1: %d) " - "exceeded their expected elapsed times\n", - task0.too_big_difference_calls (), - task1.too_big_difference_calls ())); - } - if (task0.timed_out_calls () == 0) { ACE_ERROR ((LM_ERROR, @@ -158,10 +137,3 @@ main (int argc, char *argv[]) return 0; } - - - - - - - diff --git a/TAO/tests/Makefile b/TAO/tests/Makefile index 717adea4b98..3ef2db30830 100644 --- a/TAO/tests/Makefile +++ b/TAO/tests/Makefile @@ -65,7 +65,12 @@ DIRS = CDR \ Crash_On_Write \ Reliable_Oneways \ Blocking_Sync_None \ - Oneway_Buffering + Oneway_Buffering \ + Queued_Message_Test \ + Big_Oneways \ + Big_Twoways \ + Big_Request_Muxing \ + AMI_Buffering ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO diff --git a/TAO/tests/Makefile.bor b/TAO/tests/Makefile.bor index 558bbb0cea4..85b9632d2f5 100644 --- a/TAO/tests/Makefile.bor +++ b/TAO/tests/Makefile.bor @@ -4,6 +4,7 @@ DIRS = \ AMI \ + AMI_Buffering \ AMI_Timeouts \ Bidirectional \ Bidirectional_NestedUpcall \ diff --git a/TAO/tests/Muxing/run_test.pl b/TAO/tests/Muxing/run_test.pl index 969633d018b..a9031c6e821 100755 --- a/TAO/tests/Muxing/run_test.pl +++ b/TAO/tests/Muxing/run_test.pl @@ -17,7 +17,7 @@ $CL2 = new PerlACE::Process ("client", " -k file://$iorfile"); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; diff --git a/TAO/tests/OctetSeq/run_test1.pl b/TAO/tests/OctetSeq/run_test1.pl index c4cfa193173..64b6c37081c 100755 --- a/TAO/tests/OctetSeq/run_test1.pl +++ b/TAO/tests/OctetSeq/run_test1.pl @@ -9,7 +9,7 @@ use lib '../../../bin'; use PerlACE::Run_Test; $status = 0; -$iorfile = PerlACE::LocalFile ("test1.ior"); +$iorfile = PerlACE::LocalFile ("test.ior"); unlink $iorfile; diff --git a/TAO/tests/OctetSeq/run_test2.pl b/TAO/tests/OctetSeq/run_test2.pl index ec09a1cb901..8828d093943 100755 --- a/TAO/tests/OctetSeq/run_test2.pl +++ b/TAO/tests/OctetSeq/run_test2.pl @@ -9,7 +9,7 @@ use lib '../../../bin'; use PerlACE::Run_Test; $status = 0; -$iorfile = PerlACE::LocalFile ("test2.ior"); +$iorfile = PerlACE::LocalFile ("test.ior"); unlink $iorfile; diff --git a/TAO/tests/Oneway_Buffering/README b/TAO/tests/Oneway_Buffering/README index c2a90e9b932..fb0b35bdae6 100644 --- a/TAO/tests/Oneway_Buffering/README +++ b/TAO/tests/Oneway_Buffering/README @@ -23,9 +23,10 @@ $ ./run_test.pl maximum time allowed for a single test. Three separate scripts are used to stay within those bounds: -$ ./run_message_count.pl -$ ./run_timeout.pl -$ ./run_message_bytes.pl +$ ./run_sync_none.pl +$ ./run_sync_with_transport.pl +$ ./run_sync_with_server.pl +$ ./run_sync_with_target.pl each script returns 0 if the test was successful. diff --git a/TAO/tests/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp index add62fd6557..7c10393f717 100644 --- a/TAO/tests/Oneway_Buffering/client.cpp +++ b/TAO/tests/Oneway_Buffering/client.cpp @@ -13,6 +13,7 @@ int iterations = 200; int run_message_count_test = 0; int run_timeout_test = 0; +int run_timeout_reactive_test = 0; int run_buffer_size_test = 0; const int PAYLOAD_LENGTH = 1024; @@ -21,7 +22,7 @@ const int TIMEOUT_MILLISECONDS = 50; const int BUFFER_SIZE = 64 * PAYLOAD_LENGTH; /// Check that no more than 10% of the messages are not sent. -const double PROGRESS_TOLERANCE = 0.9; +const double LIVENESS_TOLERANCE = 0.9; /// Factor in GIOP overhead in the buffer size test const double GIOP_OVERHEAD = 0.9; @@ -29,7 +30,7 @@ const double GIOP_OVERHEAD = 0.9; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:a:i:ctb"); + ACE_Get_Opt get_opts (argc, argv, "k:a:i:ctbr"); int c; while ((c = get_opts ()) != -1) @@ -59,6 +60,10 @@ parse_args (int argc, char *argv[]) run_buffer_size_test = 1; break; + case 'r': + run_timeout_reactive_test = 1; + break; + case '?': default: ACE_ERROR_RETURN ((LM_ERROR, @@ -66,7 +71,7 @@ parse_args (int argc, char *argv[]) "-k <server_ior> " "-a <admin_ior> " "-i <iterations> " - "<-c|-t|-b> " + "<-c|-t|-b|-r> " "\n", argv [0]), -1); @@ -80,6 +85,7 @@ run_message_count (CORBA::ORB_ptr orb, Test::Oneway_Buffering_ptr oneway_buffering, Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin, CORBA::Environment &ACE_TRY_ENV); + int run_timeout (CORBA::ORB_ptr orb, Test::Oneway_Buffering_ptr oneway_buffering, @@ -87,6 +93,12 @@ run_timeout (CORBA::ORB_ptr orb, CORBA::Environment &ACE_TRY_ENV); int +run_timeout_reactive (CORBA::ORB_ptr orb, + Test::Oneway_Buffering_ptr oneway_buffering, + Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin, + CORBA::Environment &ACE_TRY_ENV); + +int run_buffer_size (CORBA::ORB_ptr orb, Test::Oneway_Buffering_ptr oneway_buffering, Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin, @@ -159,6 +171,17 @@ main (int argc, char *argv[]) ACE_TRY_ENV); ACE_TRY_CHECK; } + else if (run_timeout_reactive_test) + { + ACE_DEBUG ((LM_DEBUG, + "Running timeout (reactive) flushing test\n")); + test_failed = + run_timeout_reactive (orb.in (), + oneway_buffering.in (), + oneway_buffering_admin.in (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + } else if (run_buffer_size_test) { ACE_DEBUG ((LM_DEBUG, @@ -269,16 +292,17 @@ configure_policies (CORBA::ORB_ptr orb, flusher = Test::Oneway_Buffering::_narrow (object.in (), ACE_TRY_ENV); ACE_CHECK_RETURN (-1); - + return 0; } int -run_progress_test (Test::Oneway_Buffering_ptr oneway_buffering, +run_liveness_test (Test::Oneway_Buffering_ptr oneway_buffering, Test::Oneway_Buffering_ptr flusher, Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin, CORBA::Environment &ACE_TRY_ENV) { + ACE_DEBUG ((LM_DEBUG, ".... checking for liveness\n")); int test_failed = 0; // Get back in sync with the server... @@ -291,12 +315,14 @@ run_progress_test (Test::Oneway_Buffering_ptr oneway_buffering, oneway_buffering_admin->request_count (ACE_TRY_ENV); ACE_CHECK_RETURN (-1); - int progress_test_iterations = int(send_count); + int liveness_test_iterations = int(send_count); Test::Payload payload (PAYLOAD_LENGTH); payload.length (PAYLOAD_LENGTH); + for (int j = 0; j != PAYLOAD_LENGTH; ++j) + payload[j] = CORBA::Octet(j % 256); - for (int i = 0; i != progress_test_iterations; ++i) + for (int i = 0; i != liveness_test_iterations; ++i) { oneway_buffering->receive_data (payload, ACE_TRY_ENV); ACE_CHECK_RETURN (-1); @@ -310,7 +336,7 @@ run_progress_test (Test::Oneway_Buffering_ptr oneway_buffering, // expect it to fall too far behind, i.e. at least 90% of the // messages should be delivered.... CORBA::ULong expected = - CORBA::ULong (PROGRESS_TOLERANCE * send_count); + CORBA::ULong (LIVENESS_TOLERANCE * send_count); if (receive_count < expected) { @@ -338,7 +364,7 @@ run_message_count (CORBA::ORB_ptr orb, buffering_constraint.message_bytes = 0; buffering_constraint.timeout = 0; - Test::Oneway_Buffering_var flusher; + Test::Oneway_Buffering_var flusher; int test_failed = configure_policies (orb, buffering_constraint, oneway_buffering, flusher.out (), @@ -350,6 +376,8 @@ run_message_count (CORBA::ORB_ptr orb, Test::Payload payload (PAYLOAD_LENGTH); payload.length (PAYLOAD_LENGTH); + for (int j = 0; j != PAYLOAD_LENGTH; ++j) + payload[j] = CORBA::Octet(j % 256); CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) @@ -413,14 +441,14 @@ run_message_count (CORBA::ORB_ptr orb, } } - int progress_test_failed = - run_progress_test (oneway_buffering, + int liveness_test_failed = + run_liveness_test (oneway_buffering, flusher.in (), oneway_buffering_admin, ACE_TRY_ENV); ACE_CHECK_RETURN (-1); - if (progress_test_failed) + if (liveness_test_failed) test_failed = 1; return test_failed; @@ -438,7 +466,7 @@ run_timeout (CORBA::ORB_ptr orb, buffering_constraint.message_bytes = 0; buffering_constraint.timeout = TIMEOUT_MILLISECONDS * 10000; - Test::Oneway_Buffering_var flusher; + Test::Oneway_Buffering_var flusher; int test_failed = configure_policies (orb, buffering_constraint, oneway_buffering, flusher.out (), @@ -450,6 +478,8 @@ run_timeout (CORBA::ORB_ptr orb, Test::Payload payload (PAYLOAD_LENGTH); payload.length (PAYLOAD_LENGTH); + for (int j = 0; j != PAYLOAD_LENGTH; ++j) + payload[j] = CORBA::Octet(j % 256); CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) @@ -513,15 +543,125 @@ run_timeout (CORBA::ORB_ptr orb, } } } - - int progress_test_failed = - run_progress_test (oneway_buffering, + + int liveness_test_failed = + run_liveness_test (oneway_buffering, + flusher.in (), + oneway_buffering_admin, + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (liveness_test_failed) + test_failed = 1; + + + return test_failed; +} + +int +run_timeout_reactive (CORBA::ORB_ptr orb, + Test::Oneway_Buffering_ptr oneway_buffering, + Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin, + CORBA::Environment &ACE_TRY_ENV) +{ + TAO::BufferingConstraint buffering_constraint; + buffering_constraint.mode = TAO::BUFFER_TIMEOUT; + buffering_constraint.message_count = 0; + buffering_constraint.message_bytes = 0; + buffering_constraint.timeout = TIMEOUT_MILLISECONDS * 10000; + + Test::Oneway_Buffering_var flusher; + int test_failed = + configure_policies (orb, buffering_constraint, + oneway_buffering, flusher.out (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (test_failed != 0) + return test_failed; + + Test::Payload payload (PAYLOAD_LENGTH); + payload.length (PAYLOAD_LENGTH); + for (int j = 0; j != PAYLOAD_LENGTH; ++j) + payload[j] = CORBA::Octet(j % 256); + + CORBA::ULong send_count = 0; + for (int i = 0; i != iterations; ++i) + { + // Get back in sync with the server... + flusher->flush (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + flusher->sync (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + CORBA::ULong initial_receive_count = + oneway_buffering_admin->request_count (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (initial_receive_count != send_count) + { + test_failed = 1; + ACE_ERROR ((LM_ERROR, + "ERROR: Iteration %d message lost (%u != %u)\n", + i, initial_receive_count, send_count)); + } + + ACE_Time_Value start = ACE_OS::gettimeofday (); + for (int j = 0; j != 20; ++j) + { + oneway_buffering->receive_data (payload, ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + send_count++; + } + while (1) + { + CORBA::ULong receive_count = + oneway_buffering_admin->request_count (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + ACE_Time_Value sleep (0, 10000); + orb->run (sleep, ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start; + if (receive_count != initial_receive_count) + { + if (elapsed.msec () < TIMEOUT_MILLISECONDS) + { + test_failed = 1; + ACE_ERROR ((LM_ERROR, + "ERROR: Iteration %d flush before " + "timeout expired. " + "Elapsed = %d, Timeout = %d msecs\n", + i, + elapsed.msec (), TIMEOUT_MILLISECONDS)); + } + // terminate the while loop. + break; + } + + if (elapsed.msec () > 2 * TIMEOUT_MILLISECONDS) + { + test_failed = 1; + ACE_ERROR ((LM_ERROR, + "ERROR: Iteration %d no flush past " + "timeout threshold. " + "Elapsed = %d, Timeout = %d msecs\n", + i, + elapsed.msec (), TIMEOUT_MILLISECONDS)); + break; + } + } + } + + int liveness_test_failed = + run_liveness_test (oneway_buffering, flusher.in (), oneway_buffering_admin, ACE_TRY_ENV); ACE_CHECK_RETURN (-1); - if (progress_test_failed) + if (liveness_test_failed) test_failed = 1; @@ -540,7 +680,7 @@ run_buffer_size (CORBA::ORB_ptr orb, buffering_constraint.message_bytes = BUFFER_SIZE; buffering_constraint.timeout = 0; - Test::Oneway_Buffering_var flusher; + Test::Oneway_Buffering_var flusher; int test_failed = configure_policies (orb, buffering_constraint, oneway_buffering, flusher.out (), @@ -552,6 +692,8 @@ run_buffer_size (CORBA::ORB_ptr orb, Test::Payload payload (PAYLOAD_LENGTH); payload.length (PAYLOAD_LENGTH); + for (int j = 0; j != PAYLOAD_LENGTH; ++j) + payload[j] = CORBA::Octet(j % 256); CORBA::ULong bytes_sent = 0; for (int i = 0; i != iterations; ++i) @@ -620,14 +762,14 @@ run_buffer_size (CORBA::ORB_ptr orb, } } - int progress_test_failed = - run_progress_test (oneway_buffering, + int liveness_test_failed = + run_liveness_test (oneway_buffering, flusher.in (), oneway_buffering_admin, ACE_TRY_ENV); ACE_CHECK_RETURN (-1); - if (progress_test_failed) + if (liveness_test_failed) test_failed = 1; return test_failed; diff --git a/TAO/tests/Oneway_Buffering/run_test.pl b/TAO/tests/Oneway_Buffering/run_test.pl index 30593090375..99a64dd9dd5 100755 --- a/TAO/tests/Oneway_Buffering/run_test.pl +++ b/TAO/tests/Oneway_Buffering/run_test.pl @@ -11,7 +11,7 @@ use PerlACE::Run_Test; $admin_iorfile = PerlACE::LocalFile ("admin.ior"); $server_iorfile = PerlACE::LocalFile ("server.ior"); -foreach $test_type ("-c", "-t", "-b") { +foreach $test_type ("-c", "-t", "-b", "-r") { unlink $admin_iorfile; unlink $server_iorfile; diff --git a/TAO/tests/Oneway_Buffering/run_timeout_reactive.pl b/TAO/tests/Oneway_Buffering/run_timeout_reactive.pl new file mode 100755 index 00000000000..31f09190b88 --- /dev/null +++ b/TAO/tests/Oneway_Buffering/run_timeout_reactive.pl @@ -0,0 +1,65 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib '../../../bin'; +use PerlACE::Run_Test; + +$admin_iorfile = PerlACE::LocalFile ("admin.ior"); +$server_iorfile = PerlACE::LocalFile ("server.ior"); + +unlink $admin_iorfile; +unlink $server_iorfile; + +my $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +my $SV = new PerlACE::Process ("server", "-o $server_iorfile"); +my $CL = new PerlACE::Process ("client", + " -k file://$server_iorfile " + ."-a file://$admin_iorfile " + ."-r "); + +$AD->Spawn (); + +if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { + print STDERR "ERROR: cannot find file <$admin_iorfile>\n"; + $AD->Kill (); $AD->TimedWait (1); + exit 1; +} + +$SV->Spawn (); + +if (PerlACE::waitforfile_timed ($server_iorfile, 10) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $AD->Kill (); $AD->TimedWait (1); + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$client = $CL->SpawnWaitKill (300); + +if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; +} + +$server = $SV->WaitKill (10); + +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; +} + +$admin = $AD->WaitKill (10); + +if ($admin != 0) { + print STDERR "ERROR: admin returned $admin\n"; + $status = 1; +} + +unlink $server_iorfile; +unlink $admin_iorfile; + +exit $status; diff --git a/TAO/tests/Param_Test/Makefile b/TAO/tests/Param_Test/Makefile index 0fab79a7d3f..04c4956c3d7 100644 --- a/TAO/tests/Param_Test/Makefile +++ b/TAO/tests/Param_Test/Makefile @@ -119,7 +119,7 @@ server: $(addprefix $(VDIR),$(PARAM_TEST_SVR_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) client: $(addprefix $(VDIR),$(PARAM_TEST_CLT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) $(TAO_CLNT_LIBS) $(POSTLINK) anyop: $(addprefix $(VDIR),$(PARAM_TEST_ANYOP_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK) diff --git a/TAO/tests/Queued_Message_Test/Makefile b/TAO/tests/Queued_Message_Test/Makefile new file mode 100644 index 00000000000..176100a9d75 --- /dev/null +++ b/TAO/tests/Queued_Message_Test/Makefile @@ -0,0 +1,154 @@ +#---------------------------------------------------------------------------- +# +# $Id$ +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +ifndef TAO_ROOT + TAO_ROOT = $(ACE_ROOT)/TAO +endif # ! TAO_ROOT + +LDLIBS = -lTAO + +IDL_FILES = +IDL_SRC = +BIN = Queued_Message_Test + +SRC = $(addsuffix .cpp, $(BIN)) $(IDL_SRC) + +QUEUED_MESSAGE_OBJS = Queued_Message_Test.o + +TAO_IDLFLAGS += -Ge 1 +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(TAO_ROOT)/rules.tao.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +include $(TAO_ROOT)/taoconfig.mk + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- + +.PRECIOUS: $(foreach ext, $(IDL_EXT), Test$(ext)) + +Queued_Message_Test: $(addprefix $(VDIR),$(QUEUED_MESSAGE_OBJS)) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK) + +realclean: clean + -$(RM) $(foreach ext, $(IDL_EXT), Test$(ext)) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/Queued_Message_Test.o .obj/Queued_Message_Test.so .shobj/Queued_Message_Test.o .shobj/Queued_Message_Test.so: Queued_Message_Test.cpp \ + $(TAO_ROOT)/tao/Queued_Message.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Queued_Message.inl + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp new file mode 100644 index 00000000000..2742e76a92b --- /dev/null +++ b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp @@ -0,0 +1,163 @@ +// ============================================================================ +/** + * @brief Unit test for the TAO_Queued_Message class + * + * $Id$ + * + * @author Carlos O'Ryan <coryan@uci.edu> + */ +// ============================================================================ + +#include "tao/Asynch_Queued_Message.h" + +ACE_RCSID(tests, Queued_Message_Test, "$Id$") + +/// Max number of bytes on each message block +const size_t max_block_length = 256; + +static TAO_Queued_Message * +create_new_message (ACE_RANDR_TYPE &seed) +{ + // First create a message block + size_t block_size = + 64 + ACE_OS::rand_r(seed) % (max_block_length - 64); + ACE_Message_Block mb (block_size); + mb.wr_ptr (block_size); + + return new TAO_Asynch_Queued_Message (&mb); +} + +/// Add a new message at the tail of the queue. +static void push_back_message (TAO_Queued_Message *&head, + TAO_Queued_Message *&tail, + ACE_RANDR_TYPE &seed) +{ + TAO_Queued_Message *msg = create_new_message (seed); + msg->push_back (head, tail); +} + +/// Add a new message at the head of the queue. +static void push_front_message (TAO_Queued_Message *&head, + TAO_Queued_Message *&tail, + ACE_RANDR_TYPE &seed) +{ + TAO_Queued_Message *msg = create_new_message (seed); + msg->push_front (head, tail); +} + +/// Remove the message at the head of the queue, and simulate the +/// behavior of the I/O subsystem when processing such messages. +static void del_message (TAO_Queued_Message *&head, + TAO_Queued_Message *&tail, + ACE_RANDR_TYPE &seed) +{ + // ACE_DEBUG ((LM_DEBUG, "Removing message\n")); + TAO_Queued_Message *current = head; + current->remove_from_list (head, tail); + + // Simulate message writing: each message is 'sent' using + // multiple write() calls, in this simulation, we call the + // bytes_transferred() method until all messages are removed. + + size_t total_length = current->message_length (); + while (total_length > 0) + { + // select how many bytes we want to 'send' in this iteration. + size_t t = ACE_OS::rand_r(seed) % 256 + 1; + if (t > total_length) + t = total_length; + + current->bytes_transferred (t); + total_length -= t; + } + if (!current->all_data_sent ()) + { + ACE_ERROR ((LM_DEBUG, + "ERROR: inconsistent state in Queued_Message\n")); + ACE_OS::exit (1); + } + current->destroy (); +} + +int +main (int, ACE_TCHAR *[]) +{ + + // Initialize a random seed to get better coverage. + // @@ The random seed and default values should be configurable + // using command line options. + + ACE_hrtime_t current_hrtime = ACE_OS::gethrtime (); + ACE_UINT32 low_bits = + ACE_CU64_TO_CU32(current_hrtime); + ACE_RANDR_TYPE seed = + ACE_static_cast(ACE_RANDR_TYPE,low_bits); + + ACE_DEBUG ((LM_DEBUG, "Running test SEED = %d\n", seed)); + + TAO_Queued_Message *head = 0; + TAO_Queued_Message *tail = 0; + + int add_count = 0; + int del_count = 0; + + const int iterations = 100; + int i; + for (i = 0; i != iterations; ++i) + { + push_back_message (head, tail, seed); + add_count++; + if (ACE_OS::rand_r(seed) % 100 > 90) + { + // every so often remove a message also. + if (head != 0) + { + del_message (head, tail, seed); + del_count++; + } + } + } + + // second phase, change the probabilities of removing a message. + for (i = 0; i != iterations; ++i) + { + if (ACE_OS::rand_r(seed) % 100 > 90) + { + push_back_message (head, tail, seed); add_count++; + } + if (ACE_OS::rand_r(seed) % 100 > 90) + { + push_front_message (head, tail, seed); add_count++; + } + if (head != 0) + { + del_message (head, tail, seed); + del_count++; + } + } + + // Go through a phase where all messages are removed. + while (head != 0) + { + del_message (head, tail, seed); + del_count++; + } + + if (tail != 0) + { + ACE_ERROR_RETURN ((LM_ERROR, + "ERROR: inconsistent state in message queue\n"), + 1); + } + + if (add_count != del_count) + { + ACE_ERROR_RETURN ((LM_ERROR, + "ERROR: mismatched (%d != %d) add and del counts\n", + add_count, del_count), + 1); + } + + + return 0; +} diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.dsp b/TAO/tests/Queued_Message_Test/Queued_Message_Test.dsp index 361ead919fc..33afc8707d1 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.dsp +++ b/TAO/tests/Queued_Message_Test/Queued_Message_Test.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="AVStreams Modify_QoS Sender" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Queued_Message_Test" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=AVStreams Modify_QoS Sender - Win32 Debug
+CFG=Queued_Message_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "sender.mak".
+!MESSAGE NMAKE /f "Queued_Message_Test.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "sender.mak" CFG="AVStreams Modify_QoS Sender - Win32 Debug"
+!MESSAGE NMAKE /f "Queued_Message_Test.mak" CFG="Queued_Message_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "AVStreams Modify_QoS Sender - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "AVStreams Modify_QoS Sender - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Queued_Message_Test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Queued_Message_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -28,7 +28,7 @@ CFG=AVStreams Modify_QoS Sender - Win32 Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "AVStreams Modify_QoS Sender - Win32 Release"
+!IF "$(CFG)" == "Queued_Message_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\.." /I "..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -51,10 +51,9 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 tao.lib ace.lib TAO_PortableServer.lib TAO_AV.lib TAO_CosProperty.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_IORTable.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao\IORTable"
-# SUBTRACT LINK32 /pdb:none
+# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"
-!ELSEIF "$(CFG)" == "AVStreams Modify_QoS Sender - Win32 Debug"
+!ELSEIF "$(CFG)" == "Queued_Message_Test - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -68,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\.." /I "..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -77,29 +76,20 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_AVd.lib TAO_CosPropertyd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_IORTabled.lib /nologo /subsystem:console /debug /machine:I386 /out:"sender.exe" /pdbtype:sept /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao\IORTable"
-# SUBTRACT LINK32 /pdb:none
+# ADD LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
!ENDIF
# Begin Target
-# Name "AVStreams Modify_QoS Sender - Win32 Release"
-# Name "AVStreams Modify_QoS Sender - Win32 Debug"
+# Name "Queued_Message_Test - Win32 Release"
+# Name "Queued_Message_Test - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\sender.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\sender.h
+SOURCE=.\Queued_Message_Test.cpp
# End Source File
# End Group
# End Target
diff --git a/TAO/tests/Queued_Message_Test/Queued_Message_Test.dsw b/TAO/tests/Queued_Message_Test/Queued_Message_Test.dsw new file mode 100644 index 00000000000..03521d0402c --- /dev/null +++ b/TAO/tests/Queued_Message_Test/Queued_Message_Test.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "Queued_Message_Test"=.\Queued_Message_Test.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/TAO/tests/README b/TAO/tests/README index e03bd5ca19d..34da58a9f87 100644 --- a/TAO/tests/README +++ b/TAO/tests/README @@ -8,11 +8,31 @@ how to run the following tests: This is a simple test for AMI callback model. + . AMI_Buffering + + Test the buffering constraint policy when applied to AMI + requests. + . AMI_Timeouts This is a simple test for AMI callback model in combination with timeouts (relative roundtrip timeout policy). + . Big_Oneways + + Stress test non-blocking I/O features in the ORB. + + . Big_Twoways + + More stress testing for the non-blocking I/O features in the + ORB, this time also test receiving big blocks of data. + + . Big_Requests_Muxing + + More stress testing for the non-blocking I/O features in the + ORB, this time we send reliable and unreliable oneways + through the same connection. + . Bidirectional This is a test that exercises the birectional GIOP connection diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.cpp b/TAO/tests/RTCORBA/Client_Protocol/client.cpp index 3edb179bc2c..0489091636b 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/client.cpp +++ b/TAO/tests/RTCORBA/Client_Protocol/client.cpp @@ -75,6 +75,7 @@ exception_test (Test_ptr server, } ACE_CATCH (CORBA::INV_POLICY, ex) { + ACE_DEBUG ((LM_DEBUG, msg)); ACE_DEBUG ((LM_DEBUG, "INV_POLICY exception is caught as expected.\n")); } diff --git a/TAO/tests/RTCORBA/Thread_Pool/Makefile b/TAO/tests/RTCORBA/Thread_Pool/Makefile index 05e9980d565..c4b625d8379 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/Makefile +++ b/TAO/tests/RTCORBA/Thread_Pool/Makefile @@ -14,7 +14,7 @@ endif # ! TAO_ROOT IDL_FILES = test IDL_SRC = testC.cpp testS.cpp -BIN_UNCHECKED = client server +BIN = client server SRC = $(addsuffix .cpp, $(BIN) test_i) $(IDL_SRC) @@ -63,9 +63,6 @@ realclean: clean $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -73,14 +70,21 @@ realclean: clean $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -92,119 +96,233 @@ realclean: clean $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ - testC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + testC.h $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ - $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/NVList.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(TAO_ROOT)/tao/StringSeqC.h + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + testC.i .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp test_i.h testS.h testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -212,19 +330,26 @@ realclean: clean $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -242,26 +367,36 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ @@ -269,93 +404,205 @@ realclean: clean $(ACE_ROOT)/ace/Unbounded_Set.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Array_Base.inl \ - $(TAO_ROOT)/tao/StringSeqC.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + testC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - testS_T.h testS_T.cpp testS_T.i \ - $(ACE_ROOT)/ace/Get_Opt.h + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + testS_T.h testS_T.i testS_T.cpp testS.i test_i.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp .obj/test_i.o .obj/test_i.so .shobj/test_i.o .shobj/test_i.so: test_i.cpp test_i.h testS.h testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -363,19 +610,26 @@ realclean: clean $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -393,26 +647,36 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ @@ -420,93 +684,130 @@ realclean: clean $(ACE_ROOT)/ace/Unbounded_Set.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Array_Base.inl \ - $(TAO_ROOT)/tao/StringSeqC.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + testC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - testS_T.h testS_T.cpp testS_T.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + testS_T.h testS_T.i testS_T.cpp testS.i test_i.i \ $(TAO_ROOT)/tao/debug.h .obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -514,19 +815,26 @@ realclean: clean $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -544,26 +852,36 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ @@ -571,151 +889,227 @@ realclean: clean $(ACE_ROOT)/ace/Unbounded_Set.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Array_Base.inl \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/Stub.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + testC.i $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ - $(TAO_ROOT)/tao/Service_Context.h \ $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/RequestInfo_Util.h \ - testC.i + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/RequestInfo_Util.h .obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -723,19 +1117,26 @@ realclean: clean $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -753,26 +1154,36 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ @@ -780,170 +1191,250 @@ realclean: clean $(ACE_ROOT)/ace/Unbounded_Set.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Array_Base.inl \ - $(TAO_ROOT)/tao/StringSeqC.h \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + testC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - testS_T.h testS_T.cpp testS_T.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + testS_T.h testS_T.i testS_T.cpp testS.i \ $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ $(ACE_ROOT)/ace/Pair_T.h \ - $(ACE_ROOT)/ace/Pair_T.cpp \ $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/RequestInfo_Util.h \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(ACE_ROOT)/ace/Dynamic_Service.i \ - testS.i + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/RequestInfo_Util.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp index bf7d423454c..2d9e0ca8217 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp @@ -80,8 +80,6 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; ACE_ASSERT (r == i); - /// Assert disappears on with optimizations on. - ACE_UNUSED_ARG (r); } if (shutdown_server) diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp index 5db15b839c8..687edef8835 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp @@ -114,9 +114,8 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::ULong stacksize = 0; - RTCORBA::Priority default_priority = - RTCORBA::Priority (ACE_DEFAULT_THREAD_PRIORITY); - CORBA::Boolean allow_request_buffering = 0; + RTCORBA::Priority default_priority = ACE_DEFAULT_THREAD_PRIORITY; + CORBA::Boolean allow_request_buffering = FALSE; CORBA::ULong max_buffered_requests = 0; CORBA::ULong max_request_buffer_size = 0; @@ -140,9 +139,8 @@ main (int argc, char *argv[]) max_request_buffer_size, ACE_TRY_ENV); ACE_TRY_CHECK; - ACE_UNUSED_ARG (id1); - CORBA::Boolean allow_borrowing = 0; + CORBA::Boolean allow_borrowing = FALSE; RTCORBA::ThreadpoolLanes lanes; lanes.length (1); @@ -159,7 +157,6 @@ main (int argc, char *argv[]) max_request_buffer_size, ACE_TRY_ENV); ACE_TRY_CHECK; - ACE_UNUSED_ARG (id2); orb->run (ACE_TRY_ENV); ACE_TRY_CHECK; diff --git a/TAO/tests/Reliable_Oneways/Test.idl b/TAO/tests/Reliable_Oneways/Test.idl index 39593d25d78..a083bd6412c 100644 --- a/TAO/tests/Reliable_Oneways/Test.idl +++ b/TAO/tests/Reliable_Oneways/Test.idl @@ -24,6 +24,6 @@ module Test interface Shutdown_Helper { /// Shutdown the server - oneway void shutdown (); + void shutdown (); }; }; diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp index 124d806be64..11e3f62e6a3 100644 --- a/TAO/tests/Timeout/client.cpp +++ b/TAO/tests/Timeout/client.cpp @@ -47,6 +47,9 @@ parse_args (int argc, char *argv[]) return 0; } +static int timeout_count = 0; +static int in_time_count = 0; + void send_echo (CORBA::ORB_ptr orb, Simple_Server_ptr server, @@ -58,9 +61,12 @@ send_echo (CORBA::ORB_ptr orb, server->echo (0, t, ACE_TRY_ENV); ACE_TRY_CHECK; + in_time_count++; } ACE_CATCH (CORBA::TIMEOUT, timeout) { + timeout_count++; + // Trap this exception and continue... // ACE_DEBUG ((LM_DEBUG, // "==> Trapped a TIMEOUT exception (expected)\n")); @@ -242,10 +248,25 @@ int main (int argc, char* argv[]) server->shutdown (ACE_TRY_ENV); ACE_TRY_CHECK; + + if (timeout_count == 0) + { + ACE_ERROR ((LM_ERROR, "ERROR: No messaged timed out\n")); + } + if (in_time_count == 0) + { + ACE_ERROR ((LM_ERROR, "ERROR: No messages on time\n")); + } + + ACE_DEBUG ((LM_DEBUG, "In time = %d, timed out = %d\n", + in_time_count, timeout_count)); + + orb->destroy (ACE_TRY_ENV); + ACE_TRY_CHECK; } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Catched exception:"); + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); return 1; } ACE_ENDTRY; @@ -1210,14 +1210,6 @@ David Hanvey <d.hanvey@qub.ac.uk> Jeff McNiel <Jeff_McNiel@VitalCom.com> Georg Lohrer <GeorgLohrer@web.de> Rachel G Smith <Rachel_G_Smith@raytheon.com> -Tom Lake <Tom.Lake@glossa.co.uk> -Logan Modahala <lmodahal@cisco.com> -Jean Malenfant <jean.malenfant@locusdialog.com> -Victor Poznyak <VictorP@Webley.COM> -Juan Jose Comellas <jcomellas@novamens.com> -James Dorsey <James.Dorsey@acxiom.com> -Benot Desmeules <bdesmeules@eurekium.com> -Tom Moog <tmoog@polhode.com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ace/ACE.cpp b/ace/ACE.cpp index dc2e05caff5..fded2a0961a 100644 --- a/ace/ACE.cpp +++ b/ace/ACE.cpp @@ -1490,7 +1490,7 @@ ACE::send_n_i (ACE_HANDLE handle, if (n == -1) { // Check for possible blocking. - if (errno == EWOULDBLOCK || errno == ENOBUFS) + if (errno == EWOULDBLOCK) { // Wait for the blocking to subside. int result = ACE::handle_write_ready (handle, @@ -1548,7 +1548,7 @@ ACE::send_n_i (ACE_HANDLE handle, { // Check for possible blocking. if (n == -1 && - errno == EWOULDBLOCK || errno == ENOBUFS) + errno == EWOULDBLOCK) { // Wait upto <timeout> for the blocking to subside. int rtn = ACE::handle_write_ready (handle, @@ -1610,7 +1610,7 @@ ACE::t_snd_n_i (ACE_HANDLE handle, if (n == -1) { // Check for possible blocking. - if (errno == EWOULDBLOCK || errno == ENOBUFS) + if (errno == EWOULDBLOCK) { // Wait for the blocking to subside. int result = ACE::handle_write_ready (handle, @@ -1668,7 +1668,7 @@ ACE::t_snd_n_i (ACE_HANDLE handle, { // Check for possible blocking. if (n == -1 && - errno == EWOULDBLOCK || errno == ENOBUFS) + errno == EWOULDBLOCK) { // Wait upto <timeout> for the blocking to subside. int rtn = ACE::handle_write_ready (handle, @@ -1728,7 +1728,7 @@ ACE::send_n_i (ACE_HANDLE handle, if (n == -1) { // Check for possible blocking. - if (errno == EWOULDBLOCK || errno == ENOBUFS) + if (errno == EWOULDBLOCK) { // Wait for the blocking to subside. int result = ACE::handle_write_ready (handle, @@ -1784,7 +1784,7 @@ ACE::send_n_i (ACE_HANDLE handle, { // Check for possible blocking. if (n == -1 && - errno == EWOULDBLOCK || errno == ENOBUFS) + errno == EWOULDBLOCK) { // Wait upto <timeout> for the blocking to subside. int rtn = ACE::handle_write_ready (handle, @@ -1908,7 +1908,7 @@ ACE::sendv_n_i (ACE_HANDLE handle, if (n == -1) { // Check for possible blocking. - if (errno == EWOULDBLOCK || errno == ENOBUFS) + if (errno == EWOULDBLOCK) { // Wait for the blocking to subside. int result = ACE::handle_write_ready (handle, @@ -1981,7 +1981,7 @@ ACE::sendv_n_i (ACE_HANDLE handle, { // Check for possible blocking. if (n == -1 && - errno == EWOULDBLOCK || errno == ENOBUFS) + errno == EWOULDBLOCK) { // Wait upto <timeout> for the blocking to subside. int rtn = ACE::handle_write_ready (handle, @@ -2532,8 +2532,6 @@ ACE::handle_timed_complete (ACE_HANDLE h, #endif /* !ACE_WIN32 && ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ #if defined (ACE_WIN32) - // Winsock is different - it sets the exception bit for failed connect, - // unlike other platforms, where the read bit is set. ACE_Handle_Set ex_handles; ex_handles.set_bit (h); #endif /* ACE_WIN32 */ @@ -2542,7 +2540,7 @@ ACE::handle_timed_complete (ACE_HANDLE h, #if defined (ACE_WIN32) int n = ACE_OS::select (int (h) + 1, - 0, + rd_handles, wr_handles, ex_handles, timeout); @@ -2570,14 +2568,11 @@ ACE::handle_timed_complete (ACE_HANDLE h, return ACE_INVALID_HANDLE; } - // Usually, a ready-for-write handle is successfully connected, and - // ready-for-read (exception on Win32) is a failure. On fails, we - // need to grab the error code via getsockopt. On possible success for - // any platform where we can't tell just from select() (e.g. AIX), - // we also need to check for success/fail. + // Check if the handle is ready for reading and the handle is *not* + // ready for writing, which may indicate a problem. But we need to + // make sure... #if defined (ACE_WIN32) - if (ex_handles.is_set (h)) - need_to_check = 1; + need_to_check = rd_handles.is_set (h) || ex_handles.is_set (h); #elif defined (VXWORKS) ACE_UNUSED_ARG (is_tli); @@ -2591,7 +2586,7 @@ ACE::handle_timed_complete (ACE_HANDLE h, # if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) need_to_check = (fds.revents & POLLIN) && !(fds.revents & POLLOUT); # else - need_to_check = rd_handles.is_set (h) && !wr_handles.is_set (h); + need_to_check = rd_handles.is_set (h) && !wr_handles.is_set (h); # endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ else @@ -2610,17 +2605,6 @@ ACE::handle_timed_complete (ACE_HANDLE h, if (need_to_check) { -#if defined (SOL_SOCKET) && defined (SO_ERROR) - int sock_err = 0; - int sock_err_len = sizeof (sock_err); - ACE_OS::getsockopt (h, SOL_SOCKET, SO_ERROR, - (char *)&sock_err, &sock_err_len); - if (sock_err != 0) - { - h = ACE_INVALID_HANDLE; - errno = sock_err; - } -#else char dummy; // The following recv() won't block provided that the @@ -2640,7 +2624,6 @@ ACE::handle_timed_complete (ACE_HANDLE h, else if (errno != EWOULDBLOCK && errno != EAGAIN) h = ACE_INVALID_HANDLE; } -#endif } // 1. The HANDLE is ready for writing and doesn't need to be checked or diff --git a/ace/Array_Base.cpp b/ace/Array_Base.cpp index 00bf8193bf0..8647a10178e 100644 --- a/ace/Array_Base.cpp +++ b/ace/Array_Base.cpp @@ -4,7 +4,6 @@ #define ACE_ARRAY_BASE_C #include "ace/Array_Base.h" -#include "ace/Malloc_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Array_Base.h b/ace/Array_Base.h index 042e6061fad..60ebb993867 100644 --- a/ace/Array_Base.h +++ b/ace/Array_Base.h @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class ACE_Allocator; - // Forward declaration. template <class T> class ACE_Array_Iterator; diff --git a/ace/Based_Pointer_T.h b/ace/Based_Pointer_T.h index c8a8dcf55be..e06f6b3b692 100644 --- a/ace/Based_Pointer_T.h +++ b/ace/Based_Pointer_T.h @@ -11,6 +11,7 @@ */ //============================================================================= + #ifndef ACE_BASED_POINTER_T_H #define ACE_BASED_POINTER_T_H #include "ace/pre.h" @@ -63,7 +64,7 @@ public: * Initialize this object using the <initial> pointer. This * constructor initializes the <base_offset_> by asking the * <ACE_BASED_POINTER_REPOSITORY> Singleton for the base address of - * the memory region within which it is instantiated. Three results + * the memory region within which it is instantiated. Two results * are possible: * * 1. An <ACE_*_Memory_Pool> has stored a base address/size pair and the @@ -74,11 +75,8 @@ public: * 2. No suitable address/size pair was found. The repository * assumes an address in the regular (not mapped) virtual address * space of the process and returns 0. In this case, the - * based-pointer uses its address as an offset to its base + * based-pointer uses its address as an offset to it's base * address 0. - * - * 3. If <initial> is 0 then set the value of <target_> to -1, which - * indicates a "NULL" pointer. */ ACE_Based_Pointer_Basic (CONCRETE *initial); @@ -160,14 +158,12 @@ public: /// details. ACE_Based_Pointer (void); - /// Initialize this object using the <initial> pointer. See - /// constructor for <ACE_Based_Pointer_Basic> for details. + /// Initialize this object using the <initial> pointer. ACE_Based_Pointer (CONCRETE *initial); - /// Initialize this object with known <base_addr>. <dummy> is - /// a dummy value used to resolve overload ambiguity and it - /// otherwise ignored. - ACE_Based_Pointer (const void *base_addr, int dummy); + /// Initialize this object with known <base_addr>. <o> is + /// only used to resolve overload ambiguity. + ACE_Based_Pointer (const void *base_addr, int o); /// Copy constructor (not implemented yet). ACE_Based_Pointer (const ACE_Based_Pointer<CONCRETE> &); diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h index 359798cfabd..0f51a9909c5 100644 --- a/ace/Basic_Types.h +++ b/ace/Basic_Types.h @@ -171,6 +171,7 @@ # endif /* ! ACE_WIN32 && ! ACE_LACKS_LONGLONG_T */ # endif /* !defined (ACE_SIZEOF_LONG_LONG) */ + // The sizes of the commonly implemented types are now known. Set up // typedefs for whatever we can. Some of these are needed for certain cases // of ACE_UINT64, so do them before the 64-bit stuff. @@ -446,9 +447,6 @@ typedef ACE_UINT16 ACE_USHORT16; # if defined (__IBMCPP__) && (__IBMCPP__ >= 400) # define ACE_UINT64_LITERAL(n) n ## LL # define ACE_INT64_LITERAL(n) n ## LL -# elif defined (__MINGW32__) -# define ACE_UINT64_LITERAL(n) n ## ull -# define ACE_INT64_LITERAL(n) n ## ll # else # define ACE_UINT64_LITERAL(n) n ## ui64 # define ACE_INT64_LITERAL(n) n ## i64 diff --git a/ace/CDR_Stream.i b/ace/CDR_Stream.i index 40b193098ad..3941622229b 100644 --- a/ace/CDR_Stream.i +++ b/ace/CDR_Stream.i @@ -448,7 +448,7 @@ ACE_INLINE int ACE_OutputCDR::align_write_ptr (size_t alignment) { char *dummy; - return this->adjust (0, alignment, dummy); + return this->grow_and_adjust (0, alignment, dummy); } ACE_INLINE ACE_Char_Codeset_Translator * diff --git a/ace/Configuration.cpp b/ace/Configuration.cpp index 682a37ac983..dcf05dd12a2 100644 --- a/ace/Configuration.cpp +++ b/ace/Configuration.cpp @@ -165,295 +165,305 @@ ACE_Configuration::expand_path (const ACE_Configuration_Section_Key& key, ACE_Configuration_Section_Key& key_out, int create) { - const ACE_TCHAR* begin = path_in.fast_rep (); - const ACE_TCHAR* end = 0; - // Make a copy of key ACE_Configuration_Section_Key current_section = key; - - // recurse through the path - while (1) + ACE_TString data (path_in); + ACE_TCHAR *pData = (ACE_TCHAR *) data.c_str (); + ACE_Tokenizer parser (pData); + parser.delimiter_replace ('\\', '\0'); + parser.delimiter_replace ('/', '\0'); + + for (ACE_TCHAR *temp = parser.next (); + temp != 0; + temp = parser.next ()) { - // Detmine the begin/ending of the key name - end = ACE_OS::strchr (begin, ACE_LIB_TEXT ('\\')); - size_t length = end ? (size_t) (end-begin) : ACE_OS::strlen (begin); - - // Make sure length is not 0 - if (!length) - return -1; - - ACE_TString section (begin, length); - // Open the section - ACE_Configuration_Section_Key child_section; if (open_section (current_section, - section.fast_rep (), + temp, create, - child_section)) + key_out)) return -1; + current_section = key_out; + } - current_section = child_section; + return 0; +} - // If end is NULL, we are done, return the result - if (!end) - { - key_out = current_section; - break; - } - begin = end + 1; - } +int +ACE_Configuration::validate_name (const ACE_TCHAR *name) +{ + const ACE_TCHAR *pos; + + for (pos = name; + // Make sure it doesn't contain any invalid characters + *pos != '\0'; + pos++) + if (ACE_OS::strchr (ACE_LIB_TEXT ("\\]["), *pos)) + return -1; + + // Make sure its not too long. + if (pos - name > ACE_Configuration::MAX_NAME_LEN) + return -2; return 0; } int -ACE_Configuration::validate_name (const ACE_TCHAR* name) +ACE_Configuration::export_section (const ACE_Configuration_Section_Key& section, + const ACE_TString& path, + FILE* out) { - const ACE_TCHAR* pos = name; - // make sure it doesn't contain any invalid characters - while (*pos) + // don't export the root + if (path.length ()) { - if (ACE_OS::strchr (ACE_LIB_TEXT ("\\]["), *pos)) + // Write out the section header + ACE_TString header = ACE_LIB_TEXT ("["); + header += path; + header += ACE_LIB_TEXT ("]"); + header += ACE_LIB_TEXT (" \n"); + if (ACE_OS::fputs (header.fast_rep (), out) < 0) return -1; - pos++; + // Write out each value + int index = 0; + ACE_TString name; + VALUETYPE type; + ACE_TString line; + ACE_TCHAR int_value[32]; + ACE_TCHAR bin_value[3]; + void* binary_data; + u_int binary_length; + ACE_TString string_value; + + while (!enumerate_values (section, index, name, type)) + { + line = ACE_LIB_TEXT ("\"") + name + ACE_LIB_TEXT ("\"="); + switch (type) + { + case INTEGER: + { + u_int value; + if (get_integer_value (section, name.fast_rep (), value)) + return -2; + + ACE_OS::sprintf (int_value, ACE_LIB_TEXT ("%08x"), value); + line += ACE_LIB_TEXT ("dword:"); + line += int_value; + break; + } + case STRING: + { + if (get_string_value (section, + name.fast_rep (), + string_value)) + return -2; + + line += ACE_LIB_TEXT ("\""); + line += string_value + ACE_LIB_TEXT ("\""); + break; + } +#if defined (ACE_WIN32) + case INVALID: +#endif /* ACE_WIN32 */ + case BINARY: + { + // not supported yet - maybe use BASE64 codeing? + if (get_binary_value (section, + name.fast_rep (), + binary_data, + binary_length)) + return -2; + + line += ACE_LIB_TEXT ("hex:"); + + u_char *ptr = (u_char *) binary_data; + while (binary_length) + { + if (ptr != binary_data) + line += ACE_LIB_TEXT (","); + + ACE_OS::sprintf (bin_value, ACE_LIB_TEXT ("%02x"), *ptr); + line += bin_value; + --binary_length; + ++ptr; + } + delete (char *) binary_data; + break; + } + default: + return -3; + } + + line += ACE_LIB_TEXT ("\n"); + if (ACE_OS::fputs (line.fast_rep (), out) < 0) + return -4; + + index++; + } } - // Make sure its not too long - if (pos - name > 255) - return -2; + // Export all sub sections + int index = 0; + ACE_TString name; + ACE_Configuration_Section_Key sub_key; + ACE_TString sub_section; + + while (!enumerate_sections (section, index, name)) + { + ACE_TString sub_section (path); + if (path.length ()) + sub_section += ACE_LIB_TEXT ("\\"); + + sub_section += name; + if (open_section (section, name.fast_rep (), 0, sub_key)) + return -5; + + if (export_section (sub_key, sub_section.fast_rep (), out)) + return -6; + + index++; + } return 0; } - -const ACE_Configuration_Section_Key& -ACE_Configuration::root_section (void) const +int +ACE_Configuration::export_config (const ACE_TCHAR* filename) { - return root_; + FILE *out = ACE_OS::fopen (filename, ACE_LIB_TEXT ("w")); + if (!out) + return -1; + + int result = export_section (root_, ACE_LIB_TEXT (""), out); + ACE_OS::fclose (out); + return result; } -/** - * Determine if the contents of this object is the same as the - * contents of the object on the right hand side. - * Returns 1 (True) if they are equal and 0 (False) if they are not equal - */ -int ACE_Configuration::operator== (const ACE_Configuration& rhs) const +int +ACE_Configuration::import_config (const ACE_TCHAR* filename) { - int rc = 1; - int sectionIndex = 0; - ACE_TString sectionName; - ACE_Configuration *nonconst_this = ACE_const_cast (ACE_Configuration*, this); - ACE_Configuration &nonconst_rhs = ACE_const_cast (ACE_Configuration&, rhs); - - const ACE_Configuration_Section_Key& rhsRoot = rhs.root_section (); - ACE_Configuration_Section_Key rhsSection; - ACE_Configuration_Section_Key thisSection; + FILE* in = ACE_OS::fopen (filename, ACE_LIB_TEXT ("r")); + if (!in) + return -1; - // loop through each section in this object - while ((rc) && nonconst_this->enumerate_sections (this->root_, - sectionIndex, - sectionName)) + // @@ XXX - change this to a dynamic buffer + ACE_TCHAR buffer[4096]; + ACE_Configuration_Section_Key section; + while (ACE_OS::fgets (buffer, 4096, in)) { - // find that section in the rhs object - if (nonconst_rhs.open_section (rhsRoot, - sectionName.c_str (), - 0, - rhsSection) != 0) - { - // If the rhs object does not contain the section then we are - // not equal. - rc = 0; - } - else if (nonconst_this->open_section (this->root_, - sectionName.c_str (), - 0, - thisSection) != 0) + // Check for a comment + if (buffer[0] == ACE_LIB_TEXT (';') || buffer[0] == ACE_LIB_TEXT ('#')) + continue; + + if (buffer[0] == ACE_LIB_TEXT ('[')) { - // if there is some error opening the section in this object - rc = 0; + // We have a new section here, strip out the section name + ACE_TCHAR* end = ACE_OS::strrchr (buffer, ACE_LIB_TEXT (']')); + if (!end) + { + ACE_OS::fclose (in); + return -3; + } + *end = 0; + + if (expand_path (root_, buffer + 1, section, 1)) + { + ACE_OS::fclose (in); + return -3; + } + + continue; } - else + + if (buffer[0] == ACE_LIB_TEXT ('"')) { - // Well the sections match - int valueIndex = 0; - ACE_TString valueName; - VALUETYPE valueType; - VALUETYPE rhsType; - - // Enumerate each value in this section - while ((rc) && nonconst_this->enumerate_values (thisSection, - valueIndex, - valueName, - valueType)) + // we have a value + ACE_TCHAR* end = ACE_OS::strchr (buffer+1, '"'); + if (!end) // no closing quote, not a value so just skip it + continue; + + // null terminate the name + *end = 0; + ACE_TCHAR* name = buffer + 1; + end+=2; + // determine the type + if (*end == '\"') { - // look for the same value in the rhs section - if (nonconst_rhs.find_value (rhsSection, - valueName.c_str (), - rhsType) != 0) + // string type + // truncate trailing " + ++end; + ACE_TCHAR* trailing = ACE_OS::strrchr (end, '"'); + if (trailing) + *trailing = 0; + if (set_string_value (section, name, end)) { - // We're not equal if the same value cannot - // be found in the rhs object. - rc = 0; + ACE_OS::fclose (in); + return -4; } - else if (valueType != rhsType) + } + else if (ACE_OS::strncmp (end, ACE_LIB_TEXT ("dword:"), 6) == 0) + { + // number type + ACE_TCHAR* endptr = 0; + u_int value = ACE_OS::strtoul (end + 6, &endptr, 16); + if (set_integer_value (section, name, value)) { - // we're not equal if the types do not match. - rc = 0; + ACE_OS::fclose (in); + return -4; } - else - { - // finally compare values. - if (valueType == STRING) - { - ACE_TString thisString, rhsString; - if (nonconst_this->get_string_value (thisSection, - valueName.c_str (), - thisString) != 0) - { - // we're not equal if we cannot get this string - rc = 0; - } - else if (nonconst_rhs.get_string_value (rhsSection, - valueName.c_str (), - rhsString) != 0) - { - // we're not equal if we cannot get rhs string - rc = 0; - } - rc = thisString == rhsString; - } - else if (valueType == INTEGER) - { - u_int thisInt, rhsInt; - if (nonconst_this->get_integer_value (thisSection, - valueName.c_str (), - thisInt) != 0) - { - // we're not equal if we cannot get this int - rc = 0; - } - else if (nonconst_rhs.get_integer_value (rhsSection, - valueName.c_str (), - rhsInt) != 0) - { - // we're not equal if we cannot get rhs int - rc = 0; - } - rc = thisInt == rhsInt; - } - else if (valueType == BINARY) - { - void* thisData; - void* rhsData; - u_int thisLength, rhsLength; - if (nonconst_this->get_binary_value (thisSection, - valueName.c_str (), - thisData, - thisLength) != 0) - { - // we're not equal if we cannot get this data - rc = 0; - } - else if (nonconst_rhs.get_binary_value (rhsSection, - valueName.c_str (), - rhsData, - rhsLength) != 0) - { - // we're not equal if we cannot get this data - rc = 0; - } - - rc = thisLength == rhsLength; - // are the length's the same? - - if (rc) - { - unsigned char* thisCharData = (unsigned char*)thisData; - unsigned char* rhsCharData = (unsigned char*)rhsData; - // yes, then check each element - for (u_int count = 0; - (rc) && (count < thisLength); - count++) - { - rc = (* (thisCharData + count) == * (rhsCharData + count)); - } - }// end if the length's match - } - // We should never have valueTypes of INVALID, therefore - // we're not comparing them. How would we since we have - // no get operation for invalid types. - // So, if we have them, we guess they are equal. - - }// end else if values match. - - valueIndex++; - - }// end value while loop - - // look in the rhs for values not in this - valueIndex = 0; - while ((rc) && - (!nonconst_rhs.enumerate_values (rhsSection, - valueIndex, - valueName, - rhsType))) + } + else if (ACE_OS::strncmp (end, ACE_LIB_TEXT ("hex:"), 4) == 0) { - // look for the same value in this section - if (nonconst_this->find_value (thisSection, - valueName.c_str (), - valueType) != 0) + // binary type + u_int string_length = ACE_OS::strlen (end + 4); + // divide by 3 to get the actual buffer length + u_int length = string_length / 3; + u_int remaining = length; + u_char* data = new u_char[length]; + u_char* out = data; + ACE_TCHAR* inb = end + 4; + ACE_TCHAR* endptr = 0; + while (remaining) { - // We're not equal if the same value cannot - // be found in the rhs object. - rc = 0; + u_char charin = (u_char) ACE_OS::strtoul (inb, &endptr, 16); + *out = charin; + ++out; + --remaining; + inb += 3; } - valueIndex++; - }// end while for rhs values not in this. - - }// end else if sections match. - - sectionIndex++; - - }// end section while loop + if (set_binary_value (section, name, data, length)) + { + ACE_OS::fclose (in); + return -4; + } + } + else + // invalid type, ignore + continue; + } + } - // Finally, make sure that there are no sections in rhs that do not - // exist in this - sectionIndex = 0; - while ((rc) && - (!nonconst_rhs.enumerate_sections (rhsRoot, - sectionIndex, - sectionName))) + if (ferror (in)) { - // find the section in this - if (nonconst_this->open_section (this->root_, - sectionName.c_str (), - 0, - thisSection) != 0) - { - // if there is some error opening the section in this object - rc = 0; - } - else if (nonconst_rhs.open_section (rhsRoot, - sectionName.c_str (), - 0, - rhsSection) != 0) - { - // If the rhs object does not contain the section then we - // are not equal. - rc = 0; - } - sectionIndex++; + ACE_OS::fclose (in); + return -1; } - return rc; + + ACE_OS::fclose (in); + return 0; } +const ACE_Configuration_Section_Key& +ACE_Configuration::root_section (void) +{ + return root_; +} ////////////////////////////////////////////////////////////////////////////// #if defined (WIN32) -static const int ACE_DEFAULT_BUFSIZE = 256; +static const int ACE_DEFAULT_BUFSIZE = ACE_Configuration::MAX_NAME_LEN + 1; ACE_Section_Key_Win32::ACE_Section_Key_Win32 (HKEY hKey) : hKey_ (hKey) @@ -512,12 +522,7 @@ ACE_Configuration_Win32Registry::open_section (const ACE_Configuration_Section_K KEY_ALL_ACCESS, NULL, &result_key, -#if defined(__MINGW32__) - (PDWORD) 0 -#else - NULL -#endif /* __MINGW32__ */ - ) != ERROR_SUCCESS) + NULL) != ERROR_SUCCESS) return -3; } @@ -727,21 +732,36 @@ ACE_Configuration_Win32Registry::get_string_value (const ACE_Configuration_Secti if (load_key (key, base_key)) return -1; - ACE_TCHAR buffer[ACE_DEFAULT_BUFSIZE]; - DWORD length = ACE_DEFAULT_BUFSIZE; + // Get the size of the binary data from windows + DWORD buffer_length = 0; DWORD type; if (ACE_TEXT_RegQueryValueEx (base_key, - name, - NULL, - &type, - (BYTE*)buffer, - &length) != ERROR_SUCCESS) + name, + NULL, + &type, + (BYTE*)0, + &buffer_length) != ERROR_SUCCESS) return -2; if (type != REG_SZ) return -3; + ACE_TCHAR* buffer; + ACE_NEW_RETURN (buffer, ACE_TCHAR[buffer_length], -4); + + if (ACE_TEXT_RegQueryValueEx (base_key, + name, + NULL, + &type, + (BYTE*)buffer, + &buffer_length) != ERROR_SUCCESS) + { + delete[] buffer; + return -5; + } + value = buffer; + delete[] buffer; return 0; } @@ -802,19 +822,19 @@ ACE_Configuration_Win32Registry::get_binary_value (const ACE_Configuration_Secti length = buffer_length; - ACE_NEW_RETURN (data, unsigned char[length], -4); + ACE_NEW_RETURN (data, u_char[length], -4); if (ACE_TEXT_RegQueryValueEx (base_key, name, NULL, &type, - (BYTE*)data, + (BYTE*)data, &buffer_length) != ERROR_SUCCESS) - { - delete data; - data = 0; - return -5; - } + { + delete[] data; + data = 0; + return -5; + } return 0; } @@ -830,16 +850,18 @@ int ACE_Configuration_Win32Registry::find_value (const ACE_Configuration_Section if (load_key (key, base_key)) return -1; - unsigned char buffer[ACE_DEFAULT_BUFSIZE]; - DWORD buffer_length = ACE_DEFAULT_BUFSIZE; + DWORD buffer_length=0; DWORD type; - if (ACE_TEXT_RegQueryValueEx (base_key, + int result=ACE_TEXT_RegQueryValueEx (base_key, name, NULL, &type, - (BYTE*)&buffer, - &buffer_length) != ERROR_SUCCESS) + NULL, + &buffer_length); + if (result != ERROR_SUCCESS) + { return -1; + } switch (type) { @@ -924,18 +946,13 @@ ACE_Configuration_Win32Registry::resolve_key (HKEY hKey, // try creating it if (!create || ACE_TEXT_RegCreateKeyEx (result, key.fast_rep (), - 0, NULL, - 0, + NULL, + NULL, KEY_ALL_ACCESS, NULL, &subkey, -#if defined(__MINGW32__) - (PDWORD) 0 -#else - NULL -#endif /* __MINGW32__ */ - ) != ERROR_SUCCESS) + NULL) != ERROR_SUCCESS) { // error ::RegCloseKey (result); @@ -952,17 +969,13 @@ ACE_Configuration_Win32Registry::resolve_key (HKEY hKey, begin = end + 1; } - +#if !defined (ghs) return 0; +#endif // ghs } - - #endif // WIN_32 - - - /////////////////////////////////////////////////////////////// ACE_Configuration_Value_IntId::ACE_Configuration_Value_IntId (void) @@ -1150,7 +1163,8 @@ ACE_Configuration_Section_Key_Heap::~ACE_Configuration_Section_Key_Heap () ACE_Configuration_Heap::ACE_Configuration_Heap (void) : allocator_ (0), index_ (0), - default_map_size_ (0) + default_map_size_ (0), + persistent_ (0) { ACE_Configuration_Section_Key_Heap *temp = 0; @@ -1161,8 +1175,11 @@ ACE_Configuration_Heap::ACE_Configuration_Heap (void) ACE_Configuration_Heap::~ACE_Configuration_Heap (void) { if (allocator_) + { allocator_->sync (); - + if (!persistent_) + allocator_->remove (); + } delete allocator_; } @@ -1176,6 +1193,7 @@ ACE_Configuration_Heap::open (int default_map_size) ACE_NEW_RETURN (this->allocator_, HEAP_ALLOCATOR (), -1); + persistent_ = 0; return create_index (); } @@ -1185,6 +1203,7 @@ ACE_Configuration_Heap::open (const ACE_TCHAR* file_name, void* base_address, int default_map_size) { + persistent_ = 1; default_map_size_ = default_map_size; // Make sure that the file name is of the legal length. @@ -1520,7 +1539,7 @@ ACE_Configuration_Heap::remove_section (const ACE_Configuration_Section_Key& key // Now remove subkey from parent key ACE_Configuration_ExtId SubSExtId (sub_section); SUBSECTION_ENTRY* subsection_entry; - if (((SUBSECTION_HASH*)ParentIntId.section_hash_map_)-> + if (( (SUBSECTION_HASH*)ParentIntId.section_hash_map_)-> find (SubSExtId, subsection_entry)) return -4; @@ -1536,6 +1555,7 @@ ACE_Configuration_Heap::remove_section (const ACE_Configuration_Section_Key& key // iterate over all values and free memory VALUE_HASH* value_hash_map = section_entry->int_id_.value_hash_map_; VALUE_HASH::ITERATOR value_iter = value_hash_map->begin (); + while (!value_iter.done ()) { VALUE_ENTRY* value_entry; @@ -1582,9 +1602,11 @@ ACE_Configuration_Heap::enumerate_values (const ACE_Configuration_Section_Key& k // Handle iterator resets if (index == 0) { - ACE_Hash_Map_Manager_Ex<ACE_Configuration_ExtId , ACE_Configuration_Value_IntId, ACE_Hash<ACE_Configuration_ExtId>, ACE_Equal_To<ACE_Configuration_ExtId>, ACE_Null_Mutex>* hash_map = IntId.value_hash_map_; - // @@ This zero pointer check is redundant -Ossama - // if (pKey->value_iter_) + ACE_Hash_Map_Manager_Ex<ACE_Configuration_ExtId , + ACE_Configuration_Value_IntId, + ACE_Hash<ACE_Configuration_ExtId>, + ACE_Equal_To<ACE_Configuration_ExtId>, + ACE_Null_Mutex>* hash_map = IntId.value_hash_map_; delete pKey->value_iter_; ACE_NEW_RETURN (pKey->value_iter_, VALUE_HASH::ITERATOR (hash_map->begin ()), -3); @@ -1624,10 +1646,11 @@ ACE_Configuration_Heap::enumerate_sections (const ACE_Configuration_Section_Key& // Handle iterator resets if (index == 0) { - if (pKey->section_iter_) - delete pKey->section_iter_; + delete pKey->section_iter_; - ACE_NEW_RETURN (pKey->section_iter_, SUBSECTION_HASH::ITERATOR (IntId.section_hash_map_->begin ()), -3); + ACE_NEW_RETURN (pKey->section_iter_, + SUBSECTION_HASH::ITERATOR (IntId.section_hash_map_->begin ()), + -3); } // Get the next entry @@ -1668,7 +1691,8 @@ ACE_Configuration_Heap::set_string_value (const ACE_Configuration_Section_Key& k // Free the old value entry->int_id_.free (allocator_); // Allocate the new value in this heap - ACE_TCHAR* pers_value = (ACE_TCHAR*)allocator_->malloc ((value.length () + 1) * sizeof (ACE_TCHAR)); + ACE_TCHAR* pers_value = + (ACE_TCHAR*) allocator_->malloc ((value.length () + 1) * sizeof (ACE_TCHAR)); ACE_OS::strcpy (pers_value, value.fast_rep ()); ACE_Configuration_Value_IntId new_value_int (pers_value); entry->int_id_ = new_value_int; @@ -1676,9 +1700,11 @@ ACE_Configuration_Heap::set_string_value (const ACE_Configuration_Section_Key& k else { // it doesn't exist, bind it - ACE_TCHAR* pers_name = (ACE_TCHAR*)allocator_->malloc ((ACE_OS::strlen (name) + 1) * sizeof (ACE_TCHAR)); + ACE_TCHAR* pers_name = + (ACE_TCHAR*) allocator_->malloc ((ACE_OS::strlen (name) + 1) * sizeof (ACE_TCHAR)); ACE_OS::strcpy (pers_name, name); - ACE_TCHAR* pers_value = (ACE_TCHAR*)allocator_->malloc ((value.length () + 1) * sizeof (ACE_TCHAR)); + ACE_TCHAR* pers_value = + (ACE_TCHAR*) allocator_->malloc ((value.length () + 1) * sizeof (ACE_TCHAR)); ACE_OS::strcpy (pers_value, value.fast_rep ()); ACE_Configuration_ExtId item_name (pers_name); ACE_Configuration_Value_IntId item_value (pers_value); @@ -1725,7 +1751,8 @@ ACE_Configuration_Heap::set_integer_value (const ACE_Configuration_Section_Key& else { // it doesn't exist, bind it - ACE_TCHAR* pers_name = (ACE_TCHAR*)allocator_->malloc ((ACE_OS::strlen (name) + 1) * sizeof (ACE_TCHAR)); + ACE_TCHAR* pers_name = + (ACE_TCHAR*) allocator_->malloc ((ACE_OS::strlen (name) + 1) * sizeof (ACE_TCHAR)); ACE_OS::strcpy (pers_name, name); ACE_Configuration_ExtId item_name (pers_name); ACE_Configuration_Value_IntId item_value (value); @@ -1777,7 +1804,8 @@ ACE_Configuration_Heap::set_binary_value (const ACE_Configuration_Section_Key& k else { // it doesn't exist, bind it - ACE_TCHAR* pers_name = (ACE_TCHAR*)allocator_->malloc ((ACE_OS::strlen (name) + 1) * sizeof (ACE_TCHAR)); + ACE_TCHAR* pers_name = + (ACE_TCHAR*) allocator_->malloc ((ACE_OS::strlen (name) + 1) * sizeof (ACE_TCHAR)); ACE_OS::strcpy (pers_name, name); ACE_TCHAR* pers_value = (ACE_TCHAR*)allocator_->malloc (length); ACE_OS::memcpy (pers_value, data, length); @@ -1805,7 +1833,8 @@ ACE_Configuration_Heap::set_binary_value (const ACE_Configuration_Section_Key& k if (IntId.value_hash_map_->find (VExtIdFind, VIntIdFind, allocator_)) { // it doesn't exist, bind it - ACE_TCHAR* pers_name = (ACE_TCHAR*)allocator_->malloc ((ACE_OS::strlen (name) + 1) * sizeof (ACE_TCHAR)); + ACE_TCHAR* pers_name = + (ACE_TCHAR*) allocator_->malloc ((ACE_OS::strlen (name) + 1) * sizeof (ACE_TCHAR)); ACE_OS::strcpy (pers_name, name); ACE_TCHAR* pers_value = (ACE_TCHAR*)allocator_->malloc (length); ACE_OS::memcpy (pers_value, data, length); @@ -1940,8 +1969,8 @@ ACE_Configuration_Heap::get_binary_value (const ACE_Configuration_Section_Key& k int ACE_Configuration_Heap::find_value (const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - VALUETYPE& type_out) + const ACE_TCHAR* name, + VALUETYPE& type_out) { if (validate_name (name)) return -1; @@ -1960,13 +1989,14 @@ ACE_Configuration_Heap::find_value (const ACE_Configuration_Section_Key& key, // Find it ACE_Configuration_ExtId ValueExtId (name); VALUE_ENTRY* value_entry; - if (((VALUE_HASH *) IntId.value_hash_map_)->find (ValueExtId, value_entry)) + if (( (VALUE_HASH*)IntId.value_hash_map_)->find (ValueExtId, value_entry)) return -1; // value does not exist type_out = value_entry->int_id_.type_; return 0; } + int ACE_Configuration_Heap::remove_value (const ACE_Configuration_Section_Key& key, const ACE_TCHAR* name) @@ -1988,7 +2018,7 @@ ACE_Configuration_Heap::remove_value (const ACE_Configuration_Section_Key& key, // Find it ACE_Configuration_ExtId ValueExtId (name); VALUE_ENTRY* value_entry; - if (((VALUE_HASH *) IntId.value_hash_map_)->find (ValueExtId, value_entry)) + if (( (VALUE_HASH*)IntId.value_hash_map_)->find (ValueExtId, value_entry)) return -4; // free it @@ -2001,3 +2031,103 @@ ACE_Configuration_Heap::remove_value (const ACE_Configuration_Section_Key& key, return 0; } + +int +ACE_Configuration::import_config_as_strings (const ACE_TCHAR* filename) +{ + FILE* in = ACE_OS::fopen (filename, ACE_LIB_TEXT ("r")); + if (!in) + return -1; + + // @@ Make this a dynamic size! + ACE_TCHAR buffer[4096]; + ACE_Configuration_Section_Key section; + while (ACE_OS::fgets (buffer, sizeof buffer, in)) + { + // Check for a comment and blank line + if (buffer[0] == ACE_LIB_TEXT (';') + || buffer[0] == ACE_LIB_TEXT ('#') + || buffer[0] == ACE_LIB_TEXT ('\r') + || buffer[0] == ACE_LIB_TEXT ('\n')) + continue; + + if (buffer[0] == ACE_LIB_TEXT ('[')) + { + // We have a new section here, strip out the section name + ACE_TCHAR* end = ACE_OS::strrchr (buffer, ACE_LIB_TEXT (']')); + if (!end) + { + ACE_OS::fclose (in); + return -3; + } + *end = 0; + + if (expand_path (root_, buffer + 1, section, 1)) + { + ACE_OS::fclose (in); + return -3; + } + + continue; + } + + // we have a line + const ACE_TCHAR *name = this->skip_whitespace (buffer); + if (name) + { + ACE_TCHAR *end = (ACE_TCHAR *) ACE_OS::strpbrk (name, ACE_LIB_TEXT ("= \t\n\r")); + + // locate equal sign after name and retrieve value + const ACE_TCHAR *value = ACE_OS::strrchr (name, ACE_LIB_TEXT ('=')); + if (value) + { + value++; // jump over equal sign + value = this->skip_whitespace (value); + ACE_TCHAR *value_end; + if (value[0] != ACE_LIB_TEXT ('"')) + value_end = (ACE_TCHAR *) ACE_OS::strpbrk (value, ACE_LIB_TEXT (" \t\n\r")); + else + { + // double quote delimited allows spaces and tabs in string + value++; + value_end = (ACE_TCHAR *) ACE_OS::strpbrk (value, ACE_LIB_TEXT ("\"\n\r")); + } + if (value_end) + *value_end = '\0'; // terminate value + } + else + value = ACE_LIB_TEXT (""); + + if (end) + *end = '\0'; // terminate name now + + if (set_string_value (section, name, value)) + { + ACE_OS::fclose (in); + return -4; + } + } + } + + if (ferror (in)) + { + ACE_OS::fclose (in); + return -1; + } + + ACE_OS::fclose (in); + return 0; +} + +const ACE_TCHAR * +ACE_Configuration::skip_whitespace (const ACE_TCHAR *src) +{ + const ACE_TCHAR *cp; + + for (cp = src; + (*cp != '\0') && ((*cp == ' ') || (*cp == '\t')); + cp++) + continue; + + return cp; +} diff --git a/ace/Configuration.h b/ace/Configuration.h index 3d11533e95f..ce57eb228c3 100644 --- a/ace/Configuration.h +++ b/ace/Configuration.h @@ -6,7 +6,7 @@ * * $Id$ * - * @author Chris Hafey <chris@stentorsoft.com> + * @author Chris Hafey <chafey@stentor.com> * * The ACE configuration API provides a portable abstraction for * program configuration. The API supports a tree based hierarchy @@ -14,9 +14,19 @@ * or values. Values may contain string, unsigned integer and * binary data. * + * @todo + * - Redo the import/export mechanism to support different file formats + * - Add locking for thread safety. + * - Need to investigate what happens if memory mapped file gets mapped to + * a location different than it was created with. + * - Add dynamic buffer when importing. currently it will not allow + * importing of values greater than a fixed ammount (4096 bytes) + * - Replace unsigned int with a type that is fixed accross platforms. + * */ //============================================================================= + #ifndef ACE_CONFIGURATION_H #define ACE_CONFIGURATION_H #include "ace/pre.h" @@ -49,11 +59,6 @@ * Implementations subclass this base class to represent a * section key. * - * @todo - * - Add locking for thread safety. - * - Need to investigate what happens if memory mapped file gets mapped to - * a location different than it was created with. - * - Replace unsigned int with a type that is fixed accross platforms. * */ class ACE_Export ACE_Section_Key_Internal @@ -75,15 +80,15 @@ protected: u_int ref_count_; }; -/** - * @class ACE_Configuration_Section_Key - * - * @brief Referenced counted wrapper for <ACE_Section_Key_Internal>. - * - * Reference counted wrapper class for the abstract internal - * section key. A user gets one of these to represent a section - * in the configuration database. - */ + /** + * @class ACE_Configuration_Section_Key + * + * @brief Referenced counted wrapper for <ACE_Section_Key_Internal>. + * + * Reference counted wrapper class for the abstract internal + * section key. A user gets one of these to represent a section + * in the configuration database. + */ class ACE_Export ACE_Configuration_Section_Key { friend class ACE_Configuration; @@ -128,11 +133,16 @@ public: INVALID }; + enum { + /// Max size of name. + MAX_NAME_LEN = 255 + }; + /// destructor virtual ~ACE_Configuration (void); /// Returns the root section of this configuration. - virtual const ACE_Configuration_Section_Key& root_section (void) const; + virtual const ACE_Configuration_Section_Key& root_section (void); /** * Finds a <sub_section> in <base> and places the resulting key in @@ -223,10 +233,9 @@ public: * data type in <type>. Returns 0 on success (entry is found), * -1 on error */ - virtual int find_value(const ACE_Configuration_Section_Key& key, - const ACE_TCHAR* name, - VALUETYPE& type) = 0; - + virtual int find_value (const ACE_Configuration_Section_Key& key, + const ACE_TCHAR* name, + VALUETYPE& type) = 0; /// Removes the the value <name> from <key>. returns non zero on /// error. @@ -244,41 +253,76 @@ public: ACE_Configuration_Section_Key& key_out, int create = 1); - /** - * Determine if the contents of this object is the same as the - * contents of the object on the right hand side. - * Returns 1 (True) if they are equal and 0 (False) if they are not equal - */ - int operator==(const ACE_Configuration& rhs) const; - /** - * Determine if the contents of this object are different from the - * contents of the object on the right hand side. - * Returns 0 (False) if they are equal and 1 (True) if they are not equal - */ - int operator!=(const ACE_Configuration& rhs) const {return !(*this == rhs);} + /// Exports the configuration database to filename. If <filename> is + /// alredy present, it is overwritten. * See note below + virtual int export_config (const ACE_TCHAR* filename); + + /// Imports the configuration database from filename. Any existing + /// data is not removed. * See note below + virtual int import_config (const ACE_TCHAR* filename); + + /// Imports the configuration database from filename as strings. + /// Allows non-typed values. (no #, dword: hex:, etc. prefixes) and + /// skips whitespace (tabs and spaces) as in standard .ini and .conf + /// files. Values (to right of equal sign) can be double quote + /// delimited to embed tabs and spaces in the string. + /// Caller must convert string to type. + /// A corresponding export_config is not supported. + /// + /// This method allows for lines in the .ini or .conf file like this: + /// + /// TimeToLive = 100 + /// Delay = FALSE + /// Flags = FF34 + /// Heading = "ACE - Adaptive Communication Environment" + /// + /// (note leading whitespace (tabs) in examples below) + /// + /// SeekIndex = 14 + /// TraceLevel = 6 # Can comment lines like this + /// Justification = left_justified + /// + /// The caller can then retrieve the string with the regular + /// <get_string_value> function and convert the string to the + /// desired data type. + + virtual int import_config_as_strings (const ACE_TCHAR *filename); + + // Note - The above import/export routines have the following bugs/limitations + // 1) Strings with embedded newlines cause the import to fail + // 2) Strings with embedded quotes " cause the import to fail + // 3) Importing/exporting for values in the root section does not work + // If you are interested in working on this, please let me know and we can + // discuss the details. chafey@stentor.com protected: /// Default ctor ACE_Configuration (void); + /// Skips whitespace + const ACE_TCHAR *skip_whitespace (const ACE_TCHAR *src); + /// resolves the internal key from a section key ACE_Section_Key_Internal* get_internal_key (const ACE_Configuration_Section_Key& key); /** - * tests to see if <name> is valid. <name> must be < 255 characters + * tests to see if <name> is valid. <name> must be < MAX_NAME_LEN characters * and not contain the path separator '\', brackets [] or = (maybe * just restrict to alphanumeric?) returns non zero if name is not * valid */ int validate_name (const ACE_TCHAR* name); + /// Used when exporting a configuration to a file + int export_section (const ACE_Configuration_Section_Key& section, + const ACE_TString& path, + FILE* out); + // Not used ACE_Configuration (const ACE_Configuration& rhs); ACE_Configuration& operator= (const ACE_Configuration& rhs); - - ACE_Configuration_Section_Key root_; }; @@ -395,9 +439,6 @@ public: const ACE_TCHAR* path, int create = 1); - virtual int operator==(const ACE_Configuration_Win32Registry& rhs) const{return true;} - virtual int operator!=(const ACE_Configuration_Win32Registry& rhs) const{return true;} - protected: /// Gets the HKEY for a configuration section @@ -725,6 +766,7 @@ private: ACE_Allocator *allocator_; SECTION_MAP *index_; int default_map_size_; + int persistent_; }; #include "ace/post.h" diff --git a/ace/Configuration_Import_Export.cpp b/ace/Configuration_Import_Export.cpp deleted file mode 100644 index 890fb479dd8..00000000000 --- a/ace/Configuration_Import_Export.cpp +++ /dev/null @@ -1,554 +0,0 @@ -// $Id$ - -#include "ace/Configuration_Import_Export.h" - -ACE_Config_ImpExp_Base::ACE_Config_ImpExp_Base (ACE_Configuration& config) - : config_ (config) -{ -} - -ACE_Config_ImpExp_Base::~ACE_Config_ImpExp_Base () -{ -} - -ACE_Registry_ImpExp::ACE_Registry_ImpExp (ACE_Configuration& config) - : ACE_Config_ImpExp_Base (config) -{ -} - -ACE_Registry_ImpExp::~ACE_Registry_ImpExp () -{ -} - -// Imports the configuration database from filename. -// No existing data is removed. -// Since the open method relies on this method, this method -// acts as open if an open has not already occurred. - -int -ACE_Registry_ImpExp::import_config (const ACE_TCHAR* filename) -{ - FILE* in = ACE_OS::fopen (filename, ACE_LIB_TEXT ("r")); - if (!in) - return -1; - - // @@ XXX - change this to a dynamic buffer - ACE_TCHAR buffer[4096]; - ACE_Configuration_Section_Key section; - while (ACE_OS::fgets (buffer, 4096, in)) - { - // Check for a comment - if (buffer[0] == ACE_LIB_TEXT (';') || buffer[0] == ACE_LIB_TEXT ('#')) - continue; - - if (buffer[0] == ACE_LIB_TEXT ('[')) - { - // We have a new section here, strip out the section name - ACE_TCHAR* end = ACE_OS::strrchr (buffer, ACE_LIB_TEXT (']')); - if (!end) - { - ACE_OS::fclose (in); - return -3; - } - *end = 0; - - if (config_.expand_path (config_.root_section (), buffer + 1, section, 1)) - { - ACE_OS::fclose (in); - return -3; - } - continue; - } - - if (buffer[0] == ACE_LIB_TEXT ('"')) - { - // we have a value - ACE_TCHAR* end = ACE_OS::strchr (buffer+1, '"'); - if (!end) // no closing quote, not a value so just skip it - continue; - - // null terminate the name - *end = 0; - ACE_TCHAR* name = buffer + 1; - end+=2; - // determine the type - if (*end == '\"') - { - // string type - // truncate trailing " - ++end; - ACE_TCHAR* trailing = ACE_OS::strrchr (end, '"'); - if (trailing) - *trailing = 0; - if (config_.set_string_value (section, name, end)) - { - ACE_OS::fclose (in); - return -4; - } - } - else if (ACE_OS::strncmp (end, ACE_LIB_TEXT ("dword:"), 6) == 0) - { - // number type - ACE_TCHAR* endptr = 0; - u_int value = ACE_OS::strtoul (end + 6, &endptr, 16); - if (config_.set_integer_value (section, name, value)) - { - ACE_OS::fclose (in); - return -4; - } - } - else if (ACE_OS::strncmp (end, ACE_LIB_TEXT ("hex:"), 4) == 0) - { - // binary type - u_int string_length = ACE_OS::strlen (end + 4); - // divide by 3 to get the actual buffer length - u_int length = string_length / 3; - u_int remaining = length; - u_char* data = new u_char[length]; - u_char* out = data; - ACE_TCHAR* inb = end + 4; - ACE_TCHAR* endptr = 0; - while (remaining) - { - u_char charin = (u_char) ACE_OS::strtoul (inb, &endptr, 16); - *out = charin; - ++out; - --remaining; - inb += 3; - } - if (config_.set_binary_value (section, name, data, length)) - { - ACE_OS::fclose (in); - return -4; - } - } - else - { - // invalid type, ignore - continue; - } - } - } - - if (ferror (in)) - { - ACE_OS::fclose (in); - return -1; - } - - ACE_OS::fclose (in); - return 0; -} - -// This method exports the entire configuration database to <filename>. If -// <filename> is NULL (the default), data is persisted to the <filename> -// provided to 'open'. If the internal filename is empty this method -// returns -1. Once the file is opened this method calls 'export_section' -// passing the root section. - -int -ACE_Registry_ImpExp::export_config (const ACE_TCHAR* filename) -{ - int result = -1; - - FILE* out = ACE_OS::fopen (filename, ACE_LIB_TEXT ("w")); - if (out) - { - result = this->export_section (config_.root_section (), - ACE_LIB_TEXT (""), - out); - ACE_OS::fclose (out); - } - return result; -} - -// Method provided by derived classes in order to write one section -// to the file specified. Called by export_config when exporting -// the entire configuration object. - -int -ACE_Registry_ImpExp::export_section (const ACE_Configuration_Section_Key& section, - const ACE_TString& path, - FILE* out) -{ - // don't export the root - if (path.length ()) - { - // Write out the section header - ACE_TString header = ACE_LIB_TEXT ("["); - header += path; - header += ACE_LIB_TEXT ("]"); - header += ACE_LIB_TEXT (" \n"); - if (ACE_OS::fputs (header.fast_rep (), out) < 0) - return -1; - // Write out each value - int index = 0; - ACE_TString name; - ACE_Configuration::VALUETYPE type; - ACE_TString line; - ACE_TCHAR int_value[32]; - ACE_TCHAR bin_value[3]; - void* binary_data; - u_int binary_length; - ACE_TString string_value; - while (!config_.enumerate_values (section, index, name, type)) - { - line = ACE_LIB_TEXT ("\"") + name + ACE_LIB_TEXT ("\"="); - switch (type) - { - case ACE_Configuration::INTEGER: - { - u_int value; - if (config_.get_integer_value (section, name.fast_rep (), value)) - return -2; - ACE_OS::sprintf (int_value, ACE_LIB_TEXT ("%08x"), value); - line += ACE_LIB_TEXT ("dword:"); - line += int_value; - break; - } - case ACE_Configuration::STRING: - { - if (config_.get_string_value (section, - name.fast_rep (), - string_value)) - return -2; - line += ACE_LIB_TEXT ("\""); - line += string_value + ACE_LIB_TEXT ("\""); - break; - } -#ifdef _WIN32 - case ACE_Configuration::INVALID: - break; // JDO added break. Otherwise INVALID is processed - // like BINARY. If that's correct, please remove the - // break and these comments -#endif - case ACE_Configuration::BINARY: - { - // not supported yet - maybe use BASE64 codeing? - if (config_.get_binary_value (section, - name.fast_rep (), - binary_data, - binary_length)) - return -2; - line += ACE_LIB_TEXT ("hex:"); - unsigned char* ptr = (unsigned char*)binary_data; - while (binary_length) - { - if (ptr != binary_data) - { - line += ACE_LIB_TEXT (","); - } - ACE_OS::sprintf (bin_value, ACE_LIB_TEXT ("%02x"), *ptr); - line += bin_value; - --binary_length; - ++ptr; - } - delete (char *)binary_data; - break; - } - default: - return -3; - } - line += ACE_LIB_TEXT ("\n"); - if (ACE_OS::fputs (line.fast_rep (), out) < 0) - return -4; - index++; - } - } - // Export all sub sections - int index = 0; - ACE_TString name; - ACE_Configuration_Section_Key sub_key; - ACE_TString sub_section; - while (!config_.enumerate_sections (section, index, name)) - { - ACE_TString sub_section (path); - if (path.length ()) - sub_section += ACE_LIB_TEXT ("\\"); - sub_section += name; - if (config_.open_section (section, name.fast_rep (), 0, sub_key)) - return -5; - if (export_section (sub_key, sub_section.fast_rep (), out)) - return -6; - index++; - } - return 0; -} - -ACE_Ini_ImpExp::ACE_Ini_ImpExp (ACE_Configuration& config) - : ACE_Config_ImpExp_Base (config) -{ -} - -ACE_Ini_ImpExp::~ACE_Ini_ImpExp (void) -{ -} - -// Method to read file and populate object. -int -ACE_Ini_ImpExp::import_config (const ACE_TCHAR* fileName) -{ - FILE* in = ACE_OS::fopen (fileName, ACE_LIB_TEXT ("r")); - if (!in) - return -1; - - // @@ Make this a dynamic size! - ACE_TCHAR buffer[4096]; - ACE_Configuration_Section_Key section; - while (ACE_OS::fgets (buffer, sizeof buffer, in)) - { - // Check for a comment and blank line - if (buffer[0] == ACE_LIB_TEXT (';') || - buffer[0] == ACE_LIB_TEXT ('#') || - buffer[0] == ACE_LIB_TEXT ('\r') || - buffer[0] == ACE_LIB_TEXT ('\n')) - continue; - - if (buffer[0] == ACE_LIB_TEXT ('[')) - { - // We have a new section here, strip out the section name - ACE_TCHAR* end = ACE_OS::strrchr (buffer, ACE_LIB_TEXT (']')); - if (!end) - { - ACE_OS::fclose (in); - return -3; - } - *end = 0; - - if (config_.expand_path (config_.root_section (), buffer + 1, section, 1)) - { - ACE_OS::fclose (in); - return -3; - } - - continue; - } - - // we have a line - const ACE_TCHAR *name = this->skip_whitespace (buffer); - if (name) - { - ACE_TCHAR *end = (ACE_TCHAR *) ACE_OS::strpbrk (name, ACE_LIB_TEXT ("= \t\n\r")); - - // locate equal sign after name and retrieve value - const ACE_TCHAR *value = ACE_OS::strrchr (name, ACE_LIB_TEXT ('=')); - if (value) - { - value++; // jump over equal sign - value = this->skip_whitespace (value); - ACE_TCHAR *value_end; - if (value[0] != ACE_LIB_TEXT ('"')) - value_end = (ACE_TCHAR *) ACE_OS::strpbrk (value, ACE_LIB_TEXT (" \t\n\r")); - else - { - // double quote delimited allows spaces and tabs in string - value++; - value_end = (ACE_TCHAR *) ACE_OS::strpbrk (value, ACE_LIB_TEXT ("\"\n\r")); - } - if (value_end) - *value_end = '\0'; // terminate value - } - else - value = ACE_LIB_TEXT (""); - - if (end) - *end = '\0'; // terminate name now - - if (config_.set_string_value (section, name, value)) - { - ACE_OS::fclose (in); - return -4; - } - } - } - - if (ferror (in)) - { - ACE_OS::fclose (in); - return -1; - } - - ACE_OS::fclose (in); - return 0; -} - -// This method exports the entire configuration database to -// <filename>. If <filename> is NULL (the default), data is persisted -// to the <filename> provided to 'open'. If the internal filename is -// empty this method returns -1. Once the file is opened this method -// calls 'export_section' passing the root section. - -int -ACE_Ini_ImpExp::export_config (const ACE_TCHAR* filename) -{ - int result = -1; - - FILE* out = ACE_OS::fopen (filename, ACE_LIB_TEXT ("w")); - if (out) - { - result = this->export_section (config_.root_section (), ACE_LIB_TEXT (""), out); - ACE_OS::fclose (out); - } - return result; -} - -// Method provided by derived classes in order to write one section to the -// file specified. Called by export_config when exporting the entire -// configuration objet - -int -ACE_Ini_ImpExp::export_section (const ACE_Configuration_Section_Key& section, - const ACE_TString& path, - FILE* out) -{ - // don't export the root - if (path.length ()) - { - // Write out the section header - ACE_TString header = ACE_LIB_TEXT ("["); - header += path; - header += ACE_LIB_TEXT ("]"); - header += ACE_LIB_TEXT (" \n"); - if (ACE_OS::fputs (header.fast_rep (), out) < 0) - return -1; - // Write out each value - int index = 0; - ACE_TString name; - ACE_Configuration::VALUETYPE type; - ACE_TString line; - ACE_TCHAR int_value[32]; - ACE_TCHAR bin_value[3]; - void* binary_data; - u_int binary_length; - ACE_TString string_value; - while (!config_.enumerate_values (section, index, name, type)) - { - line = name + ACE_LIB_TEXT ("="); - switch (type) - { - case ACE_Configuration::INTEGER: - { - u_int value; - if (config_.get_integer_value (section, name.fast_rep (), value)) - return -2; - ACE_OS::sprintf (int_value, ACE_LIB_TEXT ("%08x"), value); - line += int_value; - break; - } - case ACE_Configuration::STRING: - { - if (config_.get_string_value (section, - name.fast_rep (), - string_value)) - return -2; - if (string_has_white_space (string_value.c_str ())) - { - line += ACE_LIB_TEXT ("\""); - line += string_value + ACE_LIB_TEXT ("\""); - } - else - { - line += string_value; - } - break; - } -#ifdef _WIN32 - case ACE_Configuration::INVALID: - break; // JDO added break. Otherwise INVALID is processed - // like BINARY. If that's correct, please remove the - // break and these comments -#endif - case ACE_Configuration::BINARY: - { - // not supported yet - maybe use BASE64 codeing? - if (config_.get_binary_value (section, - name.fast_rep (), - binary_data, - binary_length)) - return -2; - line += ACE_LIB_TEXT ("\""); - unsigned char* ptr = (unsigned char*)binary_data; - while (binary_length) - { - if (ptr != binary_data) - { - line += ACE_LIB_TEXT (","); - } - ACE_OS::sprintf (bin_value, ACE_LIB_TEXT ("%02x"), *ptr); - line += bin_value; - --binary_length; - ++ptr; - } - line += ACE_LIB_TEXT ("\""); - delete (char *)binary_data; - break; - } - default: - return -3; - - }// end switch on type - - line += ACE_LIB_TEXT ("\n"); - if (ACE_OS::fputs (line.fast_rep (), out) < 0) - return -4; - index++; - }// end while enumerating values - } - // Export all sub sections - int index = 0; - ACE_TString name; - ACE_Configuration_Section_Key sub_key; - ACE_TString sub_section; - while (!config_.enumerate_sections (section, index, name)) - { - ACE_TString sub_section (path); - if (path.length ()) - sub_section += ACE_LIB_TEXT ("\\"); - sub_section += name; - if (config_.open_section (section, name.fast_rep (), 0, sub_key)) - return -5; - if (export_section (sub_key, sub_section.fast_rep (), out)) - return -6; - index++; - } - return 0; - -} - -// Method to skip whitespaces in a string. Whitespace is defined as: -// spaces (' ') and tabs ('\t'). Returns a pointer to the first -// non-whitespace character in the buffer provided. It does return -// null ('\0') if it is reached - -const ACE_TCHAR * -ACE_Ini_ImpExp::skip_whitespace (const ACE_TCHAR *src) -{ - const ACE_TCHAR *cp; - - for (cp = src; - (*cp != '\0') && ((*cp == ' ') || (*cp == '\t')); - cp++) - continue; - - return cp; -} - -// Looks in provided string for whitespace. Whitespace is defined as -// spaces (' ') and tabs ('\t'). Returns true if found and false if -// not found - -int -ACE_Ini_ImpExp::string_has_white_space (const ACE_TCHAR *string_value) -{ - int rc = 0; - - while ((!rc) && (*string_value != '\0')) - { - if ((*string_value == ' ') || (*string_value == '\t')) - rc = 1; - - string_value++; - } - - return rc; -} diff --git a/ace/Configuration_Import_Export.h b/ace/Configuration_Import_Export.h deleted file mode 100644 index ae6a138c303..00000000000 --- a/ace/Configuration_Import_Export.h +++ /dev/null @@ -1,225 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Configuration_Import_Export.h - * - * $Id$ - * - * @author Jerry D. Odenwelder Jr. <jerry.o@mindspring.com> - * Chris Hafey <chris@stentorsoft.com> - * - * Classes defined in this file provide the ability to import and export - * ACE Configuration objects to/from disk files. The base class - * ACE_Config_ImpExp_Base provides the common functionality and the derived - * classes implement the import/export functionality for the specific format. - * - * @todo - * - Add locking for thread safety. - * - Provide ability to read file in one format and write in another. - * - See todo's in each class - */ -//============================================================================= - -#ifndef ACE_CONFIGURATION_IMPORT_EXPORT_H -#define ACE_CONFIGURATION_IMPORT_EXPORT_H -#include "ace/pre.h" - -#include "ace/Configuration.h" -#include "ace/SString.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -/** - * @class ACE_Config_ImpExp_Base - * - * @brief Base class for file import/export configuration. - * - * This class provides base functionality for configuration objects - * that are persisted in files. It takes an ACE_Configuration - * object that it populates with the data read. - * - */ -class ACE_Export ACE_Config_ImpExp_Base -{ -public: - /// ctor taking the ACE_Configuration to import/export to - ACE_Config_ImpExp_Base(ACE_Configuration& config); - - /** - * Destructor - */ - virtual ~ACE_Config_ImpExp_Base(); - - /** - * Imports the configuration database from filename. - * No existing data is removed. - * Since the open method relies on this method, this method - * acts as open if an open has not already occurred. - */ - virtual int import_config(const ACE_TCHAR* filename) = 0; - - /** - * This method exports the entire configuration database to <filename>. - * If <filename> is NULL (the default), data is persisted to the - * <filename> provided to 'open'. If the internal filename is empty - * this method returns -1. Once the file is opened this method calls - * 'export_section' passing the root section. - */ - virtual int export_config (const ACE_TCHAR* filename) = 0; - -protected: - ACE_Configuration& config_; - -private: - ACE_Config_ImpExp_Base (const ACE_Config_ImpExp_Base&); - ACE_Config_ImpExp_Base& operator= (const ACE_Config_ImpExp_Base&); -}; - -/** - * @class ACE_Registry_ImpExp - * - * @brief Configuration object that imports/exports data to a file formatted - * using the Win32 Registry file export format. This format looks like - * [Section] - * "key"="String Data" - * "key"=dword: numeric data - * "key"=hex: binary data - * - * @todo - * - Add dynamic buffer when importing. currently it will not allow - * importing of values greater than a fixed ammount (4096 bytes) - * - */ -class ACE_Export ACE_Registry_ImpExp : public ACE_Config_ImpExp_Base -{ -public: - /// Construction - ACE_Registry_ImpExp(ACE_Configuration&); - - /// Destruction. - virtual ~ACE_Registry_ImpExp(void); - - /** - * Imports the configuration database from filename. - * No existing data is removed. - * Since the open method relies on this method, this method - * acts as open if an open has not already occurred. - */ - virtual int import_config(const ACE_TCHAR* filename); - - /** - * This method exports the entire configuration database to <filename>. - * If <filename> is NULL (the default), data is persisted to the - * <filename> provided to 'open'. If the internal filename is empty - * this method returns -1. Once the file is opened this method calls - * 'export_section' passing the root section. - */ - virtual int export_config (const ACE_TCHAR* filename); - -private: - int export_section (const ACE_Configuration_Section_Key& section, - const ACE_TString& path, - FILE* out); - - ACE_Registry_ImpExp( const ACE_Registry_ImpExp&); - ACE_Registry_ImpExp& operator=( const ACE_Registry_ImpExp&); -}; - -/** - * @class ACE_Ini_ImpExp - * - * @brief Imports the configuration database from filename as strings. - * Allows non-typed values. (no #, dword: hex:, etc. prefixes) and - * skips whitespace (tabs and spaces) as in standard .ini and .conf - * files. Values (to right of equal sign) can be double quote - * delimited to embed tabs and spaces in the string. - * Caller must convert string to type. - * - * This method allows for lines in the .ini or .conf file like this: - * - * TimeToLive = 100 - * Delay = FALSE - * Flags = FF34 - * Heading = "ACE - Adaptive Communication Environment" - * - * (note leading whitespace (tabs) in examples below) - * - * SeekIndex = 14 - * TraceLevel = 6 # Can comment lines like this - * Justification = left_justified - * - * The caller can then retrieve the string with the regular - * <get_string_value> function and convert the string to the - * desired data type. - * - * @todo - * - Strings with embedded newlines cause the import to fail - * - Strings with embedded quotes " cause the import to fail - * - Importing/exporting for values in the root section does not work - * - Add dynamic buffer when importing. currently it will not allow - * importing of values greater than a fixed ammount (4096 bytes) -*/ -class ACE_Export ACE_Ini_ImpExp : public ACE_Config_ImpExp_Base -{ -public: - /** - * Construction - */ - ACE_Ini_ImpExp(ACE_Configuration&); - - /** - * Destructor - */ - virtual ~ACE_Ini_ImpExp(void); - - /** - * Imports the configuration database from filename. - * No existing data is removed. - * Since the open method relies on this method, this method - * acts as open if an open has not already occurred. - */ - virtual int import_config(const ACE_TCHAR* filename); - - /** - * This method exports the entire configuration database to <filename>. - * If <filename> is NULL (the default), data is persisted to the - * <filename> provided to 'open'. If the internal filename is empty - * this method returns -1. Once the file is opened this method calls - * 'export_section' passing the root section. - */ - virtual int export_config (const ACE_TCHAR* filename); - -private: - /** - * Method provided by derived classes in order to write one section - * to the file specified. Called by export_config when exporting - * the entire configuration object. - */ - int export_section (const ACE_Configuration_Section_Key& section, - const ACE_TString& path, - FILE* out); - - /** - * Method to skip whitespaces in a string. Whitespace is defined as: - * spaces(' ') and tabs('\t'). - * Returns a pointer to the first non-whitespace character in the - * buffer provided. It does return null ('\0') if it is reached - */ - const ACE_TCHAR *skip_whitespace (const ACE_TCHAR *src); - - /** - * Looks in provided string for whitespace. Whitespace is defined as - * spaces(' ') and tabs('\t'). - * Returns true if found and false if not found - */ - int string_has_white_space (const ACE_TCHAR *string_value); - - ACE_Ini_ImpExp (const ACE_Ini_ImpExp&); - ACE_Ini_ImpExp& operator= (const ACE_Ini_ImpExp&); -}; - -#include "ace/post.h" -#endif /* ACE_CONFIGURATION_IMPORT_EXPORT_H */ diff --git a/ace/Connector.cpp b/ace/Connector.cpp index a2261613ae0..15eef258692 100644 --- a/ace/Connector.cpp +++ b/ace/Connector.cpp @@ -339,24 +339,20 @@ ACE_Connector<SH, PR_CO_2>::handle_output (ACE_HANDLE handle) PR_AD raddr; +#if defined (ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS) + // Win32 has a timing problem - if you check to see if the + // connection has completed too fast, it will fail - so wait 35 + // millisecond to let it catch up. + ACE_Time_Value tv (0, ACE_NON_BLOCKING_BUG_DELAY); + ACE_OS::sleep (tv); +#endif /* ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS */ + // Check to see if we're connected. if (ast->svc_handler ()->peer ().get_remote_addr (raddr) != -1) this->activate_svc_handler (ast->svc_handler ()); else // Somethings gone wrong, so close down... - { -#if defined (ACE_WIN32) - ACE_DEBUG ((LM_DEBUG, "errno %d; Sleeping to retry get_remote_addr\n", errno)); - // Win32 (at least prior to Windows 2000) has a timing problem. - // If you check to see if the connection has completed too fast, - // it will fail - so wait 35 milliseconds to let it catch up. - ACE_Time_Value tv (0, ACE_NON_BLOCKING_BUG_DELAY); - ACE_OS::sleep (tv); - if (ast->svc_handler ()->peer ().get_remote_addr (raddr) != -1) - this->activate_svc_handler (ast->svc_handler ()); - else // do the svc handler close below... -#endif /* ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS */ - ast->svc_handler ()->close (0); - } + ast->svc_handler ()->close (0); + delete ast; return 0; } diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp index 47a4f91fd3b..8d72da5d5a3 100644 --- a/ace/Containers_T.cpp +++ b/ace/Containers_T.cpp @@ -62,7 +62,6 @@ ACE_Bounded_Stack<T>::operator= (const ACE_Bounded_Stack<T> &s) delete [] this->stack_; ACE_NEW (this->stack_, T[s.size_]); - this->size_ = s.size_; } this->top_ = s.top_; diff --git a/ace/Get_Opt.h b/ace/Get_Opt.h index ee1a485268e..013d7cfb4fc 100644 --- a/ace/Get_Opt.h +++ b/ace/Get_Opt.h @@ -47,14 +47,14 @@ public: * following <argv>-element, and returned in <optarg>. * * If an option character is seen that is not listed in <optstring>, - * return '?' after printing an error message. If you set - * <report_errors> to zero, the error message is suppressed but we - * still return '?'. + * return '?' after printing an error message. If you set <opterr> + * to zero, the error message is suppressed but we still return '?'. * * If a char in <optstring> is followed by a colon, that means it * wants an arg, so the following text in the same <argv>-element, * or the text of the following <argv>-element, is returned in - * <optarg>. */ + * <optarg>. + */ ACE_Get_Opt (int argc, ACE_TCHAR **argv, const ACE_TCHAR *optstring, diff --git a/ace/Handle_Gobbler.i b/ace/Handle_Gobbler.i index f4af340a012..a8313f08cb4 100644 --- a/ace/Handle_Gobbler.i +++ b/ace/Handle_Gobbler.i @@ -1,6 +1,6 @@ // $Id$ -// Since this is only included in Handle_Gobbler.h, these should be +// Since this is only included in Handle_Gobbler.h, these should be // inline, not ACE_INLINE. // FUZZ: disable check_for_inline @@ -53,11 +53,8 @@ ACE_Handle_Gobbler::consume_handles (size_t n_handles_to_keep_available) { int result = 0; -#if defined(ACE_WIN32) // On Win32, this style of gobbling doesn't seem to work. - ACE_UNUSED_ARG(n_handles_to_keep_available); - -#else +#if !defined (ACE_WIN32) while (1) { diff --git a/ace/Lib_Find.cpp b/ace/Lib_Find.cpp index 3d735359e75..51765c1cb93 100644 --- a/ace/Lib_Find.cpp +++ b/ace/Lib_Find.cpp @@ -428,7 +428,6 @@ ACE_HANDLE ACE_Lib_Find::open_temp_file (const ACE_TCHAR *name, int mode, int perm) { #if defined (ACE_WIN32) - ACE_UNUSED_ARG(perm); return ACE_OS::open (name, mode | _O_TEMPORARY); #else diff --git a/ace/Local_Name_Space_T.cpp b/ace/Local_Name_Space_T.cpp index eb049870012..a341a4b9c41 100644 --- a/ace/Local_Name_Space_T.cpp +++ b/ace/Local_Name_Space_T.cpp @@ -404,12 +404,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) ACE_OS::strcat (this->context_file_, database); #if !defined (CHORUS) -# if defined(ACE_WIN32) && \ - (!defined(ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0)) - ACE_MEM_POOL_OPTIONS options (this->name_options_->base_address (), 0); -# else ACE_MEM_POOL_OPTIONS options (this->name_options_->base_address ()); -# endif /* !ACE_HAS_WINNT4 */ #else // Use base address == 0, don't use a fixed address. ACE_MEM_POOL_OPTIONS options (0, diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp index c58b8a55b19..30fe7f6aea8 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -115,7 +115,7 @@ int ACE_Log_Msg_Manager::init_backend (const u_long *flags) ACE_Log_Msg_Manager::log_backend_flags_ = *flags; } - + if (ACE_Log_Msg_Manager::log_backend_ == 0) { ACE_NO_HEAP_CHECK; @@ -792,12 +792,9 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, ACE_TRACE ("ACE_Log_Msg::log"); // External decls. -#if ! (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) \ - && !defined(__MINGW32__) +#if ! (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) #if defined (__FreeBSD__) || defined(__QNX__) extern const int sys_nerr; -#elif defined (__CYGWIN32__) -# define sys_nerr _sys_nerr #else extern int sys_nerr; #endif /* !__FreeBSD__ && !__QNX__ */ @@ -1147,10 +1144,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, case 't': // Format thread id. type = SKIP_SPRINTF; #if defined (ACE_WIN32) - ACE_OS::sprintf (bp, - ACE_LIB_TEXT ("%u"), - ACE_static_cast(unsigned, - ACE_Thread::self ())); + ACE_OS::sprintf (bp, ACE_LIB_TEXT ("%u"), ACE_Thread::self ()); #elif defined (AIX) && (ACE_AIX_MINOR_VERS <= 2) // AIX's pthread_t (ACE_hthread_t) is a pointer, and it's // a little ugly to send that through a %u format. So, diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h index fd6c3e81693..1418d2a4c10 100644 --- a/ace/Log_Msg.h +++ b/ace/Log_Msg.h @@ -194,20 +194,13 @@ public: /// cleanup logger. ~ACE_Log_Msg (void); - /// Initialize the ACE logging facility. /** - * Initialize the ACE logging facility. Supplies the program name - * that is available to each logging message call. Default arguments - * set up logging to STDERR only. - * - * @param prog_name The name of the calling program. - * @param flags A bitwise-or of options flags used to set the - * initial behavior and logging sink(s). (see the - * enum above for the valid values). - * @param logger_key The name of ACE_FIFO rendezvous point where the - * local client logger daemon is listening for logging - * messages. Only meaningful if the LOGGER bit is - * set in the <flags> argument. + * Initialize the ACE error handling facility. <prog_name> is the + * name of the executable program. <flags> are a bitwise-or of + * options flags passed to the Logger (see the enum above for the valid + * values). If the <LOGGER> bit in <flags> is enabled then + * <logger_key> is the name of ACE_FIFO rendezvous point where the + * local client logger daemon is listening for logging messages. */ int open (const ACE_TCHAR *prog_name, u_long options_flags = ACE_Log_Msg::STDERR, @@ -224,15 +217,21 @@ public: void clr_flags (u_long f); u_long flags (void); - // = Allow apps to acquire and release internal synchronization lock. + /** @name Allow apps to acquire and release internal synchronization + * lock + * + * This lock is used internally by the <ACE_Log_Msg> + * implementation. By exporting the lock, applications can hold the + * lock atomically over a number of calls to <ACE_Log_Msg>. + */ + //@{ - // This lock is used internally by the <ACE_Log_Msg> implementation. - // By exporting the lock, applications can hold the lock atomically - // over a number of calls to <ACE_Log_Msg>. /// Acquire the internal lock. - /// Release the internal lock. int acquire (void); + + /// Release the internal lock. int release (void); + //@} /// Call after doing a <fork> to resynchronize the process id and /// <program_name> variables. @@ -413,29 +412,24 @@ public: /** * Format a message to the thread-safe ACE logging mechanism. Valid * options (prefixed by '%', as in printf format strings) include: - * + 'A': print an ACE_timer_t value (which could be either double - * or ACE_UINT32.) + * + 'A': print an ACE_timer_t value (which could be either double or ACE_UINT32.) * + 'a': abort the program at this point abruptly. * + 'c': print a character * + 'C': print a character string * + 'i', 'd': print a decimal number - * + 'I': indent according to nesting depth (obtained from - * <ACE_Trace::get_nesting_indent>). + * + 'I', indent according to nesting depth (obtained from <ACE_Trace::get_nesting_indent>). * + 'e', 'E', 'f', 'F', 'g', 'G': print a double - * + 'l': print line number where an error occurred. - * + 'm': return the message corresponding to errno value, e.g., as - * done by strerror() + * + 'l', print line number where an error occurred. + * + 'm': Return the message corresponding to errno value, e.g., as done by strerror() * + 'N': print file name where the error occurred. * + 'n': print the name of the program (or "<unknown>" if not set) * + 'o': print as an octal number * + 'P': print out the current process id - * + 'p': print out the appropriate errno message from sys_errlist, - * e.g., as done by perror() + * + 'p': print out the appropriate errno message from sys_errlist, e.g., as done by perror() * + 'Q': print out the uint64 number * + 'r': call the function pointed to by the corresponding argument * + 'R': print return status - * + 'S': print out the appropriate _sys_siglist entry corresponding - * to var-argument. + * + 'S': print out the appropriate _sys_siglist entry corresponding to var-argument. * + 's': print out a character string * + 'T': print timestamp in hour:minute:sec:usec format. * + 'D': print timestamp in month/day/year hour:minute:sec:usec format. diff --git a/ace/MEM_IO.i b/ace/MEM_IO.i index 3fb9c2979ac..064dc94534b 100644 --- a/ace/MEM_IO.i +++ b/ace/MEM_IO.i @@ -4,13 +4,6 @@ // MEM_IO.i ASYS_INLINE -ACE_MT_MEM_IO::Simple_Queue::Simple_Queue (void) - : mq_ (0), - malloc_ (0) -{ -} - -ASYS_INLINE ACE_Reactive_MEM_IO::ACE_Reactive_MEM_IO () { } @@ -25,6 +18,13 @@ ACE_MT_MEM_IO::ACE_MT_MEM_IO () } ASYS_INLINE +ACE_MT_MEM_IO::Simple_Queue::Simple_Queue (void) + : mq_ (0), + malloc_ (0) +{ +} + +ASYS_INLINE ACE_MT_MEM_IO::Simple_Queue::Simple_Queue (MQ_Struct *mq) : mq_ (mq), malloc_ (0) diff --git a/ace/Makefile b/ace/Makefile index fe169767ecc..6a7b3692ea1 100644 --- a/ace/Makefile +++ b/ace/Makefile @@ -35,7 +35,6 @@ UTILS_FILES = \ Capabilities \ Containers \ Configuration \ - Configuration_Import_Export \ Dirent \ Dynamic \ Dynamic_Service_Base \ @@ -66,7 +65,6 @@ LOGGING_FILES = \ Log_Msg_Callback \ Log_Msg_Backend \ Log_Msg_IPC \ - Log_Msg_NT_Event_Log \ Log_Record \ Logging_Strategy \ Trace @@ -92,7 +90,6 @@ DEMUX_FILES = \ Handle_Set \ Msg_WFMO_Reactor \ POSIX_Proactor \ - WIN32_Proactor \ Priority_Reactor \ Proactor \ Reactor \ @@ -108,7 +105,6 @@ CONNECTION_FILES = \ Asynch_IO \ Asynch_IO_Impl \ POSIX_Asynch_IO \ - WIN32_Asynch_IO \ Strategies SOCKETS_FILES = \ Addr \ @@ -320,7 +316,7 @@ endif # ACE_HAS_GNUG_PRE_2_8 ## if we have the RAPI library installed ifeq ($(rapi),1) DIRS += QoS -endif # rapi +endif # rapi #### #### Build customization. diff --git a/ace/Makefile.bor b/ace/Makefile.bor index 3ff3a430322..8be64966125 100644 --- a/ace/Makefile.bor +++ b/ace/Makefile.bor @@ -1,4 +1,7 @@ + +# # Makefile for building the ACE library with Borland C++Builder 4.x +# NAME = ace @@ -39,7 +42,6 @@ OBJFILES = \ $(OBJDIR)\CDR_Base.obj \ $(OBJDIR)\CDR_Stream.obj \ $(OBJDIR)\Configuration.obj \ - $(OBJDIR)\Configuration_Import_Export.obj \ $(OBJDIR)\Containers.obj \ $(OBJDIR)\CORBA_Handler.obj \ $(OBJDIR)\CORBA_Ref.obj \ diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h index f1d398e7b2c..aff5f897f8d 100644 --- a/ace/Malloc_T.h +++ b/ace/Malloc_T.h @@ -10,6 +10,7 @@ */ //============================================================================= + #ifndef ACE_MALLOC_T_H #define ACE_MALLOC_T_H #include "ace/pre.h" diff --git a/ace/Mem_Map.cpp b/ace/Mem_Map.cpp index 965f2f69216..575d091765c 100644 --- a/ace/Mem_Map.cpp +++ b/ace/Mem_Map.cpp @@ -65,8 +65,8 @@ ACE_Mem_Map::map_it (ACE_HANDLE handle, int unmap_result = this->unmap (); if (unmap_result != 0) return unmap_result; -#endif /* ACE_LACKS_AUTO_MMAP_REPLACEMENT */ - +#endif /* ACE_LACKS_AUTO_MMAP_REMAPPING */ + this->base_addr_ = addr; this->handle_ = handle; @@ -100,7 +100,7 @@ ACE_Mem_Map::map_it (ACE_HANDLE handle, { // File length implicitly requested by user requested_file_length = length_request + offset; - + // Check to see if we need to extend the backing store if (requested_file_length > current_file_length) { @@ -127,10 +127,10 @@ ACE_Mem_Map::map_it (ACE_HANDLE handle, if (requested_file_length > 0) // This will make the file size <requested_file_length> null_byte_position = requested_file_length - 1; - else + else // This will make the file size 1 null_byte_position = 0; - + if (ACE_OS::pwrite (this->handle_, "", 1, @@ -142,16 +142,16 @@ ACE_Mem_Map::map_it (ACE_HANDLE handle, if (requested_file_length > 0) // This will make the file size <requested_file_length> actual_file_length = requested_file_length; - else + else // This will make the file size 1 actual_file_length = 1; - + if (ACE_OS::ftruncate (this->handle_, actual_file_length) == -1) return -1; #endif /* !CHORUS */ } - + #if defined (__Lynx__) // Set flag that indicates whether PROT_WRITE has been enabled. write_enabled_ = ACE_BIT_ENABLED (prot, PROT_WRITE); diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp index 08d5e3320e8..ea4fb3bc79b 100644 --- a/ace/Memory_Pool.cpp +++ b/ace/Memory_Pool.cpp @@ -402,7 +402,7 @@ ACE_MMAP_Memory_Pool::init_acquire (size_t nbytes, int ACE_MMAP_Memory_Pool::seh_selector (void *ep) { - DWORD ecode = ((EXCEPTION_POINTERS *) ep)->ExceptionRecord->ExceptionCode; + int ecode = ((EXCEPTION_POINTERS *) ep)->ExceptionRecord->ExceptionCode; if (ecode == EXCEPTION_ACCESS_VIOLATION) { @@ -1007,8 +1007,8 @@ ACE_Pagefile_Memory_Pool::release (void) ACE_Pagefile_Memory_Pool::ACE_Pagefile_Memory_Pool (const ACE_TCHAR *backing_store_name, const OPTIONS *options) : shared_cb_ (0), - object_handle_ (0), - page_size_ (ACE_Pagefile_Memory_Pool::round_to_page_size (1)) + page_size_ (ACE_Pagefile_Memory_Pool::round_to_page_size (1)), + object_handle_ (0) { // Initialize local copy of pool statistics. if (options != 0) @@ -1096,7 +1096,7 @@ ACE_Pagefile_Memory_Pool::init_acquire (size_t nbytes, int ACE_Pagefile_Memory_Pool::seh_selector (void *ep) { - DWORD ecode = ((EXCEPTION_POINTERS *) ep)->ExceptionRecord->ExceptionCode; + int ecode = ((EXCEPTION_POINTERS *) ep)->ExceptionRecord->ExceptionCode; if (ecode == EXCEPTION_ACCESS_VIOLATION) { diff --git a/ace/Message_Queue.i b/ace/Message_Queue.i index 8cf619653a8..b1afcc649d2 100644 --- a/ace/Message_Queue.i +++ b/ace/Message_Queue.i @@ -205,8 +205,6 @@ ACE_INLINE int ACE_Message_Queue_NT::peek_dequeue_head (ACE_Message_Block *&first_item, ACE_Time_Value *timeout) { - ACE_UNUSED_ARG(first_item); - ACE_UNUSED_ARG(timeout); ACE_NOTSUP_RETURN (-1); } diff --git a/ace/NT_Service.cpp b/ace/NT_Service.cpp index 614fa9dfb1f..0fbfb41dd58 100644 --- a/ace/NT_Service.cpp +++ b/ace/NT_Service.cpp @@ -51,7 +51,6 @@ ACE_NT_Service::~ACE_NT_Service (void) int ACE_NT_Service::open (void *args) { - ACE_UNUSED_ARG (args); report_status (SERVICE_START_PENDING, 0); int svc_return = this->svc (); @@ -236,17 +235,16 @@ ACE_NT_Service::startup (DWORD startup) if (svc == 0) return -1; - BOOL ok = - ChangeServiceConfig (svc, - (DWORD) SERVICE_NO_CHANGE,// No change to service type - startup, // New startup type - (DWORD) SERVICE_NO_CHANGE,// No change to error ctrl - 0, // No change to pathname - 0, // No change to load group - 0, // No change to tag - 0, // No change to dependencies - 0, 0, // No change to acct/passwd - 0); // No change to name + BOOL ok = ChangeServiceConfig (svc, + SERVICE_NO_CHANGE,// No change to service type + startup, // New startup type + SERVICE_NO_CHANGE,// No change to error ctrl + 0, // No change to pathname + 0, // No change to load group + 0, // No change to tag + 0, // No change to dependencies + 0, 0, // No change to acct/passwd + 0); // No change to name return ok ? 0 : -1; } diff --git a/ace/OS.cpp b/ace/OS.cpp index a4861ab8f9f..96b36884671 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -279,11 +279,11 @@ void ACE_Time_Value::set (const FILETIME &file_time) // Convert remainder to microseconds; this->tv_.tv_usec = (long)((LL_100ns % ((ACE_UINT32)(10000 * 1000))) / 10); #else - // Don't use a struct initializer, gcc don't like it. - ULARGE_INTEGER _100ns; - _100ns.LowPart = file_time.dwLowDateTime; - _100ns.HighPart = file_time.dwHighDateTime; - + ULARGE_INTEGER _100ns = + { + file_time.dwLowDateTime, + file_time.dwHighDateTime + }; _100ns.QuadPart -= ACE_Time_Value::FILETIME_to_timval_skew; // Convert 100ns units to seconds; @@ -612,8 +612,6 @@ ACE_OS::uname (struct utsname *name) ACE_OS::strcpy (name->sysname, ACE_LIB_TEXT ("Win32")); # endif /* ACE_HAS_PHARLAP */ - const ACE_TCHAR* unknown = ACE_LIB_TEXT ("???"); - if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT) { // Get information from the two structures @@ -623,11 +621,11 @@ ACE_OS::uname (struct utsname *name) # else ACE_LIB_TEXT ("Windows NT %d.%d"), # endif /* ACE_HAS_WINCE */ - (int) vinfo.dwMajorVersion, - (int) vinfo.dwMinorVersion); + vinfo.dwMajorVersion, + vinfo.dwMinorVersion); ACE_OS::sprintf (name->version, ACE_LIB_TEXT ("Build %d %s"), - (int) vinfo.dwBuildNumber, + vinfo.dwBuildNumber, vinfo.szCSDVersion); // We have to make sure that the size of (processor + subtype) @@ -690,51 +688,27 @@ ACE_OS::uname (struct utsname *name) ACE_OS::strcpy (processor, ACE_LIB_TEXT ("Unknown")); break; } - ACE_OS::sprintf (name->machine, - ACE_LIB_TEXT ("%s %s"), - processor, subtype); + ACE_OS::sprintf (name->machine, ACE_LIB_TEXT ("%s %s"), processor, subtype); } else if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) { - if (vinfo.dwMajorVersion == 4 && vinfo.dwMinorVersion == 0) - { - ACE_OS::strcpy (name->release, ACE_LIB_TEXT ("Windows 95")); - if (vinfo.szCSDVersion[1] == 'C') - ACE_OS::strcat (name->release, ACE_LIB_TEXT (" OSR2")); - } - else if (vinfo.dwMajorVersion == 4 && vinfo.dwMinorVersion == 10) - { - ACE_OS::strcpy (name->release, ACE_LIB_TEXT ("Windows 98")); - if (vinfo.szCSDVersion[1] == 'A') - ACE_OS::strcat (name->release, ACE_LIB_TEXT (" SE")); - } - else if (vinfo.dwMajorVersion == 4 && vinfo.dwMinorVersion == 90) - { - ACE_OS::strcpy (name->release, ACE_LIB_TEXT ("Windows Me")); - } - else - { - ACE_OS::strcpy (name->release, unknown); - } - - ACE_OS::sprintf (name->version, ACE_LIB_TEXT ("%d"), - LOWORD (vinfo.dwBuildNumber)); + // Get Windows 95 Information + ACE_OS::strcpy (name->release, ACE_LIB_TEXT ("Windows 95")); + ACE_OS::sprintf (name->version, ACE_LIB_TEXT ("%d"), LOWORD (vinfo.dwBuildNumber)); if (sinfo.dwProcessorType == PROCESSOR_INTEL_386) ACE_OS::strcpy (name->machine, ACE_LIB_TEXT ("Intel 80386")); else if (sinfo.dwProcessorType == PROCESSOR_INTEL_486) ACE_OS::strcpy (name->machine, ACE_LIB_TEXT ("Intel 80486")); else if (sinfo.dwProcessorType == PROCESSOR_INTEL_PENTIUM) ACE_OS::strcpy (name->machine, ACE_LIB_TEXT ("Intel Pentium")); - else - ACE_OS::strcpy (name->machine, unknown); } else { // We don't know what this is! - ACE_OS::strcpy (name->release, unknown); - ACE_OS::strcpy (name->version, unknown); - ACE_OS::strcpy (name->machine, unknown); + ACE_OS::strcpy (name->release, ACE_LIB_TEXT ("???")); + ACE_OS::strcpy (name->version, ACE_LIB_TEXT ("???")); + ACE_OS::strcpy (name->machine, ACE_LIB_TEXT ("???")); } # if defined (ACE_LACKS_HOSTNAME) @@ -1927,7 +1927,7 @@ struct stat #else # if defined (ACE_HAS_EXCEPTIONS) # define ACE_THROW_SPEC(X) throw X -# if defined (ACE_WIN32) && defined(_MSC_VER) && !defined (ghs) +# if defined (ACE_WIN32) && !defined (ghs) // @@ MSVC "supports" the keyword but doesn't implement it (Huh?). // Therefore, we simply supress the warning for now. # pragma warning( disable : 4290 ) @@ -3128,8 +3128,7 @@ typedef void (*ACE_SignalHandlerV)(...); // Turn off warnings for /W4 // To resume any of these warning: #pragma warning(default: 4xxx) // which should be placed after these defines - -# if !defined (ALL_WARNINGS) && defined(_MSC_VER) && !defined(ghs) && !defined(__MINGW32__) +# if !defined (ALL_WARNINGS) && !defined(ghs) // #pragma warning(disable: 4101) // unreferenced local variable # pragma warning(disable: 4127) /* constant expression for TRACE/ASSERT */ # pragma warning(disable: 4134) /* message map member fxn casts */ @@ -3146,7 +3145,7 @@ typedef void (*ACE_SignalHandlerV)(...); # pragma warning(disable: 4251) /* using non-exported as public in exported */ # pragma warning(disable: 4786) /* identifier was truncated to '255' characters in the browser information */ # pragma warning(disable: 4097) /* typedef-name used as synonym for class-name */ -# endif /* !ALL_WARNINGS && _MSV_VER && !ghs && !__MINGW32__ */ +# endif /*!ALL_WARNINGS */ // STRICT type checking in WINDOWS.H enhances type safety for Windows // programs by using distinct types to represent all the different @@ -3231,11 +3230,7 @@ typedef void (*ACE_SignalHandlerV)(...); # define ACE_LD_SEARCH_PATH ACE_LIB_TEXT ("PATH") # define ACE_LD_SEARCH_PATH_SEPARATOR_STR ACE_LIB_TEXT (";") # define ACE_DLL_SUFFIX ACE_LIB_TEXT (".dll") -# if defined (__MINGW32__) -# define ACE_DLL_PREFIX ACE_LIB_TEXT ("lib") -# else /* __MINGW32__ */ -# define ACE_DLL_PREFIX ACE_LIB_TEXT ("") -# endif /* __MINGW32__ */ +# define ACE_DLL_PREFIX ACE_LIB_TEXT ("") // This will help until we figure out everything: # define NFDBITS 32 /* only used in unused functions... */ @@ -3358,9 +3353,7 @@ PAGE_NOCACHE */ typedef OVERLAPPED ACE_OVERLAPPED; typedef DWORD ACE_thread_t; -# if !defined(__MINGW32__) typedef long pid_t; -# endif /* __MINGW32__ */ typedef HANDLE ACE_hthread_t; #define ACE_INVALID_PID ((pid_t) -1) @@ -3393,9 +3386,7 @@ typedef pace_uid_t uid_t; typedef pace_gid_t gid_t; # else /* !ACE_HAS_PACE */ typedef DWORD nlink_t; -# if !defined(__MINGW32__) typedef int mode_t; -# endif /* !__MINGW32__ */ typedef int uid_t; typedef int gid_t; # endif /* ACE_HAS_PACE */ @@ -4133,9 +4124,9 @@ typedef fd_set ACE_FD_SET_TYPE; # if defined (ACE_LACKS_SIGSET) # if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) typedef pace_sigset_t sigset_t; -# elif !defined(__MINGW32__) +# else typedef u_int sigset_t; -# endif /* !ACE_HAS_PACE && !__MINGW32__*/ +# endif /* ACE_HAS_PACE */ # endif /* ACE_LACKS_SIGSET */ # if defined (ACE_LACKS_SIGACTION) @@ -1,10 +1,6 @@ // -*- C++ -*- // $Id$ -#if defined (__CYGWIN32__) -# include <getopt.h> -#endif - #if !defined (ACE_HAS_INLINED_OSCALLS) # undef ACE_INLINE # define ACE_INLINE @@ -8422,7 +8418,9 @@ ACE_OS::thr_yield (void) #if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) ::pace_sched_yield (); #elif defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_STHREADS) + ::thr_yield (); +# elif defined (ACE_HAS_PTHREADS) # if defined (ACE_HAS_PTHREADS_STD) // Note - this is a POSIX.4 function - not a POSIX.1c function... ::sched_yield (); @@ -8431,8 +8429,6 @@ ACE_OS::thr_yield (void) # else /* Draft 4 and 7 */ ::pthread_yield (); # endif /* ACE_HAS_PTHREADS_STD */ -# elif defined (ACE_HAS_STHREADS) - ::thr_yield (); # elif defined (ACE_HAS_WTHREADS) ::Sleep (0); # elif defined (VXWORKS) @@ -10313,8 +10309,6 @@ ACE_OS::execv (const char *path, #elif defined (ACE_WIN32) # if defined (__BORLANDC__) /* VSB */ return ::execv (path, argv); -# elif defined (__MINGW32__) - return ::_execv (path, (char *const *) argv); # else return ::_execv (path, (const char *const *) argv); # endif /* __BORLANDC__ */ @@ -10348,8 +10342,6 @@ ACE_OS::execve (const char *path, #elif defined (ACE_WIN32) # if defined (__BORLANDC__) /* VSB */ return ::execve (path, argv, envp); -# elif defined (__MINGW32__) - return ::_execve (path, (char *const *) argv, (char *const *) envp); # else return ::_execve (path, (const char *const *) argv, (const char *const *) envp); # endif /* __BORLANDC__ */ @@ -10381,8 +10373,6 @@ ACE_OS::execvp (const char *file, #elif defined (ACE_WIN32) # if defined (__BORLANDC__) /* VSB */ return ::execvp (file, argv); -# elif defined (__MINGW32__) - return ::_execvp (file, (char *const *) argv); # else return ::_execvp (file, (const char *const *) argv); # endif /* __BORLANDC__ */ @@ -10568,7 +10558,7 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op) ACE_UNUSED_ARG (op); // Use .obj/gethrtime.o, which was compiled with g++. return ACE_gethrtime (); -#elif (defined(__KCC) || defined (__GNUG__)) && !defined (__MINGW32__) && defined (ACE_HAS_PENTIUM) +#elif (defined(__KCC) || defined (__GNUG__)) && defined (ACE_HAS_PENTIUM) ACE_UNUSED_ARG (op); # if defined (ACE_LACKS_LONGLONG_T) @@ -10612,7 +10602,6 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op) return now; #elif defined (ACE_WIN32) - ACE_UNUSED_ARG(op); LARGE_INTEGER freq; ::QueryPerformanceCounter (&freq); @@ -11445,10 +11434,8 @@ ACE_OS::mkdir (const ACE_TCHAR *path, mode_t mode) ace_result_), int, -1); #elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_UNUSED_ARG (mode); ACE_OSCALL_RETURN (::_wmkdir (path), int, -1); #elif defined (ACE_WIN32) - ACE_UNUSED_ARG (mode); ACE_OSCALL_RETURN (::mkdir (path), int, -1); #else ACE_OSCALL_RETURN (::mkdir (path, mode), int, -1); diff --git a/ace/OS_String.cpp b/ace/OS_String.cpp index 6bc7aaf44f5..6db181f53fe 100644 --- a/ace/OS_String.cpp +++ b/ace/OS_String.cpp @@ -99,17 +99,13 @@ ACE_OS_String::strdup (const wchar_t *s) # elif defined (ACE_WCSDUP_EQUIVALENT) return ACE_WCSDUP_EQUIVALENT (s); # else /* ACE_LACKS_WCSDUP */ -# if defined (__MINGW32__) - return ::wcsdup (ACE_const_cast(wchar_t*, s)); -# else /* __MINGW32__ */ return ::wcsdup (s); -# endif /* __MINGW32__ */ # endif /* ACE_LACKS_WCSDUP */ } #endif /* ACE_HAS_WCHAR */ #if defined (ACE_LACKS_STRERROR) -/** +/** * Just returns "Unknown Error" all the time. */ char * @@ -851,7 +847,7 @@ ACE_OS_String::wcsncmp_emulation (const wchar_t *s1, #endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSNCMP */ #if defined (ACE_LACKS_STRTOL) -long +long ACE_OS_String::strtol_emulation (const char *nptr, char **endptr, int base) { register const char *s = nptr; @@ -859,7 +855,7 @@ ACE_OS_String::strtol_emulation (const char *nptr, char **endptr, int base) register int c; register unsigned long cutoff; register int neg = 0, any, cutlim; - + /* * Skip white space and pick up leading +/- sign if any. * If base is 0, allow 0x for hex and 0 for octal, else @@ -881,7 +877,7 @@ ACE_OS_String::strtol_emulation (const char *nptr, char **endptr, int base) } if (base == 0) base = c == '0' ? 8 : 10; - + /* * Compute the cutoff value between legal numbers and illegal * numbers. That is the largest legal value, divided by the @@ -932,8 +928,8 @@ ACE_OS_String::strtol_emulation (const char *nptr, char **endptr, int base) #if defined (ACE_LACKS_STRTOUL) unsigned long -ACE_OS_String::strtoul_emulation (const char *nptr, - char **endptr, +ACE_OS_String::strtoul_emulation (const char *nptr, + char **endptr, register int base) { register const char *s = nptr; @@ -941,7 +937,7 @@ ACE_OS_String::strtoul_emulation (const char *nptr, register int c; register unsigned long cutoff; register int neg = 0, any, cutlim; - + /* * See strtol for comments as to the logic used. */ diff --git a/ace/Process.cpp b/ace/Process.cpp index f4df495b037..3bdb2d2bb68 100644 --- a/ace/Process.cpp +++ b/ace/Process.cpp @@ -48,10 +48,10 @@ ACE_Process::spawn (ACE_Process_Options &options) #if defined (ACE_WIN32) if (prepare (options) < 0) return ACE_INVALID_PID; - + BOOL fork_result = ACE_TEXT_CreateProcess (0, - options.command_line_buf (), + options.command_line_buf (), options.get_process_attributes (), options.get_thread_attributes (), options.handle_inheritence (), @@ -107,12 +107,12 @@ ACE_Process::spawn (ACE_Process_Options &options) #else /* ACE_WIN32 */ if (prepare (options) < 0) return ACE_INVALID_PID; - + // Fork the new process. this->child_id_ = ACE::fork (options.process_name (), options.avoid_zombies ()); - if (this->child_id_ == 0) + if (this->child_id_ == 0) { // If we're the child and the options specified a non-default // process group, try to set our pgid to it. This allows the @@ -124,12 +124,12 @@ ACE_Process::spawn (ACE_Process_Options &options) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p.\n"), ACE_LIB_TEXT ("ACE_Process::spawn: setpgid failed."))); - + #if !defined (ACE_LACKS_SETREUID) // Set user and group id's. - if (options.getruid () != (uid_t) -1 + if (options.getruid () != (uid_t) -1 || options.geteuid () != (uid_t) -1) - if (ACE_OS::setreuid (options.getruid (), + if (ACE_OS::setreuid (options.getruid (), options.geteuid ()) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p.\n"), @@ -137,7 +137,7 @@ ACE_Process::spawn (ACE_Process_Options &options) #endif /* ACE_LACKS_SETREUID */ #if !defined (ACE_LACKS_SETREGID) - if (options.getrgid () != (uid_t) -1 + if (options.getrgid () != (uid_t) -1 || options.getegid () != (uid_t) -1) if (ACE_OS::setregid (options.getrgid (), options.getegid ()) == -1) @@ -148,9 +148,9 @@ ACE_Process::spawn (ACE_Process_Options &options) this->child (ACE_OS::getppid ()); } - else if (this->child_id_ != -1) + else if (this->child_id_ != -1) this->parent (this->child_id_); - + // If we're not supposed to exec, return the process id. if (ACE_BIT_ENABLED (options.creation_flags (), ACE_Process_Options::NO_EXEC)) @@ -162,7 +162,7 @@ ACE_Process::spawn (ACE_Process_Options &options) // Error. return ACE_INVALID_PID; case 0: - // Child process...exec the + // Child process...exec the { if (options.get_stdin () != ACE_INVALID_HANDLE && ACE_OS::dup2 (options.get_stdin (), @@ -258,12 +258,12 @@ ACE_Process::running (void) const #if defined (ACE_WIN32) DWORD code; - BOOL result = ::GetExitCodeProcess (this->gethandle (), + BOOL result = ::GetExitCodeProcess (this->gethandle (), &code); return result && code == STILL_ACTIVE; #else - return ACE_OS::kill (this->getpid (), - 0) == 0 + return ACE_OS::kill (this->getpid (), + 0) == 0 || errno != ESRCH; #endif /* ACE_WIN32 */ } @@ -304,7 +304,7 @@ ACE_Process::wait (const ACE_Time_Value &tv, ACE_Time_Value wait_until = ACE_OS::gettimeofday () + tv; - for (;;) + for (;;) { int result = ACE_OS::waitpid (this->getpid (), status, @@ -577,7 +577,7 @@ ACE_Process_Options::set_handles (ACE_HANDLE std_in, std_in, ::GetCurrentProcess (), &this->startup_info_.hStdInput, - 0, + NULL, TRUE, DUPLICATE_SAME_ACCESS)) return -1; @@ -586,7 +586,7 @@ ACE_Process_Options::set_handles (ACE_HANDLE std_in, std_out, ::GetCurrentProcess (), &this->startup_info_.hStdOutput, - 0, + NULL, TRUE, DUPLICATE_SAME_ACCESS)) return -1; @@ -595,7 +595,7 @@ ACE_Process_Options::set_handles (ACE_HANDLE std_in, std_err, ::GetCurrentProcess (), &this->startup_info_.hStdError, - 0, + NULL, TRUE, DUPLICATE_SAME_ACCESS)) return -1; @@ -679,8 +679,8 @@ int ACE_Process_Options::command_line (const ACE_ANTI_TCHAR *format, ...) { ACE_ANTI_TCHAR *anti_clb; - ACE_NEW_RETURN (anti_clb, - ACE_ANTI_TCHAR[this->command_line_buf_len_], + ACE_NEW_RETURN (anti_clb, + ACE_ANTI_TCHAR[this->command_line_buf_len_], -1); // Store all ... args in argp. @@ -695,7 +695,7 @@ ACE_Process_Options::command_line (const ACE_ANTI_TCHAR *format, ...) // Useless macro. va_end (argp); - ACE_OS::strcpy (this->command_line_buf_, + ACE_OS::strcpy (this->command_line_buf_, ACE_TEXT_ANTI_TO_TCHAR (anti_clb)); delete [] anti_clb; @@ -734,7 +734,7 @@ ACE_Process_Options::command_line_argv (void) int x = 0; do command_line_argv_[x] = parser.next (); - while (command_line_argv_[x] != 0 + while (command_line_argv_[x] != 0 // substract one for the ending zero. && ++x < MAX_COMMAND_LINE_OPTIONS - 1); @@ -743,3 +743,4 @@ ACE_Process_Options::command_line_argv (void) return command_line_argv_; } + diff --git a/ace/Process_Manager.cpp b/ace/Process_Manager.cpp index b6dd137b69a..f05ce1e8e1b 100644 --- a/ace/Process_Manager.cpp +++ b/ace/Process_Manager.cpp @@ -373,11 +373,9 @@ ACE_Process_Manager::handle_signal (int, ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, lock_, -1)); ssize_t i = this->find_proc (proc); -#if 0 pid_t pid = i != -1 ? process_table_[i].process_->getpid () : ACE_INVALID_PID; -#endif this->notify_proc_handler (i, status); this->remove_proc (i); } @@ -814,8 +812,7 @@ ACE_Process_Manager::wait (pid_t pid, // Green Hills produces a warning that result >= WAIT_OBJECT_0 is // a pointless comparison because WAIT_OBJECT_0 is zero and DWORD is // unsigned long, so this test is skipped for Green Hills. - // Same for mingw. -# if defined (ghs) || defined (__MINGW32__) +# if defined (ghs) ACE_ASSERT (result < WAIT_OBJECT_0 + current_count_); # else ACE_ASSERT (result >= WAIT_OBJECT_0 diff --git a/ace/README b/ace/README index eba23c9d8bd..7ca0c70e20f 100644 --- a/ace/README +++ b/ace/README @@ -218,6 +218,9 @@ ACE_HAS_BROKEN_MMAP_H HP/UX does not wrap the ACE_HAS_BROKEN_NESTED_TEMPLATES MSVC has trouble with defining STL containers for nested structs and classes +ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS Platform has a bug with + non-blocking connects (e.g., + WinNT 4.0) ACE_HAS_BROKEN_POSIX_TIME Platform defines struct timespec in <sys/timers.h> ACE_HAS_BROKEN_RANDR OS/compiler's header files are diff --git a/ace/Registry.cpp b/ace/Registry.cpp index 16e4b7ef32d..aba7b6f8557 100644 --- a/ace/Registry.cpp +++ b/ace/Registry.cpp @@ -808,9 +808,9 @@ ACE_Registry::Naming_Context::list (Binding_List &list) // Default constructor ACE_Registry::Binding_Iterator::Binding_Iterator () - : object_iteration_ (*this), - context_iteration_ (*this), - iteration_complete_ (*this) + : iteration_complete_ (*this), + object_iteration_ (*this), + context_iteration_ (*this) { this->reset (); } @@ -1123,20 +1123,4 @@ ACE_Predefined_Naming_Contexts::is_local_host (const ACE_TCHAR *machine_name) return result; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Node<ACE_Registry::Binding>; -template class ACE_Unbounded_Set<ACE_Registry::Binding>; -template class ACE_Unbounded_Set_Iterator<ACE_Registry::Binding>; -template class ACE_Node<ACE_Registry::Name_Component>; -template class ACE_Unbounded_Set<ACE_Registry::Name_Component>; -template class ACE_Unbounded_Set_Iterator<ACE_Registry::Name_Component>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Node<ACE_Registry::Binding> -#pragma instantiate ACE_Unbounded_Set<ACE_Registry::Binding> -#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Registry::Binding> -#pragma instantiate ACE_Node<ACE_Registry::Name_Component> -#pragma instantiate ACE_Unbounded_Set<ACE_Registry::Name_Component> -#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Registry::Name_Component> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* ACE_WIN32 */ diff --git a/ace/SOCK_Connector.cpp b/ace/SOCK_Connector.cpp index 062df45f423..6006bef20c1 100644 --- a/ace/SOCK_Connector.cpp +++ b/ace/SOCK_Connector.cpp @@ -215,33 +215,24 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream, const ACE_Time_Value *tv) { ACE_TRACE ("ACE_SOCK_Connector::complete"); +#if defined (ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS) + // Win32 has a timing problem - if you check to see if the + // connection has completed too fast, it will fail - so wait + // <ACE_NON_BLOCKING_BUG_DELAY> microseconds to let it catch up. + ACE_Time_Value time (0, ACE_NON_BLOCKING_BUG_DELAY); + ACE_OS::sleep (time); +#endif /* ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS */ ACE_HANDLE h = ACE::handle_timed_complete (new_stream.get_handle (), tv); // We failed to get connected. if (h == ACE_INVALID_HANDLE) { -#if defined (ACE_WIN32) - // Win32 has a timing problem - if you check to see if the - // connection has completed too fast, it will fail - so wait - // <ACE_NON_BLOCKING_BUG_DELAY> microseconds to let it catch up - // then retry to see if it's a real failure. - ACE_Time_Value time (0, ACE_NON_BLOCKING_BUG_DELAY); - ACE_OS::sleep (time); - h = ACE::handle_timed_complete (new_stream.get_handle (), - tv); - if (h == ACE_INVALID_HANDLE) - { -#endif /* ACE_WIN32 */ // Save/restore errno. ACE_Errno_Guard error (errno); new_stream.close (); return -1; -#if defined (ACE_WIN32) - } -#endif /* ACE_WIN32 */ } - - if (remote_sap != 0) + else if (remote_sap != 0) { int len = remote_sap->get_size (); sockaddr *addr = ACE_reinterpret_cast (sockaddr *, diff --git a/ace/SOCK_Connector.i b/ace/SOCK_Connector.i index 82b5e3e1739..c4801c01cf0 100644 --- a/ace/SOCK_Connector.i +++ b/ace/SOCK_Connector.i @@ -20,16 +20,17 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (void) ACE_TRACE ("ACE_SOCK_Connector::ACE_SOCK_Connector"); } -ASYS_INLINE int +ASYS_INLINE int ACE_SOCK_Connector::reset_new_handle (ACE_HANDLE handle) { + ACE_UNUSED_ARG (handle); #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) - // Reset the event association + // Reset the event association return ::WSAEventSelect ((SOCKET) handle, NULL, - 0); + 0); #else /* !defined ACE_HAS_WINSOCK2 */ - ACE_UNUSED_ARG (handle); return 0; #endif /* ACE_WIN32 */ } + diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp index 28cf94feb7c..15c37000484 100644 --- a/ace/SOCK_Dgram.cpp +++ b/ace/SOCK_Dgram.cpp @@ -422,7 +422,7 @@ ACE_SOCK_Dgram::recv (void *buf, ssize_t ACE_SOCK_Dgram::send (const void *buf, size_t n, - const ACE_Addr &addr, + ACE_Addr &addr, int flags, const ACE_Time_Value *timeout) const { @@ -445,7 +445,7 @@ ACE_SOCK_Dgram::send (const void *buf, return -1; /* NOTREACHED */ default: - // Goes fine, call <send> to transmit the data. + // Goes fine, call <send> to get data return this->send (buf, n, addr, flags); } } diff --git a/ace/SOCK_Dgram.h b/ace/SOCK_Dgram.h index ed696817878..969fd7f42cd 100644 --- a/ace/SOCK_Dgram.h +++ b/ace/SOCK_Dgram.h @@ -146,7 +146,7 @@ public: */ ssize_t send (const void *buf, size_t n, - const ACE_Addr &addr, + ACE_Addr &addr, int flags, const ACE_Time_Value *timeout) const; diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp index e32c345e725..1f9cd115cfa 100644 --- a/ace/Service_Config.cpp +++ b/ace/Service_Config.cpp @@ -618,8 +618,6 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[], // override it in the parameter list or if the key supplied is // equal to the default static logger key. key = ACE_Service_Config::logger_key_; - else - ACE_SET_BITS (flags, ACE_Log_Msg::LOGGER); if (log_msg->open (program_name, flags, diff --git a/ace/Sock_Connect.cpp b/ace/Sock_Connect.cpp index 3c28a8b32af..972f838ef92 100644 --- a/ace/Sock_Connect.cpp +++ b/ace/Sock_Connect.cpp @@ -14,65 +14,15 @@ ACE_RCSID(ace, Sock_Connect, "$Id$") #if defined (ACE_WIN32) && \ - (!defined (ACE_HAS_WINSOCK2) \ - || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 == 0))) - -static int -get_reg_subkeys (const ACE_TCHAR *key, - ACE_TCHAR *buffer, - DWORD &buf_len) -{ - HKEY hk; - LONG rc = ACE_TEXT_RegOpenKeyEx (HKEY_LOCAL_MACHINE, - key, - 0, - KEY_READ, - &hk); - - if (rc != ERROR_SUCCESS) - return -1; - - ACE_TCHAR subkeyname[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1]; - DWORD subkeyname_len = ACE_MAX_FULLY_QUALIFIED_NAME_LEN; - FILETIME update_dummy; - - DWORD total = 0; - - for (int i = 0; - (rc = ACE_TEXT_RegEnumKeyEx (hk, i, - subkeyname, - &subkeyname_len, - 0, 0, 0, - &update_dummy)) != ERROR_NO_MORE_ITEMS; - ++i) - { - if (subkeyname_len < buf_len - total) - { - ACE_OS::strcpy(buffer + total, subkeyname); - total += subkeyname_len + 1; - // Reset: was changed by RegEnumKeyEx call. - subkeyname_len = ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1; - } - else - return -1; - } - - buf_len = total; - - ::RegCloseKey (hk); - return 0; -} - +(!defined (ACE_HAS_WINSOCK2) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 == 0))) // Return value in buffer for a key/name pair from the Windows // Registry up to buf_len size. -// If all_subkeys == 1, look for name under all subkeys of key. static int get_reg_value (const ACE_TCHAR *key, const ACE_TCHAR *name, ACE_TCHAR *buffer, - DWORD &buf_len, - int all_subkeys = 0) + DWORD &buf_len) { HKEY hk; DWORD buf_type; @@ -81,121 +31,27 @@ get_reg_value (const ACE_TCHAR *key, 0, KEY_READ, &hk); - + // 1. open key that defines the interfaces used for TCP/IP? if (rc != ERROR_SUCCESS) // print_error_string(ACE_LIB_TEXT ("RegOpenKeyEx"), rc); return -1; - if (all_subkeys) + rc = ACE_TEXT_RegQueryValueEx (hk, + name, + 0, + &buf_type, + (u_char *) buffer, + &buf_len); + if (rc != ERROR_SUCCESS) { - ACE_TCHAR ifname[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1]; - DWORD ifname_len = ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1; - FILETIME update_dummy; - - DWORD total = 0; - DWORD size = buf_len; - - for (int i = 0; - (rc = ACE_TEXT_RegEnumKeyEx (hk, i, ifname, &ifname_len, - 0, 0, 0, - &update_dummy)) != ERROR_NO_MORE_ITEMS; - ++i) - { - HKEY ifkey; - if (rc != ERROR_SUCCESS - || ACE_TEXT_RegOpenKeyEx (hk, ifname, 0, - KEY_READ, &ifkey) != ERROR_SUCCESS) - continue; - - if (ACE_TEXT_RegQueryValueEx (ifkey, name, 0, NULL, - (u_char*) (buffer + total), - &size) != ERROR_SUCCESS) - { - RegCloseKey(ifkey); - continue; - } - else - { - total += size; - size = buf_len - total; - } - // Needs to be reset. - ifname_len = ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1; - } - - if (total == 0) - { - ::RegCloseKey (hk); - return -2; - } - else - { - buf_len = total; - } - } - else - { - - rc = ACE_TEXT_RegQueryValueEx (hk, - name, - 0, - &buf_type, - (u_char *) buffer, - &buf_len); - if (rc != ERROR_SUCCESS) - { - // print_error_string(ACE_LIB_TEXT ("RegEnumKeyEx"), rc); - RegCloseKey (hk); - return -2; - } + // print_error_string(ACE_LIB_TEXT ("RegEnumKeyEx"), rc); + RegCloseKey (hk); + return -2; } ::RegCloseKey (hk); return 0; } - -enum ACE_WINDOWS_VERSION { - ACE_WINDOWS_IS_UNKNOWN, - ACE_WINDOWS_IS_WIN95, - ACE_WINDOWS_IS_WIN98, - ACE_WINDOWS_IS_WINME, - ACE_WINDOWS_IS_WINNT, - ACE_WINDOWS_IS_WIN2K -}; - -static ACE_WINDOWS_VERSION -get_windows_version() -{ - OSVERSIONINFO vinfo; - vinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - if (::GetVersionEx(&vinfo) == 0) - { - return ACE_WINDOWS_IS_UNKNOWN; - } - - switch (vinfo.dwPlatformId) - { - case VER_PLATFORM_WIN32_NT: - if (vinfo.dwMajorVersion <= 4) - return ACE_WINDOWS_IS_WINNT; - else - return ACE_WINDOWS_IS_WIN2K; - case VER_PLATFORM_WIN32_WINDOWS: - if (vinfo.dwMajorVersion == 4) - { - if (vinfo.dwMinorVersion == 0) - return ACE_WINDOWS_IS_WIN95; - else if (vinfo.dwMinorVersion == 10) - return ACE_WINDOWS_IS_WIN98; - else if (vinfo.dwMinorVersion == 90) - return ACE_WINDOWS_IS_WINME; - } - // If no match we fall throu. - default: - return ACE_WINDOWS_IS_UNKNOWN; - } -} - #endif //(ACE_WIN32) && !(ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 == 0) // Bind socket to an unused port. @@ -614,114 +470,25 @@ ACE_Sock_Connect::get_ip_interfaces (size_t &count, # else /* ACE_HAS_PHARLAP */ - // - // No Winsock2. - // Get interface information from the registry. - // As this information is in different locations of the registry - // on different windows versions, we need to ask at runtime. - // - - // Normally we have to look under one key for interfaces name, - // and under a second key for ip address of those interfaces. - // Exact values and the way to search depend on windows version. - - // This is the first key we have to look for. - const ACE_TCHAR *BASE_KEY1; - - // This is the name we have to look for under the first key. - // If this is == 0, we need to look for subkeys, not the values from - // a name. - const ACE_TCHAR *KEY1_NAME_ID; - - // The second key is normally constructed concatenating a prefix, - // the value found on KEY1_NAME_ID stripped from the first s_offset - // characters, and a suffix. - unsigned int s_offset; - const ACE_TCHAR *PREFFIX_KEY2; - const ACE_TCHAR *SUFFIX_KEY2; - - // If != 0, look for the value of KEY1_NAME_ID not directly under - // BASE_KEY1, but on every subkey of BASE_KEY1. - int use_subkeys; - - // When we search for IP Addresses below, we look for a key with a - // name in this array (null terminated). - // For some windows versions, there is an - // aditional key for ppp interfaces that will be stored on [1]. - const ACE_TCHAR *IPADDR_NAME_ID[3] = { - ACE_LIB_TEXT ("IPAddress"), 0, 0 - }; - - // Skip addresses that match this. + const ACE_TCHAR *SVCS_KEY1 = + ACE_LIB_TEXT ("SYSTEM\\CurrentControlSet\\Services\\"); + const ACE_TCHAR *LINKAGE_KEY1 = + ACE_LIB_TEXT ("SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Linkage"); + const ACE_TCHAR *TCP_PARAM_SUBKEY = ACE_LIB_TEXT ("\\Parameters\\Tcpip"); + const ACE_TCHAR *BIND_NAME_ID = ACE_LIB_TEXT ("Bind"); + const ACE_TCHAR *IPADDR_NAME_ID = ACE_LIB_TEXT ("IPAddress"); const ACE_TCHAR *INVALID_TCPIP_DEVICE_ADDR = ACE_LIB_TEXT ("0.0.0.0"); - ACE_WINDOWS_VERSION winver = get_windows_version(); - - switch (winver) - { - case ACE_WINDOWS_IS_WINNT: - PREFFIX_KEY2 = ACE_LIB_TEXT ("SYSTEM\\CurrentControlSet\\Services\\"); - BASE_KEY1 = - ACE_LIB_TEXT ("SYSTEM\\CurrentControlSet\\Services") - ACE_LIB_TEXT ("\\Tcpip\\Linkage"); - SUFFIX_KEY2 = ACE_LIB_TEXT ("\\Parameters\\Tcpip"); - KEY1_NAME_ID = ACE_LIB_TEXT ("Bind"); - s_offset = 8; - use_subkeys = 0; - break; - - case ACE_WINDOWS_IS_WIN2K: - BASE_KEY1 = - ACE_LIB_TEXT ("SYSTEM\\CurrentControlSet\\Services") - ACE_LIB_TEXT ("\\Tcpip\\Parameters\\Interfaces\\"); - PREFFIX_KEY2 = BASE_KEY1; - SUFFIX_KEY2 = ACE_LIB_TEXT (""); - KEY1_NAME_ID = 0; - s_offset = 0; - use_subkeys = 1; - // PPP. - IPADDR_NAME_ID[1] = ACE_LIB_TEXT ("DhcpIPAddress"); - break; - - // If ACE_HAS_WINNT4 we can safely assume the ones below will - // not be needed. -# if !defined(ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0) - case ACE_WINDOWS_IS_WIN95: - case ACE_WINDOWS_IS_WIN98: - case ACE_WINDOWS_IS_WINME: - PREFFIX_KEY2 = - ACE_LIB_TEXT ("SYSTEM\\CurrentControlSet\\Services\\Class\\"); - BASE_KEY1 = ACE_LIB_TEXT ("Enum\\Network\\MSTCP"); - SUFFIX_KEY2 = ACE_LIB_TEXT (""); - KEY1_NAME_ID = ACE_LIB_TEXT ("Driver"); - use_subkeys = 1; - s_offset = 0; - break; -# endif /* !ACE_HAS_WINNT4 */ - - default: - return -1; - } - ACE_TCHAR raw_buffer[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1]; DWORD raw_buflen = ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1; + ACE_TCHAR buffer[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1]; + DWORD buf_len = ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1; - if (KEY1_NAME_ID == 0) - { - if (::get_reg_subkeys (BASE_KEY1, - raw_buffer, - raw_buflen)) - return -1; - } - else - { - if (::get_reg_value (BASE_KEY1, - KEY1_NAME_ID, - raw_buffer, - raw_buflen, - use_subkeys)) - return -1; - } + if (::get_reg_value (LINKAGE_KEY1, + BIND_NAME_ID, + raw_buffer, + raw_buflen)) + return -1; // return buffer contains 0 delimited strings ACE_Tokenizer dev_names (raw_buffer); @@ -739,37 +506,28 @@ ACE_Sock_Connect::get_ip_interfaces (size_t &count, ACE_NEW_RETURN (addrs, ACE_INET_Addr[n_interfaces], -2); - - ACE_TCHAR buffer[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1]; - DWORD buf_len = ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1; - count = 0; for (int i = 0; i < n_interfaces; i++) { - for (const ACE_TCHAR **ipaddr_name_id = IPADDR_NAME_ID; - *ipaddr_name_id != 0; - ++ipaddr_name_id) - { - // a. construct name to access IP Address for this interface - ACE_TString ifdevkey (PREFFIX_KEY2); - ACE_TString the_dev = dev_names.next (); - - if (the_dev.length() < s_offset) - { - return -3; // Something's wrong - } - - // rest of string from offset. - the_dev = the_dev.substring (s_offset); + // a. construct name to access IPAddress for this interface + ACE_TString ifdevkey (SVCS_KEY1); + ACE_TString the_dev = dev_names.next (); + // chop off the "\Device" and keep last name. + if (the_dev.length() < 8) + return -3; // Something's wrong + else + { + // rest of string from offset 8 + the_dev = the_dev.substring (8); ifdevkey += the_dev; - ifdevkey += SUFFIX_KEY2; + ifdevkey += TCP_PARAM_SUBKEY; // b. extract value // Gets overwritten on each call buf_len = sizeof (buffer); if (get_reg_value (ifdevkey.fast_rep (), - *ipaddr_name_id, + IPADDR_NAME_ID, buffer, buf_len)) continue; // Skip unknown devices. @@ -783,7 +541,6 @@ ACE_Sock_Connect::get_ip_interfaces (size_t &count, ACE_INET_Addr ((u_short) 0, buffer); } } - return 0; # endif /* ACE_HAS_PHARLAP */ # endif /* Winsock 2 && MSVC 5 or later */ diff --git a/ace/TP_Reactor.cpp b/ace/TP_Reactor.cpp index 3c275eb8d78..f0eb9fe9c2f 100644 --- a/ace/TP_Reactor.cpp +++ b/ace/TP_Reactor.cpp @@ -442,14 +442,7 @@ ACE_EH_Dispatch_Info::reset (void) this->handle_ = ACE_INVALID_HANDLE; this->event_handler_ = 0; this->mask_ = ACE_Event_Handler::NULL_MASK; -#if defined (ACE_HAS_BROKEN_PTMF) - ACE_OS::memset ((void *) &this->callback_, - 0, - sizeof this->callback_); - -#else this->callback_ = 0; -#endif /* ACE_HAS_BROKEN_PTMF */ } int diff --git a/ace/TTY_IO.cpp b/ace/TTY_IO.cpp index 4aa76bbdc39..33809ff5ef2 100644 --- a/ace/TTY_IO.cpp +++ b/ace/TTY_IO.cpp @@ -361,12 +361,8 @@ ACE_TTY_IO::control (Control_Mode cmd, timeouts.ReadTotalTimeoutMultiplier = MAXDWORD; // ensure specified timeout is below MAXDWORD - - // We don't test arg->readtimeoutmsec against MAXDWORD - // directly to avoid a warning in the case DWORD is unsigned. - DWORD dw = arg->readtimeoutmsec; - if (dw < MAXDWORD) - timeouts.ReadTotalTimeoutConstant = dw; + if(arg->readtimeoutmsec < MAXDWORD) + timeouts.ReadTotalTimeoutConstant = arg->readtimeoutmsec ; else timeouts.ReadTotalTimeoutConstant = MAXDWORD; } diff --git a/ace/Timer_Queue.i b/ace/Timer_Queue.i deleted file mode 100644 index 41e4324e61e..00000000000 --- a/ace/Timer_Queue.i +++ /dev/null @@ -1,22 +0,0 @@ -/* -*- C++ -*- */ - -template <class TYPE, class FUNCTOR> ACE_INLINE void -ACE_Timer_Queue_T<TYPE, FUNCTOR>::timer_skew (const ACE_Time_Value &skew) -{ - timer_skew_ = skew; -} - -template <class TYPE, class FUNCTOR> ACE_INLINE const ACE_Time_Value & -ACE_Timer_Queue_T<TYPE, FUNCTOR>::timer_skew (void) const -{ - return timer_skew_; -} - -template <class TYPE, class FUNCTOR> ACE_INLINE int -ACE_Timer_Queue_T<TYPE, FUNCTOR>::expire (void) -{ - if (!this->is_empty ()) - return this->expire (this->gettimeofday () + timer_skew_); - else - return 0; -} diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp index a661b7733fa..54f96b9d70c 100644 --- a/ace/WFMO_Reactor.cpp +++ b/ace/WFMO_Reactor.cpp @@ -1022,27 +1022,25 @@ ACE_WFMO_Reactor::ACE_WFMO_Reactor (ACE_Sig_Handler *sh, delete_signal_handler_ (0), timer_queue_ (0), delete_timer_queue_ (0), + handler_rep_ (*this), delete_handler_rep_ (0), delete_notify_handler_ (0), lock_adapter_ (lock_), - handler_rep_ (*this), // this event is initially signaled ok_to_wait_ (1), // this event is initially unsignaled wakeup_all_threads_ (0), // this event is initially unsignaled waiting_to_change_state_ (0), + new_owner_ (0), active_threads_ (0), owner_ (ACE_Thread::self ()), - new_owner_ (0), change_state_thread_ (0), open_for_business_ (0), deactivated_ (0) { if (this->open (ACE_WFMO_Reactor::DEFAULT_SIZE, 0, sh, tq) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("WFMO_Reactor"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("WFMO_Reactor"))); } ACE_WFMO_Reactor::ACE_WFMO_Reactor (size_t size, @@ -1053,19 +1051,19 @@ ACE_WFMO_Reactor::ACE_WFMO_Reactor (size_t size, delete_signal_handler_ (0), timer_queue_ (0), delete_timer_queue_ (0), + handler_rep_ (*this), delete_handler_rep_ (0), delete_notify_handler_ (0), lock_adapter_ (lock_), - handler_rep_ (*this), // this event is initially signaled ok_to_wait_ (1), // this event is initially unsignaled wakeup_all_threads_ (0), // this event is initially unsignaled waiting_to_change_state_ (0), + new_owner_ (0), active_threads_ (0), owner_ (ACE_Thread::self ()), - new_owner_ (0), change_state_thread_ (0), open_for_business_ (0), deactivated_ (0) @@ -1073,9 +1071,7 @@ ACE_WFMO_Reactor::ACE_WFMO_Reactor (size_t size, ACE_UNUSED_ARG (unused); if (this->open (size, 0, sh, tq) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("WFMO_Reactor"))); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("WFMO_Reactor"))); } int @@ -1093,7 +1089,6 @@ ACE_WFMO_Reactor::open (size_t size, ACE_Reactor_Notify *notify) { ACE_UNUSED_ARG (unused); - ACE_UNUSED_ARG (disable_notify_pipe); // This GUARD is necessary since we are updating shared state. ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); @@ -1796,11 +1791,8 @@ ACE_WFMO_Reactor::dispatch_handles (size_t wait_status) number_of_handlers_dispatched++) { bool ok = ( -#if ! (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0530)) \ - && !defined (ghs) \ - && !defined (__MINGW32__) - // wait_status is unsigned in Borland, Green Hills - // and mingw32; +#if ! (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0530)) && !defined (ghs) + // wait_status is unsigned in Borland and Green Hills; // This >= is always true, with a warning. wait_status >= WAIT_OBJECT_0 && #endif @@ -2162,8 +2154,6 @@ int ACE_WFMO_Reactor_Notify::dispatch_notifications (int &number_of_active_handles, ACE_Handle_Set &rd_mask) { - ACE_UNUSED_ARG (number_of_active_handles); - ACE_UNUSED_ARG (rd_mask); return -1; } @@ -2174,8 +2164,8 @@ ACE_WFMO_Reactor_Notify::close (void) } ACE_WFMO_Reactor_Notify::ACE_WFMO_Reactor_Notify (void) - : timer_queue_ (0), - max_notify_iterations_ (-1) + : max_notify_iterations_ (-1), + timer_queue_ (0) { } @@ -2184,7 +2174,6 @@ ACE_WFMO_Reactor_Notify::open (ACE_Reactor_Impl *wfmo_reactor, ACE_Timer_Queue *timer_queue, int ignore_notify) { - ACE_UNUSED_ARG (ignore_notify); timer_queue_ = timer_queue; return wfmo_reactor->register_handler (this); } diff --git a/ace/WFMO_Reactor.i b/ace/WFMO_Reactor.i index 22d35cbe1be..5e851527c3e 100644 --- a/ace/WFMO_Reactor.i +++ b/ace/WFMO_Reactor.i @@ -1065,9 +1065,6 @@ ACE_WFMO_Reactor::ready_ops (ACE_Event_Handler *event_handler, int ops) { // Don't have an implementation for this yet... - ACE_UNUSED_ARG (event_handler); - ACE_UNUSED_ARG (mask); - ACE_UNUSED_ARG (ops); ACE_NOTSUP_RETURN (-1); } @@ -1077,8 +1074,6 @@ ACE_WFMO_Reactor::ready_ops (ACE_HANDLE handle, int ops) { // Don't have an implementation for this yet... - ACE_UNUSED_ARG (handle); - ACE_UNUSED_ARG (ops); ACE_NOTSUP_RETURN (-1); } diff --git a/ace/WIN32_Asynch_IO.cpp b/ace/WIN32_Asynch_IO.cpp index 891e378aa6e..b43205109a2 100644 --- a/ace/WIN32_Asynch_IO.cpp +++ b/ace/WIN32_Asynch_IO.cpp @@ -1363,7 +1363,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block, // Cleanup dynamically allocated Asynch_Result. delete result; - + if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, @@ -1373,12 +1373,6 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block, return -1; } #else /* ACE_HAS_WINNT4 .......|| ACE_HAS_AIO_CALLS */ - ACE_UNUSED_ARG (message_block); - ACE_UNUSED_ARG (bytes_to_read); - ACE_UNUSED_ARG (accept_handle); - ACE_UNUSED_ARG (act); - ACE_UNUSED_ARG (priority); - ACE_UNUSED_ARG (signal_number); ACE_NOTSUP_RETURN (-1); #endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) || (defined (ACE_HAS_AIO_CALLS) */ } @@ -1652,7 +1646,7 @@ ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, // Cleanup dynamically allocated Asynch_Result delete result; - + if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, @@ -1662,16 +1656,6 @@ ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, return -1; } #else /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) */ - ACE_UNUSED_ARG (file); - ACE_UNUSED_ARG (header_and_trailer); - ACE_UNUSED_ARG (bytes_to_write); - ACE_UNUSED_ARG (offset); - ACE_UNUSED_ARG (offset_high); - ACE_UNUSED_ARG (bytes_per_send); - ACE_UNUSED_ARG (flags); - ACE_UNUSED_ARG (act); - ACE_UNUSED_ARG (priority); - ACE_UNUSED_ARG (signal_number); ACE_NOTSUP_RETURN (-1); #endif /* ACE_HAS_AIO_CALLS */ } diff --git a/ace/ace.icc b/ace/ace.icc index 09c3bb81239..3bfe9549707 100755 --- a/ace/ace.icc +++ b/ace/ace.icc @@ -46,7 +46,6 @@ group UTILS_FILES = "Capabilities.cpp", "Containers.cpp", "Configuration.cpp", - "Configuration_Import_Export.cpp", "Dirent.cpp", "Dynamic.cpp", "Dynamic_Service_Base.cpp", @@ -84,7 +83,6 @@ group UTILS_INCLUDES = "Capabilities.h", "Containers.h", "Configuration.h", - "Configuration_Import_Export.h", "Dirent.h", "Dynamic.h", "Dynamic_Service_Base.h", @@ -529,9 +527,9 @@ option link(linkWithMultiThreadLib,yes), incl(searchpath, "..") { - target type ( shr ) "shr.o" + target type ( shr ) "libACE.a" { - run after sources("shr.o") targets ("libACE.a") "ar -r -u libACE.a shr.o", "rm -rf shr.o" +// run after sources("shr.o") targets ("libACE.a") "ar -r -u libACE.a shr.o", "rm -rf shr.o" run cleanup "rm -rf libACE.a shr.o" option macros(global) diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp index 2cf64ccfd9f..bbf46fea953 100644 --- a/ace/ace_dll.dsp +++ b/ace/ace_dll.dsp @@ -60,7 +60,7 @@ LINK32=link.exe # ADD BASE LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\ace-r.pdb" /machine:I386 /out:"..\bin\ace.dll"
# SUBTRACT BASE LINK32 /pdb:none
# ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\acemfc.pdb" /machine:I386 /out:"..\bin\acemfc.dll"
-# SUBTRACT LINK32 /pdb:none
+# SUBTRACT LINK32 /pdb:none /pdbtype:<none>
!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Debug"
@@ -91,7 +91,7 @@ LINK32=link.exe # ADD BASE LINK32 advapi32.lib user32.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\ace.pdb" /debug /machine:I386 /out:"..\bin\aced.dll" /pdbtype:sept
# SUBTRACT BASE LINK32 /pdb:none
# ADD LINK32 advapi32.lib user32.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\acemfcd.pdb" /debug /machine:I386 /out:"..\bin\acemfcd.dll"
-# SUBTRACT LINK32 /pdb:none
+# SUBTRACT LINK32 /pdb:none /pdbtype:<none>
!ELSEIF "$(CFG)" == "ACE DLL - Win32 Release"
@@ -119,7 +119,7 @@ BSC32=bscmake.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
# ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\ace.pdb" /machine:I386 /out:"..\bin\ace.dll"
-# SUBTRACT LINK32 /pdb:none
+# SUBTRACT LINK32 /pdb:none /pdbtype:<none>
!ELSEIF "$(CFG)" == "ACE DLL - Win32 Debug"
@@ -147,7 +147,7 @@ BSC32=bscmake.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 advapi32.lib user32.lib /nologo /version:5.1 /subsystem:windows /dll /pdb:".\aced.pdb" /debug /machine:I386 /out:"..\bin\aced.dll"
-# SUBTRACT LINK32 /pdb:none
+# SUBTRACT LINK32 /pdb:none /pdbtype:<none>
!ENDIF
@@ -250,10 +250,6 @@ SOURCE=.\Configuration.cpp # End Source File
# Begin Source File
-SOURCE=.\Configuration_Import_Export.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\Containers.cpp
# End Source File
# Begin Source File
@@ -1170,10 +1166,6 @@ SOURCE=.\Configuration.h # End Source File
# Begin Source File
-SOURCE=.\Configuration_Import_Export.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Connector.h
# End Source File
# Begin Source File
diff --git a/ace/ace_lib.dsp b/ace/ace_lib.dsp index a411fcbfaae..0fa973c11a0 100644 --- a/ace/ace_lib.dsp +++ b/ace/ace_lib.dsp @@ -229,10 +229,6 @@ SOURCE=.\Configuration.cpp # End Source File
# Begin Source File
-SOURCE=.\Configuration_Import_Export.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\Containers.cpp
# End Source File
# Begin Source File
@@ -1157,10 +1153,6 @@ SOURCE=.\Configuration.h # End Source File
# Begin Source File
-SOURCE=.\Configuration_Import_Export.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Connector.h
# End Source File
# Begin Source File
diff --git a/ace/config-cygwin32-common.h b/ace/config-cygwin32-common.h index 64b02d233fd..f288b544339 100644 --- a/ace/config-cygwin32-common.h +++ b/ace/config-cygwin32-common.h @@ -4,7 +4,7 @@ // This configuration file is designed to be included by another, // specific configuration file. It provides config information common // to all CygWin platforms. It automatically determines the CPU -// architecture, compiler (g++ or egcs), and libc (libc5/glibc/newlib), +// architecture, compiler (g++ or egcs), and libc (libc5 or glibc), // and configures based on those. #ifndef ACE_CYGWIN32_COMMON_H @@ -13,22 +13,12 @@ #define CYGWIN32 -// We trust this file will get included before <sys/types.h> -#if !defined(FD_SETSIZE) -# define FD_SETSIZE 1024 -#endif - #define ACE_LACKS_UNIX_DOMAIN_SOCKETS #define ACE_LACKS_SYSV_MSG_H #define ACE_HAS_SIG_MACROS #define ACE_LACKS_SYSTIME_H #define ACE_LACKS_TELLDIR #define ACE_LACKS_SYSV_SHMEM - -#define ACE_LACKS_FORK -#define ACE_LACKS_MMAP -#define ACE_LACKS_MPROTECT - #define ACE_LACKS_SEMBUF_T #define ACE_LACKS_NAMED_POSIX_SEM #define ACE_LACKS_SENDMSG @@ -39,7 +29,6 @@ #define ACE_LACKS_SEEKDIR #define ACE_LACKS_TEMPNAM #define ACE_LACKS_MKTEMP -// #define ACE_HAS_BROKEN_SAP_ANY #if ! defined (__ACE_INLINE__) # define __ACE_INLINE__ @@ -51,7 +40,46 @@ // First the machine specific part -// #define ACE_HAS_CYGWIN32_SOCKET_H +#define ACE_HAS_CYGWIN32_SOCKET_H +#define ACE_LACKS_TCP_H + +// Then glibc/libc5 specific parts + +#if defined(__GLIBC__) +# define ACE_HAS_BROKEN_SETRLIMIT +# define ACE_HAS_RUSAGE_WHO_ENUM enum __rusage_who +# define ACE_HAS_RLIMIT_RESOURCE_ENUM enum __rlimit_resource +# define ACE_HAS_SOCKLEN_T + + // To avoid the strangeness with Linux's ::select (), which modifies + // its timeout argument, use ::poll () instead. +# define ACE_HAS_POLL + + // NOTE: the following defines are necessary with glibc 2.0 (0.961212-5) + // on Alpha. I assume that they're necessary on Intel as well, + // but that may depend on the version of glibc that is used. +# define ACE_HAS_DLFCN_H_BROKEN_EXTERN_C +# define ACE_HAS_VOIDPTR_SOCKOPT +#define ACE_LACKS_SETPGID +#define ACE_LACKS_SETREGID +#define ACE_LACKS_SETREUID +# define ACE_LACKS_GETPGID + // The strtok_r declaration is protected in string.h. + extern "C" char *strtok_r __P ((char *__s, __const char *__delim, + char **__save_ptr)); + // NOTE: end of glibc 2.0 (0.961212-5)-specific configuration. + +# if __GLIBC__ > 1 && __GLIBC_MINOR__ >= 1 +# undef ACE_HAS_BYTESEX_H +# define ACE_HAS_SIGINFO_T +# define ACE_LACKS_SIGINFO_H +# define ACE_HAS_UCONTEXT_T +# endif /* __GLIBC__ 2.1+ */ + // Changes above were suggested by Robert Hanzlik <robi@codalan.cz> + // to get ACE to compile on Linux using glibc 2.1 and libg++/gcc 2.8 + +#endif /* __GLIBC__ */ + // Then the compiler specific parts @@ -61,24 +89,19 @@ #if defined (__GNUG__) # include "ace/config-g++-common.h" -#else -# error unsupported compiler in ace/config-cygwin32-common.h -#endif /* __GNUG__ */ +#elif defined (__KCC) +# include "ace/config-kcc-common.h" +#else /* ! __GNUG__ && ! __KCC */ +# error unsupported compiler in ace/config-linux-common.h +#endif /* ! __GNUG__ && ! __KCC */ // Completely common part :-) // Platform/compiler has the sigwait(2) prototype #define ACE_HAS_SIGWAIT -#define ACE_HAS_POSIX_TIME -#define ACE_LACKS_TIMESPEC_T -#define ACE_HAS_MSG -#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) -#define ACE_LACKS_SETREUID -#define ACE_LACKS_SETREGID -#define ACE_LACKS_GETHOSTENT -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_LACKS_GETPGID_PROTOTYPE + +# define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) // Compiler/platform supports alloca(). #define ACE_HAS_ALLOCA @@ -92,12 +115,22 @@ // Optimize ACE_Handle_Set for select(). #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT +// ONLY define this if you have config'd multicast into a 2.x kernel. +// If you do anything else, we've never tested it! #if !defined(ACE_HAS_IP_MULTICAST) # define ACE_HAS_IP_MULTICAST #endif /* #if ! defined(ACE_HAS_IP_MULTICAST) */ #define ACE_HAS_BIG_FD_SET +// Linux defines struct msghdr in /usr/include/socket.h +#define ACE_HAS_MSG + +// Linux "improved" the interface to select() so that it modifies +// the struct timeval to reflect the amount of time not slept +// (see NOTES in Linux's select(2) man page). +#define ACE_HAS_NONCONST_SELECT_TIMEVAL + #define ACE_HAS_TERM_IOCTLS #define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 65535 @@ -139,4 +172,4 @@ #define ACE_LACKS_MKFIFO #include "ace/post.h" -#endif /* ACE_CYGWIN32_COMMON_H */ +#endif /* ACE_LINUX_COMMON_H */ diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h index 3b5c6756f83..91876848014 100644 --- a/ace/config-g++-common.h +++ b/ace/config-g++-common.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// -*- C++ -*- // // $Id$ @@ -37,10 +37,10 @@ # endif /* __GNUC__ >= 2.91 */ #if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 97 ) - // gcc 2.97 and higher use libstdc++-v3 and require - // the use of the std namespace for using iostreams + // gcc 2.97 and higher use libstdc++-v3 and require + // the use of the std namespace for using iostreams # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# undef ACE_USES_OLD_IOSTREAMS +# undef ACE_USES_OLD_IOSTREAMS #endif /* __GNUC__ >= 2.97 */ # if __GNUC__ == 2 && __GNUC_MINOR__ != 9 && __GNUC_MINOR__ != 91 @@ -78,7 +78,7 @@ # define ACE_SIZEOF_LONG_DOUBLE 12 #endif /* i386 */ -#if !defined (__MINGW32__) && (defined (i386) || defined (__i386__)) +#if defined (i386) || defined (__i386__) // If running an Intel, assume that it's a Pentium so that // ACE_OS::gethrtime () can use the RDTSC instruction. If running a // 486 or lower, be sure to comment this out. (If not running an diff --git a/ace/config-hpux-10.x-hpc++.h b/ace/config-hpux-10.x-hpc++.h index 742609ebe99..de869fe3ad9 100644 --- a/ace/config-hpux-10.x-hpc++.h +++ b/ace/config-hpux-10.x-hpc++.h @@ -81,7 +81,7 @@ // then we're using the -AA option, so we have standard C++ library, // including the standard iostreams. Else, we have the old iostreams. # if defined (ACE_HAS_STANDARD_CPP_LIBRARY) -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 +# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB # else # define ACE_USES_OLD_IOSTREAMS # endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ diff --git a/ace/config-qnx-rtp.h b/ace/config-qnx-rtp.h index e29d051c0a2..2fc30d5ef19 100644 --- a/ace/config-qnx-rtp.h +++ b/ace/config-qnx-rtp.h @@ -66,8 +66,6 @@ #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES #define ACE_HAS_DIRENT #define ACE_HAS_GETPAGESIZE -// Enable gperf, this is a hosted configuration. -#define ACE_HAS_GPERF #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT //#define ACE_HAS_NONSTATIC_OBJECT_MANAGER #define ACE_HAS_INLINED_OSCALLS diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h index 298243cde78..6f29a75994b 100644 --- a/ace/config-win32-common.h +++ b/ace/config-win32-common.h @@ -16,7 +16,7 @@ #define ACE_WIN32 -// Define this if you're running NT >= 4.0 (Win2K == NT 5). +// Define this if you're running NT 4.x // Setting applies to : building ACE // Runtime restrictions: System must be Windows NT => 4.0 #if !defined (ACE_HAS_WINNT4) @@ -27,11 +27,6 @@ # if !defined (_WIN32_WINNT) # define _WIN32_WINNT 0x0400 # endif -#else -// On Win9X, a shared address SHOULD be between the 2nd and 3rd Gb. -// Note this will not work for NT: The addresses above 2Gb are -// reserved for the system, so this one will fail. -# define ACE_DEFAULT_BASE_ADDR ((char*) ((2048UL+512UL)*1024UL*1024UL)) #endif // Define ACE_HAS_MFC to 1, if you want ACE to use CWinThread. This should @@ -161,7 +156,7 @@ // By default WIN32 has FD_SETSIZE of 64, which places the limit // between 61 and 64 on the number of clients a server using the // Select Reactor can support at the same time (i.e., 64 - standard in, -// out, error). Here we raise the limit to 1024. Adjust the definition +// out, error). He we raise the limit to 1024. Adjust the definition // below if you need to raise or lower it. #if defined (FD_SETSIZE) @@ -191,9 +186,7 @@ #if !defined (ACE_HAS_WINCE) // Platform supports pread() and pwrite() # define ACE_HAS_P_READ_WRITE -# if !defined (__MINGW32__) -# define ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS -# endif /* __MINGW32__ */ +# define ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS #endif /* ! ACE_HAS_WINCE */ #define ACE_DEFAULT_THREAD_PRIORITY 0 @@ -231,15 +224,10 @@ #define ACE_SIZEOF_LONG_LONG 8 // Green Hills Native x86 does not support __int64 keyword -// Neither does mingw32. -#if !defined (ghs) && !defined (__MINGW32__) +#if !defined (ghs) typedef unsigned __int64 ACE_UINT64; #endif /* (ghs) */ -#if defined (__MINGW32__) -typedef unsigned long long ACE_UINT64; -#endif - // Optimize ACE_Handle_Set for select(). #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT @@ -298,6 +286,9 @@ typedef unsigned long long ACE_UINT64; #define ACE_LACKS_KEY_T +// Platform support for non-blocking connects is broken +#define ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS + // No system support for replacing any previous mappings. #define ACE_LACKS_AUTO_MMAP_REPLACEMENT @@ -321,7 +312,7 @@ typedef unsigned long long ACE_UINT64; // If you want to use highres timers, ensure that // Build.Settings.C++.CodeGeneration.Processor is // set to Pentium ! -#if !defined(ACE_HAS_PENTIUM) && (_M_IX86 > 400) +#if (_M_IX86 > 400) # define ACE_HAS_PENTIUM #endif @@ -470,11 +461,6 @@ typedef unsigned long long ACE_UINT64; # define ACE_WSOCK_VERSION 1, 1 #endif /* ACE_HAS_WINSOCK2 */ -// mingw32 doesn't define this (yet...) -#if defined(__MINGW32__) && !defined(MWMO_ALERTABLE) -# define MWMO_ALERTABLE 0x0002 -#endif - // Platform supports IP multicast on Winsock 2 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) # define ACE_HAS_IP_MULTICAST diff --git a/ace/config-win32-mingw.h b/ace/config-win32-mingw.h deleted file mode 100644 index 2689fb97645..00000000000 --- a/ace/config-win32-mingw.h +++ /dev/null @@ -1,64 +0,0 @@ -// -*- C++ -*- -// $Id$ - -// -// The following configuration file is designed to work for win32 -// platforms using gcc/g++ with mingw32 (http://www.mingw.org). -// - -#ifndef ACE_CONFIG_WIN32_MINGW_H -#define ACE_CONFIG_WIN32_MINGW_H -#include "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header -#endif /* ACE_CONFIG_WIN32_H */ - -#define ACE_CC_NAME ACE_LIB_TEXT ("g++") -#define ACE_CC_PREPROCESSOR "cpp" -#define ACE_CC_PREPROCESOR_ARGS "" - -// Why all this is not in config-g++-common.h? -#define ACE_CC_MAJOR_VERSION __GNUC__ -#define ACE_CC_MINOR_VERSION __GNUC_MINOR__ -#define ACE_CC_BETA_VERSION (0) - -#if !defined(__MINGW32__) -# error You do not seem to be using mingw32 -#endif - -#define ACE_AS_STATIC_LIBS - -#include "ace/config-g++-common.h" - -#include <_mingw.h> - -#define ACE_LACKS_MODE_MASKS -#define ACE_HAS_USER_MODE_MASKS - -#if (__MINGW32_MAJOR_VERSION == 0) && (__MINGW32_MINOR_VERSION < 5) -#error You need a newer version (>= 0.5) of mingw32/w32api -#endif - -#define ACE_LACKS_STRRECVFD -#define ACE_HAS_STRERROR - -// We trust the user: He must have used -mpentiumpro or -mpentium -// if that is what he wants. -#if defined(pentiumpro) || defined(pentium) -# define ACE_HAS_PENTIUM -#endif - -#if !defined (ACE_HAS_WINNT4) -# if (defined (WINNT) && WINNT == 1) \ - || (defined (__WINNT__) && __WINNT__ == 1) -# define ACE_HAS_WINNT4 1 -# else -# define ACE_HAS_WINNT4 0 -# endif -#endif - -#define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) (STATUS)) - -#include "ace/post.h" -#endif /* ACE_CONFIG_WIN32_MINGW_H */ diff --git a/ace/config-win32.h b/ace/config-win32.h index 410d788d9bd..61b4a79344b 100644 --- a/ace/config-win32.h +++ b/ace/config-win32.h @@ -5,10 +5,10 @@ * * $Id$ * - * @brief Microsoft Windows configuration file. + * @brief Microsoft Windows configuration file. * * This file is the ACE configuration file for all of Microsoft Windows - * platforms that ACE runs on. Based on preprocessor definitions, it + * platforms that ACE runs on. Based on preprocessor definitions, it * includes other more specific configuration files. * * @author Darrell Brunsch <brunsch@cs.wustl.edu> @@ -44,8 +44,6 @@ # include "ace/config-win32-visualage.h" #elif defined (ghs) # include "ace/config-win32-ghs.h" -#elif defined (__MINGW32__) -# include "ace/config-win32-mingw.h" #else # error Compiler is not supported #endif diff --git a/ace/streams.h b/ace/streams.h index 5ac89a44bcf..f724ad03e7e 100644 --- a/ace/streams.h +++ b/ace/streams.h @@ -123,7 +123,7 @@ # include /**/ <iostream.h> # include /**/ <iomanip.h> -# if defined (ACE_WIN32) && !defined(__MINGW32__) +# if defined (ACE_WIN32) # if defined(_MSC_VER) // VSB # include /**/ <ios.h> # include /**/ <streamb.h> @@ -133,7 +133,7 @@ # include /**/ <strstrea.h> // VSB # else # include /**/ <strstream.h> -# endif /* ACE_WIN32 && !__MINGW32__ */ +# endif /* ACE_WIN32 */ # endif /* ! ACE_HAS_STANDARD_CPP_LIBRARY */ diff --git a/apps/Gateway/Gateway/Concurrency_Strategies.h b/apps/Gateway/Gateway/Concurrency_Strategies.h deleted file mode 100644 index 28e59a4b2e6..00000000000 --- a/apps/Gateway/Gateway/Concurrency_Strategies.h +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// apps -// -// = FILENAME -// Concurrency_strategies.h -// -// = AUTHOR -// Doug Schmidt -// -// ============================================================================ - -#if !defined (_CONCURRENCY_STRATEGIES) -#define _CONCURRENCY_STRATEGIES - -#include "ace/Synch.h" - -// The following typedefs are used in order to parameterize the -// synchronization policies without changing the source code! - -// If we don't have threads then use the single-threaded synchronization. -#if !defined (ACE_HAS_THREADS) -#define SYNCH_STRATEGY ACE_NULL_SYNCH -typedef ACE_Null_Mutex MAP_MUTEX; -#else /* ACE_HAS_THREADS */ - -// Note that we only need to make the ACE_Task thread-safe if we are -// using the multi-threaded Thr_Consumer_Proxy... -#if defined (USE_OUTPUT_MT) -#define SYNCH_STRATEGY ACE_MT_SYNCH -#else -#define SYNCH_STRATEGY ACE_NULL_SYNCH -#endif /* USE_OUTPUT_MT || USE_INPUT_MT */ - -// Note that we only need to make the ACE_Map_Manager thread-safe if -// we are using the multi-threaded Thr_Supplier_Proxy. In this -// case, we use an RW_Mutex since we'll lookup Consumers far more -// often than we'll update them. -#if defined (USE_INPUT_MT) -typedef ACE_RW_Mutex MAP_MUTEX; -#else -typedef ACE_Null_Mutex MAP_MUTEX; -#endif /* USE_INPUT_MT */ -#endif /* ACE_HAS_THREADS */ - -// = Forward decls -class Thr_Consumer_Proxy; -class Thr_Supplier_Proxy; -class Consumer_Proxy; -class Supplier_Proxy; - -#if defined (ACE_HAS_THREADS) && (defined (USE_OUTPUT_MT) || defined (USE_INPUT_MT)) -#if defined (USE_OUTPUT_MT) -typedef Thr_Consumer_Proxy CONSUMER_PROXY; -#else -typedef Consumer_Proxy CONSUMER_PROXY; -#endif /* USE_OUTPUT_MT */ - -#if defined (USE_INPUT_MT) -typedef Thr_Supplier_Proxy SUPPLIER_PROXY; -#else -typedef Supplier_Proxy SUPPLIER_PROXY; -#endif /* USE_INPUT_MT */ -#else -// Instantiate a non-multi-threaded Gateway. -typedef Supplier_Proxy SUPPLIER_PROXY; -typedef Consumer_Proxy CONSUMER_PROXY; -#endif /* ACE_HAS_THREADS */ - -#endif /* _CONCURRENCY_STRATEGIES */ diff --git a/apps/Gateway/Gateway/Peer_Message.h b/apps/Gateway/Gateway/Peer_Message.h deleted file mode 100644 index d9e65650095..00000000000 --- a/apps/Gateway/Gateway/Peer_Message.h +++ /dev/null @@ -1,89 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - - -// ============================================================================ -// -// = LIBRARY -// apps -// -// = FILENAME -// Peer_Message.h -// -// = AUTHOR -// Doug Schmidt -// -// ============================================================================ - -#if !defined (PEER_MESSAGE) -#define PEER_MESSAGE - -// This is the unique connection identifier that denotes a particular -// Channel in the Gateway. -typedef short CONN_ID; - -class Peer_Addr - // = TITLE - // Peer address is used to identify the source/destination of a - // routing message. -{ -public: - Peer_Addr (CONN_ID cid = -1, u_char lid = 0, u_char pay = 0) - : conn_id_ (cid), logical_id_ (lid), payload_ (pay) {} - - int operator== (const Peer_Addr &pa) const - { - return this->conn_id_ == pa.conn_id_ - && this->logical_id_ == pa.logical_id_ - && this->payload_ == pa.payload_; - } - - CONN_ID conn_id_; - // Unique connection identifier that denotes a particular Channel. - - u_char logical_id_; - // Logical ID. - - u_char payload_; - // Payload type. -}; - - -class Peer_Header - // = TITLE - // Fixed sized header. -{ -public: - typedef u_short ROUTING_ID; - // Type used to route messages from gatewayd. - - enum - { - INVALID_ID = -1 // No peer can validly use this number. - }; - - ROUTING_ID routing_id_; - // Source ID. - - size_t len_; - // Length of the message in bytes. -}; - -class Peer_Message - // = TITLE - // Variable-sized message (buf_ may be variable-sized between - // 0 and MAX_PAYLOAD_SIZE). -{ -public: - enum { MAX_PAYLOAD_SIZE = 1024 }; - // The maximum size of an Peer message (see Peer protocol specs for - // exact #). - - Peer_Header header_; - // Message header. - - char buf_[MAX_PAYLOAD_SIZE]; - // Message payload. -}; - -#endif /* PEER_MESSAGE */ diff --git a/bin/auto_run_tests.lst b/bin/auto_run_tests.lst index e952c9ba491..fa146d2d7fb 100644 --- a/bin/auto_run_tests.lst +++ b/bin/auto_run_tests.lst @@ -22,8 +22,6 @@ TAO/tests/AMI_Timeouts/run_test.pl: !MINIMUM TAO/tests/OctetSeq/run_test.pl TAO/tests/OctetSeq/run_test1.pl TAO/tests/OctetSeq/run_test2.pl -TAO/tests/BiDirectional/run_test.pl -TAO/tests/BiDirectional_NestedUpcall/run_test.pl TAO/tests/Leader_Followers/run_test.pl: !ST TAO/tests/Leader_Followers/run_test_mt.pl: !ST TAO/tests/Multiple_Inheritance/run_test.pl @@ -40,7 +38,7 @@ TAO/tests/Hello/run_test.pl TAO/tests/Muxing/run_test.pl: !ST TAO/tests/MT_Client/run_test.pl: !ST TAO/tests/MT_Server/run_test.pl: !ST -# DISABLED TAO/tests/Client_Leaks/run_test.pl: !ST !TRU_64 +TAO/tests/Client_Leaks/run_test.pl: !ST !TRU_64 TAO/tests/Server_Leaks/run_test.pl TAO/tests/Faults/run_test.pl: !MINIMUM TAO/tests/Crashed_Callback/run_test.pl: !MINIMUM @@ -54,7 +52,7 @@ TAO/tests/POA/Excessive_Object_Deactivations/run_test.pl TAO/tests/POA/Object_Reactivation/run_test.pl TAO/tests/POA/POA_Destruction/run_test.pl TAO/tests/POA/Single_Threaded_POA/run_test.pl: !MINIMUM !ST -TAO/tests/POA/Non_Servant_Upcalls/run_test.pl: !SUNCC5_1 +TAO/tests/POA/Non_Servant_Upcalls/run_test.pl TAO/tests/POA/wait_for_completion/run_test.pl TAO/tests/IORManipulation/run_test.pl TAO/tests/Policies/run_test.pl: !MINIMUM !ST @@ -73,7 +71,7 @@ TAO/tests/LongUpcalls/run_test.pl: !MINIMUM TAO/examples/Buffered_Oneways/run_test.pl: !MINIMUM # REQUIRES AMI 'TAO/examples/Buffered_AMI/run_test.pl: !MINIMUM TAO/tests/InterOp-Naming/run_test.pl: !MINIMUM -TAO/tests/Multiple/run_test.pl: !SUNCC5_1 +TAO/tests/Multiple/run_test.pl TAO/tests/Exposed_Policies/run_test.pl TAO/tests/Portable_Interceptors/Dynamic/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS @@ -81,7 +79,7 @@ TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl: !MINIMUM !DISABLE_IN TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS TAO/tests/Object_Loader/run_test.pl: !STATIC -TAO/examples/POA/Adapter_Activator/run_test.pl: !MINIMUM !SUNCC5_1 +TAO/examples/POA/Adapter_Activator/run_test.pl: !MINIMUM TAO/examples/POA/DSI/run_test.pl: !MINIMUM TAO/examples/POA/Default_Servant/run_test.pl: !MINIMUM TAO/examples/POA/Explicit_Activation/run_test.pl: !MINIMUM @@ -90,15 +88,14 @@ TAO/examples/POA/Forwarding/run_test.pl: !MINIMUM TAO/examples/POA/NewPOA/run_test.pl: !MINIMUM TAO/examples/POA/On_Demand_Activation/run_test.pl: !MINIMUM !STATIC TAO/examples/POA/On_Demand_Loading/run_test.pl: !MINIMUM !STATIC !KCC_Linux -TAO/examples/POA/Reference_Counted_Servant/run_test.pl: !SUNCC5_1 +TAO/examples/POA/Reference_Counted_Servant/run_test.pl TAO/examples/POA/Loader/run_test.pl: !MINIMUM !STATIC !KCC_Linux TAO/examples/POA/RootPOA/run_test.pl TAO/examples/Simple/bank/run_test.pl TAO/examples/Simple/grid/run_test.pl TAO/examples/Simple/time-date/run_test.pl: !ST !STATIC TAO/examples/Simple/time/run_test.pl -TAO/examples/Load_Balancing/run_test.pl: !MINIMUM !SUNCC5_1 -TAO/examples/PluggableUDP/tests/Basic/run_test.pl +TAO/examples/Load_Balancing/run_test.pl: !MINIMUM # BROKEN TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl: !MINIMUM # BROKEN TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl: !MINIMUM @@ -111,10 +108,10 @@ TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl: !MINIMUM TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl: !MINIMUM TAO/orbsvcs/tests/Simple_Naming/run_test.pl: !ST -TAO/orbsvcs/tests/Trading/run_test.pl: !MINIMUM !SUNCC5_1 +TAO/orbsvcs/tests/Trading/run_test.pl: !MINIMUM TAO/orbsvcs/tests/Event/Basic/run_test.pl: !ST TAO/orbsvcs/tests/Event/Performance/run_test.pl: !ST -TAO/orbsvcs/tests/EC_Basic/run_test.pl: !SUNCC5_1 +TAO/orbsvcs/tests/EC_Basic/run_test.pl TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl: !ST TAO/orbsvcs/tests/EC_Throughput/run_test.pl: !ST TAO/orbsvcs/tests/ImplRepo/run_test.pl: SANDBOX diff --git a/bin/make_pretty.pl b/bin/make_pretty.pl index 75befd81d2d..647d799e989 100755 --- a/bin/make_pretty.pl +++ b/bin/make_pretty.pl @@ -172,14 +172,10 @@ sub is_error () return 1; } - # AIX linking errors from ld - return 1 if (/^ld: \d+\-\d+/); - # Look for linking errors too return 1 if (/undefined reference to/ || /: cannot open/ - || /: multiple definition of/ - || /path name does not exist/); + || /: multiple definition of/); # Look for possible errors return 1 if ((/error/i && !/ error\(s\), / && !/error \(future\)/i) diff --git a/examples/NT_Service/Makefile b/examples/NT_Service/Makefile deleted file mode 100644 index 9a6d67bf8e9..00000000000 --- a/examples/NT_Service/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for NT_Service -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -BIN = ntsvc - -SRC = main.cpp ntsvc.cpp - -LDLIBS = - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -BUILD = $(VBIN) - -INSTALL = - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. diff --git a/examples/NT_Service/main.cpp b/examples/NT_Service/main.cpp index c517615a11e..74472b4af4d 100644 --- a/examples/NT_Service/main.cpp +++ b/examples/NT_Service/main.cpp @@ -14,7 +14,7 @@ // runs on Win32. // // = AUTHOR -// Gonzalo Diethelm <gonzo@cs.wustl.edu> +// Gonzalo Diethelm <gonzo@cs.wustl.edu> // and Steve Huston <shuston@riverace.com> // // ============================================================================ @@ -72,7 +72,7 @@ Process::~Process (void) ACE::fini (); } -void +void Process::print_usage_and_die (void) { ACE_DEBUG ((LM_INFO, @@ -89,11 +89,11 @@ Process::print_usage_and_die (void) ACE_OS::exit(1); } -void +void Process::parse_args (int argc, ACE_TCHAR* argv[]) { ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("i:rskt:d")); - int c; + int c; while ((c = get_opt ()) != -1) switch (c) @@ -143,7 +143,6 @@ Process::parse_args (int argc, ACE_TCHAR* argv[]) static BOOL __stdcall ConsoleHandler (DWORD ctrlType) { - ACE_UNUSED_ARG (ctrlType); SERVICE::instance ()->handle_control (SERVICE_CONTROL_STOP); return TRUE; } @@ -152,7 +151,7 @@ ACE_NT_SERVICE_DEFINE (Beeper, Service, ACE_TEXT ("Annoying Beeper Service")); -int +int Process::run (int argc, ACE_TCHAR* argv[]) { SERVICE::instance ()->name (ACE_TEXT ("Beeper"), @@ -196,18 +195,12 @@ Process::run (int argc, ACE_TCHAR* argv[]) "%p\n", "Couldn't start service")); } - + return 0; } -int +int main (int argc, ACE_TCHAR* argv[]) { return PROCESS::instance ()->run (argc, argv); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Singleton<Process, ACE_Mutex>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Singleton<Process, ACE_Mutex> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/examples/NT_Service/ntsvc.cpp b/examples/NT_Service/ntsvc.cpp index c671f4a7967..b08f5ba0cab 100644 --- a/examples/NT_Service/ntsvc.cpp +++ b/examples/NT_Service/ntsvc.cpp @@ -13,7 +13,7 @@ // seconds until the service is stopped. // // = AUTHOR -// Gonzalo Diethelm <gonzo@cs.wustl.edu> +// Gonzalo Diethelm <gonzo@cs.wustl.edu> // and Steve Huston <shuston@riverace.com> // // ============================================================================ @@ -36,10 +36,10 @@ Service::Service (void) // handles requests for stop and shutdown by calling terminate (). // All others get handled by calling up to inherited::handle_control. -void +void Service::handle_control (DWORD control_code) { - if (control_code == SERVICE_CONTROL_SHUTDOWN + if (control_code == SERVICE_CONTROL_SHUTDOWN || control_code == SERVICE_CONTROL_STOP) { report_status (SERVICE_STOP_PENDING); @@ -58,7 +58,7 @@ Service::handle_control (DWORD control_code) // doesn't do anything except aid on popping the reactor off its wait // and causing a drop out of handle_events. -int +int Service::handle_exception (ACE_HANDLE) { return 0; @@ -66,11 +66,10 @@ Service::handle_exception (ACE_HANDLE) // Beep every two seconds. This is what this NT service does... -int +int Service::handle_timeout (const ACE_Time_Value &tv, const void *) { - ACE_UNUSED_ARG (tv); MessageBeep (MB_OK); return 0; } @@ -79,7 +78,7 @@ Service::handle_timeout (const ACE_Time_Value &tv, // the initial configuration and runs the event loop until a shutdown // request is received. -int +int Service::svc (void) { ACE_DEBUG ((LM_DEBUG, @@ -102,9 +101,3 @@ Service::svc (void) "Shutting down\n")); return 0; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Singleton<Service, ACE_Mutex>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Singleton<Service, ACE_Mutex> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/examples/QOS/Change_Sender_TSpec/sender.dsp b/examples/QOS/Change_Sender_TSpec/sender.dsp index 732d1f2692d..b881e99850c 100644 --- a/examples/QOS/Change_Sender_TSpec/sender.dsp +++ b/examples/QOS/Change_Sender_TSpec/sender.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib ws2_32.lib ACE_QoS.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\..\ace\QoS"
+# ADD LINK32 ace.lib ws2_32.lib ACE_QoS.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace" /libpath:"..\..\ace\QoS"
!ELSEIF "$(CFG)" == "sender - Win32 Debug"
@@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Od /I "..\..\..\" /D "WIN32" /D "_DEBUG" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib ACE_QoSd.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\..\ace\QoS"
+# ADD LINK32 aced.lib ACE_QoSd.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace" /libpath:"..\..\ace\QoS"
!ENDIF
diff --git a/examples/Reactor/Misc/signal_tester.cpp b/examples/Reactor/Misc/signal_tester.cpp deleted file mode 100644 index 37613f14f38..00000000000 --- a/examples/Reactor/Misc/signal_tester.cpp +++ /dev/null @@ -1,221 +0,0 @@ -// Perform an extensive test of the ACE_Reactor's event dispatching -// $Id$ - -// mechanisms. These mechanisms illustrate how signals, I/O, and -// timeout events can all be handled within the same framework. In -// addition, this example illustrates how to use the ACE_Reactor for -// devices that perform I/O via signals (such as SVR4 message queues). - - -#include "ace/Service_Config.h" - -// Used to shut down the event loop. -static sig_atomic_t done = 0; - -// This class illustrates how to handle signal-driven I/O using the -// ACE_Reactor framework. Note that signals may be caught and -// processed without requiring the use of global signal handler -// functions or global signal handler data. - -class Sig_Handler : public ACE_Event_Handler -{ -public: - Sig_Handler (void); - virtual ACE_HANDLE get_handle (void) const; - virtual int handle_input (ACE_HANDLE); - virtual int shutdown (ACE_HANDLE, ACE_Reactor_Mask); - virtual int handle_signal (ACE_HANDLE signum, siginfo_t * = 0, - ucontext_t * = 0); - -private: - ACE_HANDLE handle_; -}; - -// A dummy_handle is required to reserve a slot in the ACE_Reactor's -// descriptor table. - -Sig_Handler::Sig_Handler (void) -{ - // Assign the Sig_Handler a dummy I/O descriptor. Note that even - // though we open this file "Write Only" we still need to use the - // ACE_Event_Handler::NULL_MASK when registering this with the - // ACE_Reactor (see below). - this->handle_ = ACE_OS::open (ACE_DEV_NULL, O_WRONLY); - ACE_ASSERT (this->handle_ != -1); - - // Register signal handler object. Note that NULL_MASK is used to - // keep the ACE_Reactor from calling us back on the "/dev/null" - // descriptor. - if (ACE_Service_Config::reactor ()->register_handler - (this, ACE_Event_Handler::NULL_MASK) == -1) - ACE_ERROR ((LM_ERROR, "%p\n%a", "register_handler", 1)); - - // Create a sigset_t corresponding to the signals we want to catch. - ACE_Sig_Set sig_set; - - sig_set.sig_add (SIGINT); - sig_set.sig_add (SIGQUIT); - sig_set.sig_add (SIGALRM); - - // Register the signal handler object to catch the signals. - if (ACE_Service_Config::reactor ()->register_handler (sig_set, this) == -1) - ACE_ERROR ((LM_ERROR, "%p\n%a", "register_handler", 1)); -} - -// Called by the ACE_Reactor to extract the fd. - -ACE_HANDLE -Sig_Handler::get_handle (void) const -{ - return this->handle_; -} - -// In a real application, this method would be where the read on the -// signal-driven I/O device would occur asynchronously. For now we'll -// just print a greeting to let you know that everything is working -// properly! - -int -Sig_Handler::handle_input (ACE_HANDLE) -{ - ACE_DEBUG ((LM_DEBUG, "handling asynchonrous input...\n")); - return 0; -} - -// In a real application, this method would do any cleanup activities -// required when shutting down the I/O device. - -int -Sig_Handler::shutdown (ACE_HANDLE, ACE_Reactor_Mask) -{ - ACE_DEBUG ((LM_DEBUG, "closing down Sig_Handler...\n")); - return 0; -} - -// This method handles all the signals that are being caught by this -// object. In our simple example, we are simply catching SIGALRM, -// SIGINT, and SIGQUIT. Anything else is logged and ignored. -// -// There are several advantages to using this approach. First, -// the behavior triggered by the signal is handled in the main event -// loop, rather than in the signal handler. Second, the ACE_Reactor's -// signal handling mechanism eliminates the need to use global signal -// handler functions and data. - -int -Sig_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *) -{ - ACE_DEBUG ((LM_DEBUG, "received signal %S\n", signum)); - - switch (signum) - { - case SIGALRM: - // Rearm the alarm. - ACE_OS::alarm (4); - break; - case SIGINT: - // Tell the ACE_Reactor to enable the ready bit for - // this->handle_. The ACE_Reactor will subsequently call the - // Sig_Handler::handle_input method from within its event loop. - return ACE_Service_Config::reactor ()->ready_ops - (this->handle_, ACE_Event_Handler::READ_MASK, ACE_Reactor::ADD_MASK); - case SIGQUIT: - ACE_DEBUG ((LM_DEBUG, "%S: shutting down signal tester\n", signum)); - ACE_Service_Config::end_reactor_event_loop (); - break; - default: - ACE_DEBUG ((LM_DEBUG, - "%S: not handled, returning to program\n", signum)); - break; - } - return 0; -} - -// This class illustrates that the ACE_Reactor can handle signals, -// STDIO, and timeouts using the same mechanisms. - -class STDIN_Handler : public ACE_Event_Handler -{ -public: - STDIN_Handler (void); - virtual int handle_input (ACE_HANDLE); - virtual int handle_timeout (const ACE_Time_Value &, - const void *arg); -}; - -STDIN_Handler::STDIN_Handler (void) -{ - if (ACE::register_stdin_handler (this, - ACE_Service_Config::reactor (), - ACE_Service_Config::thr_mgr ()) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "register_stdin_handler")); - - // Register the STDIN_Handler to be dispatched once every second. - else if (ACE_Service_Config::reactor ()->schedule_timer - (this, 0, ACE_Time_Value (1), ACE_Time_Value (1)) == -1) - ACE_ERROR ((LM_ERROR, "%p\n%a", "schedule_timer", 1)); -} - -int -STDIN_Handler::handle_timeout (const ACE_Time_Value &tv, - const void *) -{ - ACE_DEBUG ((LM_DEBUG, "timeout occurred at %d sec, %d usec\n", - tv.sec (), tv.usec ())); - return 0; -} - -// Read from input descriptor and write to stdout descriptor. - -int -STDIN_Handler::handle_input (ACE_HANDLE handle) -{ - ssize_t n; - char buf[BUFSIZ]; - - switch (n = ACE_OS::read (handle, buf, sizeof buf)) - { - case -1: - if (errno == EINTR) - return 0; - /* NOTREACHED */ - else - ACE_ERROR ((LM_ERROR, "%p\n", "read")); - /* FALLTHROUGH */ - case 0: - ACE_Service_Config::end_reactor_event_loop (); - break; - default: - { - ssize_t result = ACE::write_n (ACE_STDOUT, buf, n); - - if (result != n) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "write"), - result == -1 && errno == EINTR ? 0 : -1); - } - } - return 0; -} - -int -main (int argc, char *argv[]) -{ - ACE_Service_Config daemon (argv [0]); - - // Signal handler. - Sig_Handler sh; - - // Define an I/O handler object. - STDIN_Handler ioh; - - // Optionally start the alarm. - if (argc > 1) - ACE_OS::alarm (4); - - // Loop handling signals and I/O events until SIGQUIT occurs. - - while (daemon.reactor_event_loop_done () == 0) - daemon.run_reactor_event_loop (); - - return 0; -} diff --git a/examples/Reactor/Misc/test_signals.cpp b/examples/Reactor/Misc/test_signals.cpp deleted file mode 100644 index 6493667de12..00000000000 --- a/examples/Reactor/Misc/test_signals.cpp +++ /dev/null @@ -1,226 +0,0 @@ -// Test the ability of the Reactor/Signal_Handler to register multiple -// $Id$ - -// handler per-signal. - -/* This test works as follows: - - 1. To test the "original" semantics of ACE (i.e., only one - ACE_Event_Handler can be registered per signal), you don't - need to do anything special. Existing programs work the - same since giving the Reactor's constructor a 0 value - (which is the default argument, BTW) instructs it to behave - as before. When a 0 is given, the ACE_Reactor's - constructor/open method creates an instance of - ACE_Sig_Handler and assigns this to an internal pointer. - This pointer is then used to dispatch all signal-related - methods within the Reactor. The default ACE_Sig_Handler - only allows *one* ACE_Event_Handler to be registered - per-signal. - - To run this version of the test do the following: - - % ./test-signal - ./test_signals - waiting for SIGINT or SIGQUIT - ^C - signal Interrupt occurred in Sig_Handler_2 (fruity, 0, 0) with count = 1 - waiting for SIGINT or SIGQUIT - ^\ - signal Quit occurred in Sig_Handler_2 (fruity, 0, 0) with count = 2 - shutting down SIGQUIT in Sig_Handler_2 (fruity, 0, 0) - waiting for SIGINT or SIGQUIT - ^C - signal Interrupt occurred in Sig_Handler_2 (fruity, 0, 0) with count = 3 - waiting for SIGINT or SIGQUIT - ^\Quit (core dumped) - - Note that in this test only one handler (the last one -- - "Sig_Handler_2 (fruity)") is actually registered. BTW, the - core dump is the expected behavior since the default - disposition is restored when there are no more handlers - (see the code below). - - 2. To test the "multiple handlers per-signal semantics", you - need to pass the constructor/open method of the ACE_Reactor - a pointer to a an instance of ACE_Sig_Handlers (note the - plural "s"). ACE_Sig_Handlers is a class that derives from - ACE_Sig_Handler. The difference between these two classes - is that (1) ACE_Sig_Handlers::register_signal allows - multiple ACE_Event_Handlers to be registered per-signal and - (2) it enables SA_RESTART by default. This class also - implements Detlef Becker's algorithm for integrating ACE - signal handling with 3rd party libraries. - - To run this version of the test do the following: - - % ./test_signals 1 - - waiting for SIGINT or SIGQUIT - ^C - signal Interrupt occurred in external handler! - signal Interrupt occurred in Sig_Handler_1 (howdy, 3, 1) with count = 1 - shutting down SIGINT in Sig_Handler_1 (howdy, 3, 1) - signal Interrupt occurred in Sig_Handler_1 (doody, 5, 4) with count = 1 - shutting down SIGINT in Sig_Handler_1 (doody, 5, 4) - signal Interrupt occurred in Sig_Handler_2 (tutty, 7, 6) with count = 1 - signal Interrupt occurred in Sig_Handler_2 (fruity, 9, 8) with count = 1 - waiting for SIGINT or SIGQUIT - ^\ - signal Quit occurred in Sig_Handler_1 (howdy, 3, 1) with count = 2 - shutting down SIGQUIT in Sig_Handler_1 (howdy, 3, 1) - signal Quit occurred in Sig_Handler_1 (doody, 5, 4) with count = 2 - shutting down SIGQUIT in Sig_Handler_1 (doody, 5, 4) - signal Quit occurred in Sig_Handler_2 (tutty, 7, 6) with count = 2 - shutting down SIGQUIT in Sig_Handler_2 (tutty, 7, 6) - signal Quit occurred in Sig_Handler_2 (fruity, 9, 8) with count = 2 - shutting down SIGQUIT in Sig_Handler_2 (fruity, 9, 8) - waiting for SIGINT or SIGQUIT - ^C - signal Interrupt occurred in external handler! - signal Interrupt occurred in Sig_Handler_2 (tutty, 7, 6) with count = 3 - signal Interrupt occurred in Sig_Handler_2 (fruity, 9, 8) with count = 3 - waiting for SIGINT or SIGQUIT - ^\Quit (core dumped) - - When this test begins all four handlers are registered and - dispatched when a SIGINT or SIGQUIT occurs. After the - first SIGINT, the handle_signal method of the Sig_Handler_1 - objects unregister themselves. At that point there are 4 - SIGQUIT handlers left, but only 2 of our SIGINT handlers - left (and the 1 external handler). After the first - SIGQUIT, there are no SIGQUIT handlers left since they all - deregister themselves (which restores the "SIG_DFL" - disposition). On the second SIGINT there are only 3 - handlers left (2 of ours and 1 external). Finally, on the - second SIGQUIT we exit and dump core since that's what - happens with the default disposition for SIGQUIT. */ - -#include "ace/Log_Msg.h" -#include "ace/Reactor.h" - -class Sig_Handler_1 : public ACE_Event_Handler -{ -public: - Sig_Handler_1 (ACE_Reactor &reactor, char *msg) - : msg_ (msg), - count_ (0), - reactor_ (reactor) - { - // Register the signal handlers. - this->quit_sigkey_ = reactor.register_handler (SIGQUIT, this); - this->int_sigkey_ = reactor.register_handler (SIGINT, this); - - if (this->quit_sigkey_ == -1 || this->int_sigkey_ == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "register_handler")); - } - - virtual int handle_signal (int signum, siginfo_t *, ucontext_t *) - { - this->count_++; - ACE_DEBUG ((LM_DEBUG, - "\nsignal %S occurred in Sig_Handler_1 (%s, %d, %d) with count = %d", - signum, this->msg_, this->int_sigkey_, this->quit_sigkey_, this->count_)); - if (this->count_ != 1 && signum == SIGQUIT) - { - if (this->reactor_.remove_handler (SIGQUIT, 0, 0, - this->quit_sigkey_) == -1) - ACE_ERROR ((LM_ERROR, "\n%p", "remove_handler")); - else - ACE_DEBUG ((LM_DEBUG, "\nshutting down SIGQUIT in Sig_Handler_1 (%s, %d, %d)", - this->msg_, this->int_sigkey_, this->quit_sigkey_)); - } - else if (this->count_ != 2 && signum == SIGINT) - { - if (this->reactor_.remove_handler (SIGINT, 0, 0, - this->int_sigkey_) == -1) - ACE_ERROR ((LM_ERROR, "\n%p", "remove_handler")); - else - ACE_DEBUG ((LM_DEBUG, "\nshutting down SIGINT in Sig_Handler_1 (%s, %d, %d)", - this->msg_, this->int_sigkey_, this->quit_sigkey_)); - } - return 0; - } - -protected: - char *msg_; - int count_; - int int_sigkey_; - int quit_sigkey_; - ACE_Reactor &reactor_; -}; - -class Sig_Handler_2 : public Sig_Handler_1 -{ -public: - Sig_Handler_2 (ACE_Reactor &reactor, char *msg) - : Sig_Handler_1 (reactor, msg) - { - } - - virtual int handle_signal (int signum, siginfo_t *, ucontext_t *) - { - this->count_++; - ACE_DEBUG ((LM_DEBUG, - "\nsignal %S occurred in Sig_Handler_2 (%s, %d, %d) with count = %d", - signum, this->msg_, this->int_sigkey_, this->quit_sigkey_, this->count_)); - if (this->count_ != 0 && signum == SIGQUIT) - { - if (this->reactor_.remove_handler (SIGQUIT, 0, 0, - this->quit_sigkey_) == -1) - ACE_ERROR ((LM_ERROR, "\n%p", "remove_handler")); - else - ACE_DEBUG ((LM_DEBUG, "\nshutting down SIGQUIT in Sig_Handler_2 (%s, %d, %d)", - this->msg_, this->int_sigkey_, this->quit_sigkey_)); - } - else - return 0; - } -}; - -static void -external_handler (int signum) -{ - ACE_DEBUG ((LM_DEBUG, "\nsignal %S occurred in external handler!", signum)); -} - -#if !defined (HPUX) -int -main (int argc, char *argv) -{ - // If argc > 1 then allow multiple handlers per-signal, else just - // allow 1 handler per-signal. - ACE_Sig_Handlers multi_handlers; - - ACE_Reactor reactor (argc > 1 ? &multi_handlers: 0); - - if (argc > 1) - { - // Register an "external" signal handler so that the - // ACE_Sig_Handlers code will have something to incorporate! - ACE_SignalHandler eh = ACE_SignalHandler (external_handler); - ACE_Sig_Action sa (eh); - - sa.register_action (SIGINT); - } - - // Create a bevy of handlers. - Sig_Handler_1 h1 (reactor, "howdy"), h2 (reactor, "doody"); - Sig_Handler_2 h3 (reactor, "tutty"), h4 (reactor, "fruity"); - - // Wait for user to type SIGINT and SIGQUIT. - - for (;;) - { - ACE_DEBUG ((LM_DEBUG, "\nwaiting for SIGINT or SIGQUIT\n")); - reactor.handle_events (); - } - return 0; -} -#else -int -main (void) -{ - ACE_ERROR_RETURN ((LM_ERROR, "The HP C++ compiler is too lame to support this feature\n"), -1); -} -#endif /* HPUX */ diff --git a/examples/Synch/proc_sema.dsp b/examples/Synch/proc_sema.dsp index 20e3dca707f..13d6647a9b2 100644 --- a/examples/Synch/proc_sema.dsp +++ b/examples/Synch/proc_sema.dsp @@ -7,19 +7,19 @@ CFG=proc_sema - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "proc_sema.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "proc_sema.mak" CFG="proc_sema - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "proc_sema - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "proc_sema - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -39,10 +39,9 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,7 +49,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "proc_sema - Win32 Debug"
@@ -61,12 +60,12 @@ LINK32=link.exe # PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
+# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -76,7 +75,7 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace"
-!ENDIF
+!ENDIF
# Begin Target
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphore_Client.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphore_Client.cpp deleted file mode 100644 index b7fe34725e7..00000000000 --- a/examples/System_V_IPC/SV_Semaphores/Semaphore_Client.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "Semaphore_Test.h" -// $Id$ - -#include "ace/SV_Shared_Memory.h" -#include "ace/SV_Semaphore_Simple.h" - -int -main (void) -{ - ACE_SV_Shared_Memory shm_client (SHM_KEY, - SHMSZ, - ACE_SV_Shared_Memory::ACE_OPEN); - ACE_SV_Semaphore_Simple sem (SEM_KEY_1, - ACE_SV_Semaphore_Simple::ACE_OPEN, 0, 2); - - char *s = (char *) shm_client.get_segment_ptr (); - - if (sem.acquire (0) < 0) - ACE_OS::perror ("client sem.acquire"), ACE_OS::exit (1); - - while (*s != '\0') - putchar (*s++); - - putchar ('\n'); - - if (sem.release (1) < 0) - ACE_OS::perror ("client sem.release"), ACE_OS::exit (1); - - return 0; -} - diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp deleted file mode 100644 index f9931705c26..00000000000 --- a/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - - -#include "ace/SV_Shared_Memory.h" -#include "ace/SV_Semaphore_Simple.h" -#include "ace/Signal.h" -#include "Semaphore_Test.h" - -static ACE_SV_Shared_Memory shm_server (SHM_KEY, SHMSZ, ACE_SV_Shared_Memory::ACE_CREATE); -static ACE_SV_Semaphore_Simple sem (SEM_KEY_1, ACE_SV_Semaphore_Simple::ACE_CREATE, 0, 2); - -extern "C" void -cleanup (int) -{ - if (shm_server.remove () < 0 || sem.remove () < 0) - ACE_ERROR ((LM_ERROR, "%p\n%a", "remove", 1)); - ACE_OS::exit (0); -} - -int -main (void) -{ - // Register a signal handler. - ACE_Sig_Action sa ((ACE_SignalHandler) cleanup, SIGINT); - - char *s = (char *) shm_server.get_segment_ptr (); - - for (char c = 'a'; c <= 'z'; c++) - *s++ = c; - - *s = '\0'; - - if (sem.release (0) < 0) - ESD ("server sem.release", done); - - if (sem.acquire (1) < 0) - ESD ("server sem.acquire", done); - -done: - cleanup (); - return 0; -} diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphore_Test.h b/examples/System_V_IPC/SV_Semaphores/Semaphore_Test.h deleted file mode 100644 index 72aab815ff8..00000000000 --- a/examples/System_V_IPC/SV_Semaphores/Semaphore_Test.h +++ /dev/null @@ -1,11 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#include "ace/Log_Msg.h" - -#define SHMSZ 27 -#define SEM_KEY_1 2345 -#define SEM_KEY_2 4321 -#define SHM_KEY 5678 - -#define ESD(MSG,LABEL) do { ACE_ERROR ((LM_ERROR, MSG)); goto LABEL; } while (0) diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphores.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphores.cpp deleted file mode 100644 index c5e96ed0416..00000000000 --- a/examples/System_V_IPC/SV_Semaphores/Semaphores.cpp +++ /dev/null @@ -1,94 +0,0 @@ -// Illustrates the use of the Semaphore_Complex class. Note that it -// $Id$ - -// doesn't matter whether the parent or the child creates the -// semaphore since Semaphore_Complex will correctly serialize the -// intialization of the mutex and synch objects. -#include "ace/Malloc.h" -#include "ace/SV_Semaphore_Complex.h" -#include "Semaphore_Test.h" - -ACE_Malloc<ACE_Shared_Memory_Pool, ACE_SV_Semaphore_Simple> allocator; -ACE_SV_Semaphore_Complex *mutex = 0; -ACE_SV_Semaphore_Complex *synch = 0; - -/* Pointer to memory shared by both the client and server. */ -static char *shm; - -static int -do_parent (void) -{ - char *s = shm; - - mutex = new ACE_SV_Semaphore_Complex (SEM_KEY_1, ACE_SV_Semaphore_Complex::ACE_CREATE, 0); - synch = new ACE_SV_Semaphore_Complex (SEM_KEY_2, ACE_SV_Semaphore_Complex::ACE_CREATE, 0); - - for (char c = 'a'; c <= 'z'; c++) - *s++ = c; - - *s = '\0'; - - if (mutex->release () == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p", "server mutex.release"), 1); - - if (synch->acquire () == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p", "server synch.acquire"), 1); - return 0; -} - -static int -do_child (void) -{ - mutex = new ACE_SV_Semaphore_Complex (SEM_KEY_1, ACE_SV_Semaphore_Complex::ACE_CREATE, 0); - synch = new ACE_SV_Semaphore_Complex (SEM_KEY_2, ACE_SV_Semaphore_Complex::ACE_CREATE, 0); - - while (mutex->tryacquire () == -1) - if (errno == EAGAIN) - ACE_DEBUG ((LM_DEBUG, "spinning in client!\n")); - else - ACE_ERROR_RETURN ((LM_ERROR, "client mutex.tryacquire"), 1); - - for (char *s = (char *) shm; *s != '\0'; s++) - putchar (*s); - - putchar ('\n'); - - if (synch->release () == -1) - ACE_ERROR_RETURN ((LM_ERROR, "client synch.release"), 1); - return 0; -} - -int -main (void) -{ - shm = (char *) allocator.malloc (27); - - switch (ACE_OS::fork ()) - { - case -1: - ACE_ERROR_RETURN ((LM_ERROR, "fork failed\n"), -1); - /* NOTREACHED */ - case 0: - return do_child (); - default: - { - int result = do_parent (); - - if (wait (0) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "wait"), -1); - - allocator.remove (); - - if (mutex->remove () == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "mutex.remove"), -1); - else if (synch->remove () == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "synch.remove"), -1); - return result; - } - } -} - -#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template class ACE_Malloc<ACE_Shared_Memory_Pool, ACE_SV_Semaphore_Simple>; -template class ACE_Malloc_T<ACE_Shared_Memory_Pool, ACE_SV_Semaphore_Simple, ACE_Control_Block>; -#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ diff --git a/examples/Threads/test_auto_event.cpp b/examples/Threads/test_auto_event.cpp deleted file mode 100644 index 4f83d50db71..00000000000 --- a/examples/Threads/test_auto_event.cpp +++ /dev/null @@ -1,113 +0,0 @@ -// $Id$ - -// This test shows the use of an ACE_Auto_Event as a signaling -// mechanism. Two threads are created (one a reader, the other a -// writer). The reader waits till the writer has completed -// calculations. Upon waking up the reader prints the data calculated -// by the writer. The writer thread calculates the value and signals -// the reader when the calculation completes. - -#include "ace/Service_Config.h" -#include "ace/Synch.h" -#include "ace/Singleton.h" -#include "ace/Thread_Manager.h" - -#if defined (ACE_HAS_THREADS) -// Shared event between reader and writer. The ACE_Thread_Mutex is -// necessary to make sure that only one ACE_Auto_Event is created. -// The default constructor for ACE_Auto_Event sets it initially into -// the non-signaled state. - -typedef ACE_Singleton <ACE_Auto_Event, ACE_Thread_Mutex> EVENT; - -// work time for writer -static int work_time; - -// Reader thread. -static void * -reader (void *arg) -{ - // Shared data via a reference. - int& data = *(int *) arg; - - ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ()); - - // Wait for writer to complete. - - ACE_DEBUG ((LM_DEBUG, "(%t) reader: waiting...... \n")); - - if (EVENT::instance ()->wait () == -1) - { - ACE_ERROR ((LM_ERROR, "thread wait failed")); - ACE_OS::exit (0); - } - - // Read shared data. - ACE_DEBUG ((LM_DEBUG, "(%t) reader: value of data is: %d \n", data)); - - return 0; -} - -// Writer thread. -static void * -writer (void *arg) -{ - int& data = *(int *) arg; - - ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ()); - - // Calculate (work). - ACE_DEBUG ((LM_DEBUG, "(%t) writer: working for %d secs\n", work_time)); - ACE_OS::sleep (work_time); - - // Write shared data. - data = 42; - - // Wake up reader. - ACE_DEBUG ((LM_DEBUG, "(%t) writer: calculation complete, waking reader\n")); - - if (EVENT::instance ()->signal () == -1) - { - ACE_ERROR ((LM_ERROR, "thread wait failed")); - ACE_OS::exit (0); - } - - return 0; -} - -int -main (int argc, char **argv) -{ - // Shared data: set by writer, read by reader. - int data; - - // Work time for writer. - work_time = argc == 2 ? atoi (argv[1]) : 5; - - // threads manager - ACE_Thread_Manager& tm = *ACE_Service_Config::thr_mgr (); - - // Create reader thread. - if (tm.spawn (reader, (void *) &data) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "thread create for reader failed"), -1); - - // Create writer thread. - if (tm.spawn (writer, (void *) &data) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "thread create for writer failed"), -1); - - // Wait for both. - if (tm.wait () == -1) - ACE_ERROR_RETURN ((LM_ERROR, "thread wait failed"), -1); - else - ACE_DEBUG ((LM_ERROR, "graceful exit\n")); - - return 0; -} -#else -int -main (int, char *[]) -{ - ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n")); - return 0; -} -#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_barrier1.cpp b/examples/Threads/test_barrier1.cpp deleted file mode 100644 index 6b213819ca0..00000000000 --- a/examples/Threads/test_barrier1.cpp +++ /dev/null @@ -1,84 +0,0 @@ -// This test program illustrates how the ACE barrier synchronization -// $Id$ - -// mechanisms work. - - -#include "ace/Synch.h" -#include "ace/Thread_Manager.h" -#include "ace/Service_Config.h" - -#if defined (ACE_HAS_THREADS) - -struct Tester_Args - // = TITLE - // These arguments are passed into each test thread. -{ - Tester_Args (ACE_Barrier &tb, int i) - : tester_barrier_ (tb), - n_iterations_ (i) {} - - ACE_Barrier &tester_barrier_; - // Reference to the tester barrier. This controls each miteration of - // the tester function running in every thread. - - int n_iterations_; - // Number of iterations to run. -}; - -// Iterate <n_iterations> time printing off a message and "waiting" -// for all other threads to complete this iteration. - -static void * -tester (Tester_Args *args) -{ - // Keeps track of thread exit. - ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ()); - - for (int iterations = 1; - iterations <= args->n_iterations_; - iterations++) - { - ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d\n", iterations)); - - // Block until all other threads have waited, then continue. - args->tester_barrier_.wait (); - } - - return 0; -} - -// Default number of threads to spawn. -static const int DEFAULT_ITERATIONS = 5; - -int -main (int argc, char *argv[]) -{ - ACE_Service_Config daemon (argv[0]); - - int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS; - int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS; - - ACE_Barrier tester_barrier (n_threads); - - Tester_Args args (tester_barrier, n_iterations); - - if (ACE_Service_Config::thr_mgr ()->spawn_n - (n_threads, ACE_THR_FUNC (tester), - (void *) &args, THR_NEW_LWP | THR_DETACHED) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn_n"), 1); - - // Wait for all the threads to reach their exit point. - ACE_Service_Config::thr_mgr ()->wait (); - - ACE_DEBUG ((LM_DEBUG, "(%t) done\n")); - return 0; -} -#else -int -main (int, char *[]) -{ - ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n")); - return 0; -} -#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_barrier2.cpp b/examples/Threads/test_barrier2.cpp deleted file mode 100644 index 30190ace443..00000000000 --- a/examples/Threads/test_barrier2.cpp +++ /dev/null @@ -1,269 +0,0 @@ -// $Id$ - -// generic_worker_task.cpp -// -// This test program illustrates how the ACE task workers/barrier -// synchronization mechanisms work in conjunction with the ACE_Task -// and the ACE_Thread_Manager. The manual flag not set simulates -// user input, if set input comes from stdin until RETURN only is -// entered which stops all workers via a message block of length -// 0. This is an alernative shutdown of workers compared to queue -// deactivate. The delay_put flag simulates a delay between the -// shutdown puts. All should work with this flag disabled! The -// BARRIER_TYPE is supposed to enable/disable barrier sync on each svc -// a worker has done. - -#include <iostream.h> -#include "ace/Task.h" -#include "ace/Service_Config.h" - -#if defined (ACE_HAS_THREADS) - -#define BARRIER_TYPE ACE_Null_Barrier -//#define BARRIER_TYPE ACE_Barrier -//#ifdef delay_put -//#define manual - -template <class BARRIER> -class Worker_Task : public ACE_Task<ACE_MT_SYNCH> -{ -public: - - Worker_Task (ACE_Thread_Manager *thr_mgr, - int n_threads, - int inp_serialize = 1); - - virtual int Producer (void); - // produce input for workers - - virtual int input (ACE_Message_Block *mb); - // Fill one message block via a certain input strategy. - - virtual int output (ACE_Message_Block *mb); - // Forward one message block via a certain output strategy to the - // next task if any. - - virtual int service (ACE_Message_Block *mb, int iter); - // Perform one message block dependant service. - -private: - virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv=0); - - virtual int svc (void); - // Iterate <n_iterations> time printing off a message and "waiting" - // for all other threads to complete this iteration. - - // = Not needed for this test. - virtual int open (void *) { return 0; } - virtual int close (u_long) {ACE_DEBUG ((LM_DEBUG,"(%t) in close of worker\n")); return 0; } - - int nt_; - // Number of worker threads to run. - int inp_serialize_; - - BARRIER barrier_; -}; - -template <class BARRIER> -Worker_Task<BARRIER>::Worker_Task (ACE_Thread_Manager *thr_mgr, - int n_threads, - int inp_serialize) - : ACE_Task<ACE_MT_SYNCH> (thr_mgr), - barrier_ (n_threads) -{ - nt_ = n_threads; - // Create worker threads. - inp_serialize_ = inp_serialize; - - // Use the task's message queue for serialization (default) or run - // service in the context of the caller thread. - - if (nt_ > 0 && inp_serialize == 1) - if (this->activate (THR_NEW_LWP, n_threads) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "activate failed")); -} - -// Simply enqueue the Message_Block into the end of the queue. - -template <class BARRIER> int -Worker_Task<BARRIER>::put (ACE_Message_Block *mb, ACE_Time_Value *tv) -{ - int result; - if (this->inp_serialize_) - result = this->putq (mb, tv); - else - { - static int iter = 0; - result = this->service (mb, iter++); - - if (this->output (mb) < 0) - ACE_DEBUG ((LM_DEBUG, "(%t) output not connected!\n")); - - delete mb; - } - return result; -} - -template <class BARRIER> int -Worker_Task<BARRIER>::service (ACE_Message_Block *mb, int iter) -{ - int length = mb->length (); - - if (length > 0) - { - ACE_DEBUG ((LM_DEBUG,"(%t) in iteration %d len=%d text got:\n",iter,length)); - ACE_OS::write (ACE_STDOUT, mb->rd_ptr (), length); - ACE_DEBUG ((LM_DEBUG,"\n")); - } - return 0; -} - -// Iterate <n_iterations> time printing off a message and "waiting" -// for all other threads to complete this iteration. - -template <class BARRIER> int -Worker_Task<BARRIER>::svc (void) -{ - // Note that the ACE_Task::svc_run () method automatically adds us - // to the Thread_Manager when the thread begins. - - // Keep looping, reading a message out of the queue, until we get a - // message with a length == 0, which signals us to quit. - - for (int iter = 1; ;iter++) - { - ACE_Message_Block *mb = 0; - - int result = this->getq (mb); - - if (result == -1) - { - ACE_ERROR ((LM_ERROR, - "(%t) in iteration %d\n", "error waiting for message in iteration", iter)); - break; - } - - int length = mb->length (); - this->service (mb,iter); - - if (length == 0) - { - ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d got quit, exit!\n", iter)); - delete mb; - break; - } - - this->barrier_.wait (); - this->output (mb); - - delete mb; - } - - // Note that the ACE_Task::svc_run () method automatically removes - // us from the Thread_Manager when the thread exits. - - return 0; -} - -template <class BARRIER> int -Worker_Task<BARRIER>::Producer (void) -{ - // Keep reading stdin, until we reach EOF. - - for (;;) - { - // Allocate a new message. - ACE_Message_Block *mb = new ACE_Message_Block (BUFSIZ); - - if (this->input (mb) == -1) - return -1; - } - - return 0; -} - -template <class BARRIER>int -Worker_Task<BARRIER>::output (ACE_Message_Block *mb) -{ - return this->put_next (mb); -} - -template <class BARRIER>int -Worker_Task<BARRIER>::input (ACE_Message_Block *mb) -{ - ACE_Message_Block *mb1; - -#ifndef manual - static int l= 0; - char str[]="kalle"; - strcpy (mb->rd_ptr (),str); - int n=strlen (str); - if (l==1000) - n=1; - l++; - if (l==0 || (l%100 == 0)) ACE_OS::sleep (5); - if (n <= 1) -#else - ACE_DEBUG ((LM_DEBUG,"(%t) press chars and enter to put a new message into task queue ...\n")); - if ((n = read (0, mb->rd_ptr (), mb->size ())) <= 1) -#endif // manual - { - // Send a shutdown message to the waiting threads and exit. - // cout << "\nvor loop, dump of task msg queue:\n" << endl; - // this->msg_queue ()->dump (); - for (int i=0;i<nt_;i++) - { - ACE_DEBUG ((LM_DEBUG,"(%t) eof, sending block for thread=%d\n",i+1)); - mb1 = new ACE_Message_Block (2); - mb1->length (0); - if (this->put (mb1) == -1) - ACE_ERROR ((LM_ERROR, "(%t) %p\n", "put")); -#ifdef delay_put - ACE_OS::sleep (1); // this sleep helps to shutdown correctly -> was an error! -#endif /* delay_put */ - } - // cout << "\nnach loop, dump of task msg queue:\n" << endl; - // this->msg_queue ()->dump (); - return (-1); - } - else - { - // Send a normal message to the waiting threads and continue producing. - mb->wr_ptr (n); - if (this->put (mb) == -1) - ACE_ERROR ((LM_ERROR, "(%t) %p\n", "put")); - } - return 0; -} - -int -main (int argc, char *argv[]) -{ - int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS; - - ACE_DEBUG ((LM_DEBUG,"(%t) worker threads running=%d\n",n_threads)); - - - Worker_Task<BARRIER_TYPE> *worker_task = - new Worker_Task<BARRIER_TYPE> (ACE_Service_Config::thr_mgr (), - /*n_threads*/ 0,0); - - worker_task->Producer (); - - // Wait for all the threads to reach their exit point. - ACE_DEBUG ((LM_DEBUG,"(%t) waiting with thread manager ...\n")); - ACE_Service_Config::thr_mgr ()->wait (); - ACE_DEBUG ((LM_DEBUG,"(%t) delete worker task ...\n")); - - delete worker_task; - ACE_DEBUG ((LM_DEBUG,"(%t) done correct!\n")); - return 0; -} -#else -int -main (int, char *[]) -{ - ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n")); - return 0; -} -#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_cancel.cpp b/examples/Threads/test_cancel.cpp deleted file mode 100644 index a9d12bea579..00000000000 --- a/examples/Threads/test_cancel.cpp +++ /dev/null @@ -1,72 +0,0 @@ -// Test out the cooperative thread cancellation mechanisms provided by -// $Id$ - -// the ACE_Thread_Manager. - -#include "ace/Service_Config.h" -#include "ace/Thread_Manager.h" - -#if defined (ACE_HAS_THREADS) - -static void * -worker (int iterations) -{ - for (int i = 0; i < iterations; i++) - { - if ((i % 10) == 0 - && (ACE_Service_Config::thr_mgr ()->testcancel (ACE_Thread::self ()) != 0)) - { - ACE_DEBUG ((LM_DEBUG, "(%t) has been cancelled before iteration!\n", i)); - break; - } - } - - return 0; -} - -static const int DEFAULT_THREADS = ACE_DEFAULT_THREADS; -static const int DEFAULT_ITERATIONS = 100000; - -int -main (int argc, char *argv[]) -{ - ACE_Service_Config daemon; - - daemon.open (argv[0]); - - int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : DEFAULT_THREADS; - int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS; - - ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr (); - - int grp_id = thr_mgr->spawn_n (n_threads, ACE_THR_FUNC (worker), - (void *) n_iterations, - THR_NEW_LWP | THR_DETACHED); - - // Wait for 2 seconds and then suspend every thread in the group. - ACE_OS::sleep (2); - thr_mgr->suspend_grp (grp_id); - - // Wait for 2 more seconds and then resume every thread in the - // group. - ACE_OS::sleep (ACE_Time_Value (2)); - thr_mgr->resume_grp (grp_id); - - // Wait for 2 more seconds and then send a SIGINT to every thread in - // the group. - ACE_OS::sleep (ACE_Time_Value (2)); - thr_mgr->kill_grp (grp_id, SIGINT); - - // Wait for 2 more seconds and then exit (which should kill all the - // threads)! - ACE_OS::sleep (ACE_Time_Value (2)); - - return 0; -} -#else -int -main (int, char *[]) -{ - ACE_ERROR_RETURN ((LM_ERROR, "threads not supported on this platform\n"), -1); -} -#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_future1.cpp b/examples/Threads/test_future1.cpp deleted file mode 100644 index 79cf0a42b36..00000000000 --- a/examples/Threads/test_future1.cpp +++ /dev/null @@ -1,420 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// Test_Future.cpp -// -// = DESCRIPTION -// This example tests the ACE Future. -// -// = AUTHOR -// Andres Kruse <Andres.Kruse@cern.ch> and Douglas C. Schmidt -// <schmidt@cs.wustl.edu> -// -// ============================================================================ - -#include <math.h> -#include "ace/Task.h" - -#include "ace/Synch.h" -#include "ace/Message_Queue.h" -#include "ace/Future.h" -#include "ace/Method_Object.h" -#include "ace/Activation_Queue.h" -#include "ace/Auto_Ptr.h" - -#if defined (ACE_HAS_THREADS) - -typedef ACE_Atomic_Op<ACE_Thread_Mutex, u_long> ATOMIC_INT; - -// a counter for the tasks.. -static ATOMIC_INT task_count (0); - -// a counter for the futures.. -static ATOMIC_INT future_count (0); -static ATOMIC_INT future_no (0); - -// a counter for the capsules.. -static ATOMIC_INT capsule_count (0); -static ATOMIC_INT capsule_no (0); - -// a counter for the method objects... -static ATOMIC_INT methodobject_count (0); -static ATOMIC_INT methodobject_no (0); - -class Scheduler : public ACE_Task<ACE_MT_SYNCH> - // = TITLE - // Active Object Scheduler. -{ - friend class Method_ObjectWork; -public: - Scheduler (const char *, Scheduler * = 0); - ~Scheduler (void); - - virtual int open (void *args = 0); - virtual int close (u_long flags = 0); - virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0); - virtual int svc (void); - - ACE_Future<float> work (float param, int count); - ACE_Future<const char*> name (void); - void end (void); - - float work_i (float, int); - const char *name_i (void); - -private: - char *name_; - ACE_Activation_Queue activation_queue_; - Scheduler *scheduler_; - -}; - -class Method_Object_work : public ACE_Method_Object - // = TITLE - // Reification of the <work> method. -{ -public: - Method_Object_work (Scheduler *, float, int, ACE_Future<float> &); - ~Method_Object_work (void); - virtual int call (void); - -private: - Scheduler *scheduler_; - float param_; - int count_; - ACE_Future<float> future_result_; -}; - -Method_Object_work::Method_Object_work (Scheduler* new_Scheduler, - float new_param, - int new_count, - ACE_Future<float> &new_result) - : scheduler_ (new_Scheduler), - param_ (new_param), - count_ (new_count), - future_result_ (new_result) -{ - ACE_DEBUG ((LM_DEBUG, - "(%t) Method_Object_work created\n")); -} - -Method_Object_work::~Method_Object_work (void) -{ - ACE_DEBUG ((LM_DEBUG, "(%t) Method_Object_work will be deleted.\n")); -} - - -int -Method_Object_work::call (void) -{ - return this->future_result_.set (this->scheduler_->work_i (this->param_, this->count_)); -} - -class Method_Object_name : public ACE_Method_Object - // = TITLE - // Reification of the <name> method. -{ -public: - Method_Object_name (Scheduler *, ACE_Future<const char*> &); - ~Method_Object_name (void); - virtual int call (void); - -private: - Scheduler *scheduler_; - ACE_Future<const char*> future_result_; -}; - -Method_Object_name::Method_Object_name (Scheduler *new_scheduler, - ACE_Future<const char*> &new_result) - : scheduler_ (new_scheduler), - future_result_ (new_result) -{ - ACE_DEBUG ((LM_DEBUG, - "(%t) Method_Object_name created\n")); -}; - -Method_Object_name::~Method_Object_name (void) -{ - ACE_DEBUG ((LM_DEBUG, - "(%t) Method_Object_name will be deleted.\n")); -} - -int -Method_Object_name::call (void) -{ - return future_result_.set (scheduler_->name_i ()); -} - -class Method_Object_end : public ACE_Method_Object - // = TITLE - // Reification of the <end> method. -{ -public: - Method_Object_end (Scheduler *new_Scheduler): scheduler_ (new_Scheduler) {} - ~Method_Object_end (void) {} - virtual int call (void) { this->scheduler_->close (); return -1; } - -private: - Scheduler *scheduler_; -}; - -// constructor -Scheduler::Scheduler (const char *newname, Scheduler *new_Scheduler) -{ - ACE_NEW (this->name_, char[ACE_OS::strlen (newname) + 1]); - ACE_OS::strcpy ((char *) this->name_, newname); - this->scheduler_ = new_Scheduler; - ACE_DEBUG ((LM_DEBUG, "(%t) Scheduler %s created\n", this->name_)); -} - -// Destructor -Scheduler::~Scheduler (void) -{ - ACE_DEBUG ((LM_DEBUG, "(%t) Scheduler %s will be destroyed\n", this->name_)); -} - -// open -int -Scheduler::open (void *) -{ - task_count++; - ACE_DEBUG ((LM_DEBUG, "(%t) Scheduler %s open\n", this->name_)); - return this->activate (THR_BOUND); -} - -// close -int -Scheduler::close (u_long) -{ - ACE_DEBUG ((LM_DEBUG, "(%t) Scheduler %s close\n", this->name_)); - task_count--; - return 0; -} - -// put... ?? -int -Scheduler::put (ACE_Message_Block *, ACE_Time_Value *) -{ - return 0; -} - -// service.. -int -Scheduler::svc (void) -{ - for (;;) - { - // Dequeue the next method object (we use an auto pointer in - // case an exception is thrown in the <call>). - ACE_Auto_Ptr<ACE_Method_Object> mo (this->activation_queue_.dequeue ()); - - ACE_DEBUG ((LM_DEBUG, "(%t) calling method object\n")); - // Call it. - if (mo->call () == -1) - break; - // Destructor automatically deletes it. - } - - /* NOTREACHED */ - return 0; -} - -void -Scheduler::end (void) -{ - this->activation_queue_.enqueue (new Method_Object_end (this)); -} - - -// Here's where the Work takes place. -float -Scheduler::work_i (float param, - int count) -{ - float x = 0, y = 0; - - // @@ We should probably do something fun here, like compute the - // Fibonacci sequence or something. - - for (int j = 0; j < count; j++) - { - x = x + param; - y = y + ::sin (x); - } - - return y; -} - -const char * -Scheduler::name_i (void) -{ - char *the_name; - - the_name = new char[ACE_OS::strlen (this->name_) + 1]; - ACE_OS::strcpy (the_name, this->name_); - - return the_name; -} - -ACE_Future<const char *> -Scheduler::name (void) -{ - if (this->scheduler_) - // Delegate to the Scheduler. - return this->scheduler_->name (); - else - { - ACE_Future<const char*> new_future; - - // @@ What happens if new fails here? - this->activation_queue_.enqueue - (new Method_Object_name (this, new_future)); - - return new_future; - } -} - -ACE_Future<float> -Scheduler::work (float newparam, int newcount) -{ - if (this->scheduler_) { - return this->scheduler_->work (newparam, newcount); - } - else { - ACE_Future<float> new_future; - - this->activation_queue_.enqueue - (new Method_Object_work (this, newparam, newcount, new_future)); - return new_future; - } -} - -// @@ These values should be set by the command line options! - -// Total number of iterations to <work> -static int n_iterations = 50000; - -// Total number of loops. -static int n_loops = 100; - -int -main (int, char *[]) -{ - Scheduler *andres, *peter, *helmut, *matias; - - // Create active objects.. - // @@ Should "open" be subsumed within the constructor of - // Scheduler()? - andres = new Scheduler ("andres"); - andres->open (); - peter = new Scheduler ("peter"); - peter->open (); - helmut = new Scheduler ("helmut"); - helmut->open (); - - // Matias passes all asynchronous method calls on to Andres... - matias = new Scheduler ("matias", andres); - matias->open (); - - for (int i = 0; i < n_loops; i++) - { - { - ACE_Future<float> fresulta, fresultb, fresultc, fresultd, fresulte; - ACE_Future<const char*> fname; - - ACE_DEBUG ((LM_DEBUG, "(%t) going to do a non-blocking call\n")); - - fresulta = andres->work (0.01, 100 + (n_iterations * (i % 2))); - fresultb = peter->work (0.01, 100 + (n_iterations * (i % 2))); - fresultc = helmut->work (0.01, 100 + (n_iterations * (i % 2))); - fresultd = matias->work (0.02, 100 + (n_iterations * (i % 2))); - fname = andres->name (); - - // see if the result is available... - if (fresulta.ready ()) - ACE_DEBUG ((LM_DEBUG, "(%t) wow.. work is ready.....\n")); - - ACE_DEBUG ((LM_DEBUG, "(%t) non-blocking call done... now blocking...\n")); - - // Save the result of fresulta. - - fresulte = fresulta; - - if (i % 3 == 0) - { - // Every 3rd time... disconnect the futures... - // but "fresulte" should still contain the result... - fresulta.cancel (10.0); - fresultb.cancel (20.0); - fresultc.cancel (30.0); - fresultd.cancel (40.0); - } - - float resulta = 0, resultb = 0, resultc = 0, resultd = 0, resulte = 0; - - fresulta.get (resulta); - fresultb.get (resultb); - fresultc.get (resultc); - fresultd.get (resultd); - fresulte.get (resulte); - - ACE_DEBUG ((LM_DEBUG, "(%t) result a %f\n", resulte)); - ACE_DEBUG ((LM_DEBUG, "(%t) result b %f\n", resulta)); - ACE_DEBUG ((LM_DEBUG, "(%t) result c %f\n", resultb)); - ACE_DEBUG ((LM_DEBUG, "(%t) result d %f\n", resultc)); - ACE_DEBUG ((LM_DEBUG, "(%t) result e %f\n", resultd)); - - const char *name; - - fname.get (name); - - ACE_DEBUG ((LM_DEBUG, "(%t) name %s\n", name)); - - } - - ACE_DEBUG ((LM_DEBUG, - "(%t) task_count %d future_count %d capsule_count %d methodobject_count %d\n", - (u_long) task_count, - (u_long) future_count, - (u_long) capsule_count, - (u_long) methodobject_count)); - } - - // Close things down. - andres->end (); - peter->end (); - helmut->end (); - matias->end (); - - ACE_OS::sleep (2); - - ACE_DEBUG ((LM_DEBUG, - "(%t) task_count %d future_count %d capsule_count %d methodobject_count %d\n", - (u_long) task_count, - (u_long) future_count, - (u_long) capsule_count, - (u_long) methodobject_count)); - - ACE_DEBUG ((LM_DEBUG,"(%t) th' that's all folks!\n")); - - ACE_OS::sleep (5); - return 0; -} - -#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>; -#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ - -#else -int -main (int, char *[]) -{ - ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n")); - return 0; -} -#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_future2.cpp b/examples/Threads/test_future2.cpp deleted file mode 100644 index 19431072202..00000000000 --- a/examples/Threads/test_future2.cpp +++ /dev/null @@ -1,524 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// Test_Future.cpp -// -// = DESCRIPTION -// This example tests the ACE Future. -// -// = AUTHOR -// Andres Kruse <Andres.Kruse@cern.ch> and Douglas C. Schmidt -// <schmidt@cs.wustl.edu> -// -// Modification History -// Aug. 96; A.Kruse; dev. -// Aug. 96; D.Schmidt; complete workover -// 08/27/96; A.Kruse; - the friends of Scheduler are "Method_Object_name" -// and "Method_Object_work". -// - make the methods "work_i" and "name_i" private -// 09/2/96; D.Schmidt; Integrate with new ACE_Future API and rearrange -// the tests so they are more modular. -// ============================================================================ - -#include <math.h> -#include "ace/Task.h" - -#include "ace/Synch.h" -#include "ace/Message_Queue.h" -#include "ace/Future.h" -#include "ace/Method_Object.h" -#include "ace/Activation_Queue.h" -#include "ace/Auto_Ptr.h" - -#if defined (ACE_HAS_THREADS) - -typedef ACE_Atomic_Op<ACE_Thread_Mutex, u_long> ATOMIC_INT; - -// a counter for the tasks.. -static ATOMIC_INT scheduler_open_count (0); - -// forward declarations -class Method_Object_work; -class Method_Object_name; - -class Scheduler : public ACE_Task<ACE_MT_SYNCH> - // = TITLE - // Active Object Scheduler. -{ - // Every method object has to be able to access the private methods. - - friend class Method_Object_work; - friend class Method_Object_name; - friend class Method_Object_end; -public: - - Scheduler (const char *, Scheduler * = 0); - ~Scheduler (void); - - virtual int open (void *args = 0); - // The method that is used to start the active object. - - // = Here are the methods exported by the class. They return an - // <ACE_Future>. - ACE_Future<float> work (float param, int count); - ACE_Future<char*> name (void); - void end (void); - -private: - virtual int close (u_long flags = 0); - // Should not be accessible from outside... (use end () instead). - - virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0) - { return 0; }; - // Doesn't have any use for this example. - - virtual int svc (void); - // Here the actual servicing of all requests is happening.. - - // = Implementation methods. - float work_i (float, int); - char *name_i (void); - - char *name_; - ACE_Activation_Queue activation_queue_; - Scheduler *scheduler_; -}; - -class Method_Object_work : public ACE_Method_Object - // = TITLE - // Reification of the <work> method. -{ -public: - Method_Object_work (Scheduler *, float, int, ACE_Future<float> &); - ~Method_Object_work (void); - virtual int call (void); - -private: - Scheduler *scheduler_; - float param_; - int count_; - ACE_Future<float> future_result_; -}; - -Method_Object_work::Method_Object_work (Scheduler* new_Scheduler, - float new_param, - int new_count, - ACE_Future<float> &new_result) - : scheduler_ (new_Scheduler), - param_ (new_param), - count_ (new_count), - future_result_ (new_result) -{ -} - -Method_Object_work::~Method_Object_work (void) -{ -} - -int -Method_Object_work::call (void) -{ - return this->future_result_.set (this->scheduler_->work_i (this->param_, this->count_)); -} - -class Method_Object_name : public ACE_Method_Object - // = TITLE - // Reification of the <name> method. -{ -public: - Method_Object_name (Scheduler *, ACE_Future<char*> &); - ~Method_Object_name (void); - virtual int call (void); - -private: - Scheduler *scheduler_; - ACE_Future<char*> future_result_; -}; - - -Method_Object_name::Method_Object_name (Scheduler *new_scheduler, - ACE_Future<char*> &new_result) - : scheduler_ (new_scheduler), - future_result_ (new_result) -{ - ACE_DEBUG ((LM_DEBUG, - " (%t) Method_Object_name created\n")); -}; - -Method_Object_name::~Method_Object_name (void) -{ - ACE_DEBUG ((LM_DEBUG, - " (%t) Method_Object_name will be deleted.\n")); -} - -int -Method_Object_name::call (void) -{ - return future_result_.set (scheduler_->name_i ()); -} - -class Method_Object_end : public ACE_Method_Object - // = TITLE - // Reification of the <end> method. -{ -public: - Method_Object_end (Scheduler *new_Scheduler): scheduler_ (new_Scheduler) {} - ~Method_Object_end (void) {} - virtual int call (void) { this->scheduler_->close (); return -1; } - -private: - Scheduler *scheduler_; -}; - -// constructor -Scheduler::Scheduler (const char *newname, Scheduler *new_Scheduler) -{ - ACE_NEW (this->name_, char[ACE_OS::strlen (newname) + 1]); - ACE_OS::strcpy ((char *) this->name_, newname); - this->scheduler_ = new_Scheduler; - ACE_DEBUG ((LM_DEBUG, " (%t) Scheduler %s created\n", this->name_)); -} - -// Destructor -Scheduler::~Scheduler (void) -{ - ACE_DEBUG ((LM_DEBUG, " (%t) Scheduler %s will be destroyed\n", this->name_)); -} - -int -Scheduler::open (void *) -{ - scheduler_open_count++; - ACE_DEBUG ((LM_DEBUG, " (%t) Scheduler %s open\n", this->name_)); - return this->activate (THR_BOUND); -} - -int -Scheduler::close (u_long) -{ - ACE_DEBUG ((LM_DEBUG, " (%t) Scheduler %s close\n", this->name_)); - scheduler_open_count--; - return 0; -} - -int -Scheduler::svc (void) -{ - // Main event loop for this active object. - for (;;) - { - // Dequeue the next method object (we use an auto pointer in - // case an exception is thrown in the <call>). - ACE_Auto_Ptr<ACE_Method_Object> mo (this->activation_queue_.dequeue ()); - - ACE_DEBUG ((LM_DEBUG, " (%t) calling method object\n")); - // Call it. - if (mo->call () == -1) - break; - // Smart pointer destructor automatically deletes mo. - } - - /* NOTREACHED */ - return 0; -} - -void -Scheduler::end (void) -{ - this->activation_queue_.enqueue (new Method_Object_end (this)); -} - -// Here's where the Work takes place. -float -Scheduler::work_i (float param, - int count) -{ - float x = 0, y = 0; - - for (int j = 0; j < count; j++) - { - x = x + param; - y = y + ::sin (x); - } - - return y; -} - -char * -Scheduler::name_i (void) -{ - char *the_name; - - the_name = new char[ACE_OS::strlen (this->name_) + 1]; - ACE_OS::strcpy (the_name, this->name_); - - return the_name; -} - -ACE_Future<char *> -Scheduler::name (void) -{ - if (this->scheduler_) - // Delegate to the other scheduler - return this->scheduler_->name (); - else - { - ACE_Future<char*> new_future; - - if (this->thr_count () == 0) - { - // This scheduler is inactive... so we execute the user - // request right away... - - ACE_Auto_Ptr<ACE_Method_Object> mo (new Method_Object_name (this, new_future)); - - mo->call (); - // Smart pointer destructor automatically deletes mo. - } - else - // @@ What happens if new fails here? - this->activation_queue_.enqueue - (new Method_Object_name (this, new_future)); - - return new_future; - } -} - -ACE_Future<float> -Scheduler::work (float newparam, int newcount) -{ - if (this->scheduler_) - return this->scheduler_->work (newparam, newcount); - else - { - ACE_Future<float> new_future; - - if (this->thr_count () == 0) - { - ACE_Auto_Ptr<ACE_Method_Object> mo - (new Method_Object_work (this, newparam, newcount, new_future)); - mo->call (); - // Smart pointer destructor automatically deletes it. - } - else - this->activation_queue_.enqueue - (new Method_Object_work (this, newparam, newcount, new_future)); - - return new_future; - } -} - -static int -determine_iterations (void) -{ - int n_iterations; - - ACE_DEBUG ((LM_DEBUG," (%t) determining the number of iterations...\n")); - Scheduler *worker_a = new Scheduler ("worker A"); - - ACE_Time_Value tstart (ACE_OS::gettimeofday ()); - ACE_Time_Value tend (ACE_OS::gettimeofday ()); - - // Determine the number of iterations... we want so many that the - // work () takes about 1 second... - - for (n_iterations = 1; - (tend.sec () - tstart.sec ()) < 1; - n_iterations *= 2) - { - tstart = ACE_OS::gettimeofday (); - - worker_a->work (0.1, n_iterations); - - tend = ACE_OS::gettimeofday (); - } - - ACE_DEBUG ((LM_DEBUG," (%t) n_iterations %d\n", - (u_long) n_iterations)); - - worker_a->end (); - // @@ Can we safely delete worker_a here? - return n_iterations; -} - -static void -test_active_object (int n_iterations) -{ - ACE_DEBUG ((LM_DEBUG," (%t) testing active object pattern...\n")); - // A simple example for the use of the active object pattern and - // futures to return values from an active object. - - Scheduler *worker_a = new Scheduler ("worker A"); - Scheduler *worker_b = new Scheduler ("worker B"); - - // Have worker_c delegate his work to worker_a. - Scheduler *worker_c = new Scheduler ("worker C", worker_a); - - // loop 0: - // test the Schedulers when they are not active. - // now the method objects will be created but since - // there is no active thread they will also be - // immediately executed, in the "main" thread. - // loop 1: - // do the same test but with the schedulers - // activated - for (int i = 0; i < 2; i++) - { - if (i == 1) - { - worker_a->open (); - worker_b->open (); - worker_c->open (); - } - - ACE_Future<float> fresulta = worker_a->work (0.01, n_iterations); - ACE_Future<float> fresultb = worker_b->work (0.02, n_iterations); - ACE_Future<float> fresultc = worker_c->work (0.03, n_iterations); - - if (i == 0) - { - if (!fresulta.ready ()) - ACE_DEBUG ((LM_DEBUG," (%t) ERROR: worker A is should be ready!!!\n")); - if (!fresultb.ready ()) - ACE_DEBUG ((LM_DEBUG," (%t) ERROR: worker B is should be ready!!!\n")); - if (!fresultc.ready ()) - ACE_DEBUG ((LM_DEBUG," (%t) ERROR: worker C is should be ready!!!\n")); - } - - // When the workers are active we will block here until the - // results are available. - - float resulta = fresulta; - float resultb = fresultb; - float resultc = fresultc; - - ACE_Future<char *> fnamea = worker_a->name (); - ACE_Future<char *> fnameb = worker_b->name (); - ACE_Future<char *> fnamec = worker_c->name (); - - char *namea = fnamea; - char *nameb = fnameb; - char *namec = fnamec; - - ACE_DEBUG ((LM_DEBUG, " (%t) result from %s %f\n", - namea, resulta)); - ACE_DEBUG ((LM_DEBUG, " (%t) result from %s %f\n", - nameb, resultb)); - ACE_DEBUG ((LM_DEBUG, " (%t) result from %s %f\n", - namec, resultc)); - } - - ACE_DEBUG ((LM_DEBUG, " (%t) scheduler_open_count %d before end ()\n", - (u_long) scheduler_open_count)); - - worker_a->end (); - worker_b->end (); - worker_c->end (); - - ACE_DEBUG ((LM_DEBUG, " (%t) scheduler_open_count %d immediately after end ()\n", - (u_long) scheduler_open_count)); - - ACE_OS::sleep (2); - - ACE_DEBUG ((LM_DEBUG, " (%t) scheduler_open_count %d after waiting\n", - (u_long) scheduler_open_count)); - // @@ Can we safely delete worker_a, worker_b, and worker_c? -} - -static void -test_cancellation (int n_iterations) -{ - ACE_DEBUG ((LM_DEBUG," (%t) testing cancellation of a future...\n")); - - // Now test the cancelling a future. - - Scheduler *worker_a = new Scheduler ("worker A"); - worker_a->open (); - - ACE_Future<float> fresulta = worker_a->work (0.01, n_iterations); - - // save the result by copying the future - ACE_Future<float> fresultb = fresulta; - - // now we cancel the first future.. but the - // calculation will still go on... - fresulta.cancel (10.0); - - if (!fresulta.ready ()) - ACE_DEBUG ((LM_DEBUG," (%t) ERROR: future A is should be ready!!!\n")); - - float resulta = fresulta; - - ACE_DEBUG ((LM_DEBUG, " (%t) cancelled result %f\n", resulta)); - - if (resulta != 10.0) - ACE_DEBUG ((LM_DEBUG, " (%t) cancelled result should be 10.0!!\n", resulta)); - - resulta = fresultb; - - ACE_DEBUG ((LM_DEBUG, " (%t) true result %f\n", resulta)); - - worker_a->end (); - // @@ Can we safely delete worker_a here? -} - -static void -test_timeout (int n_iterations) -{ - ACE_DEBUG ((LM_DEBUG," (%t) testing timeout on waiting for the result...\n")); - Scheduler *worker_a = new Scheduler ("worker A"); - worker_a->open (); - - ACE_Future<float> fresulta = worker_a->work (0.01, 2 * n_iterations); - - // Should immediately return... and we should see an error... - ACE_Time_Value *delay = new ACE_Time_Value (1); - - float resulta; - fresulta.get (resulta, delay); - - if (fresulta.ready ()) - ACE_DEBUG ((LM_DEBUG," (%t) ERROR: future A is should not be ready!!!\n")); - else - ACE_DEBUG ((LM_DEBUG," (%t) timed out on future A\n")); - - // now we wait until we are done... - fresulta.get (resulta); - ACE_DEBUG ((LM_DEBUG, " (%t) result %f\n", resulta)); - - worker_a->end (); - // @@ Can we safely delete worker_a here? -} - -int -main (int, char *[]) -{ - int n_iterations = determine_iterations (); - - test_active_object (n_iterations); - test_cancellation (n_iterations); - test_timeout (n_iterations); - - ACE_DEBUG ((LM_DEBUG," (%t) that's all folks!\n")); - - ACE_OS::sleep (5); - return 0; -} - -#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>; -#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ - -#else -int -main (int, char *[]) -{ - ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n")); - return 0; -} -#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_manual_event.cpp b/examples/Threads/test_manual_event.cpp deleted file mode 100644 index 26d477fabc0..00000000000 --- a/examples/Threads/test_manual_event.cpp +++ /dev/null @@ -1,108 +0,0 @@ -// The test shows the use of an ACE_Manual_Event to create a -// $Id$ - -// Pseudo_Barrier. Multiple threads are created which do the -// following: -// -// 1. work -// 2. synch with other threads -// 3. more work -// -// ACE_Manual_Event is use to synch with other -// threads. ACE_Manual_Event::signal() is used for broadcasting. - -#include "ace/Service_Config.h" -#include "ace/Synch.h" -#include "ace/Thread_Manager.h" - -#if defined (ACE_HAS_THREADS) -static ACE_Atomic_Op <ACE_Thread_Mutex, u_long> amount_of_work = (u_long) 0; - -class Pseudo_Barrier - // = TITLE - // A barrier class using ACE manual-reset events. - // - // = DESCRIPTION - // This is *not* a real barrier. - // Pseudo_Barrier is more like a ``one shot'' barrier. - // All waiters after the Nth waiter are allowed to go. - // The barrier does not reset after the Nth waiter. - // For an example of a real barrier, please see class ACE_Barrier. -{ -public: - Pseudo_Barrier (u_long count); - - int wait (void); - -private: - ACE_Atomic_Op <ACE_Thread_Mutex, u_long> counter_; - ACE_Manual_Event event_; -}; - -Pseudo_Barrier::Pseudo_Barrier (u_long count) - : counter_ (count) -{ -} - -int -Pseudo_Barrier::wait (void) -{ - if (--this->counter_ == 0) - return this->event_.signal (); - else - return this->event_.wait (); -} - -static void * -worker (void *arg) -{ - ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ()); - Pseudo_Barrier &barrier = *(Pseudo_Barrier *) arg; - - // work - ACE_DEBUG ((LM_DEBUG, "(%t) working (%d secs)\n", ++::amount_of_work)); - ACE_OS::sleep (::amount_of_work); - - // synch with everybody else - ACE_DEBUG ((LM_DEBUG, "(%t) waiting to synch with others \n")); - barrier.wait (); - - // more work - ACE_DEBUG ((LM_DEBUG, "(%t) more work (%d secs)\n", ++::amount_of_work)); - ACE_OS::sleep (amount_of_work); - - ACE_DEBUG ((LM_DEBUG, "(%t) dying \n")); - - return 0; -} - -int -main (int argc, char **argv) -{ - int n_threads = argc == 2 ? atoi (argv[1]) : 5; - - ACE_Thread_Manager &tm = *ACE_Service_Config::thr_mgr (); - - // synch object shared by all threads - Pseudo_Barrier barrier (n_threads); - - // create workers - if (tm.spawn_n (n_threads, worker, &barrier) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "thread creates for worker failed"), -1); - - // wait for all workers to exit - if (tm.wait () == -1) - ACE_ERROR_RETURN ((LM_ERROR, "thread wait failed"), -1); - else - ACE_DEBUG ((LM_ERROR, "graceful exit\n")); - - return 0; -} -#else -int -main (int, char *[]) -{ - ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n")); - return 0; -} -#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_process_mutex.cpp b/examples/Threads/test_process_mutex.cpp deleted file mode 100644 index fb23c8b73be..00000000000 --- a/examples/Threads/test_process_mutex.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// $Id$ - -// This program tests ACE_Process_Mutexes. To run it, open 3 or 4 -// windows and run this program in each window... - -#include "ace/Synch.h" -#include "ace/Signal.h" - -#if defined (ACE_HAS_THREADS) - -static sig_atomic_t done; - -extern "C" void -handler (int) -{ - done = 1; -} - -int -main (int argc, char *argv[]) -{ - char *name = argc > 1 ? argv[1] : "hello"; - int iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : 100; - - ACE_Process_Mutex pm (name); - - // Register a signal handler. - ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT); - - for (int i = 0; i < iterations && !done; i++) - { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) = acquiring\n")); - if (pm.acquire () == -1) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "acquire failed")); - else - ACE_DEBUG ((LM_DEBUG, "(%P|%t) = acquired\n")); - - ACE_OS::sleep (3); - - if (pm.release () == -1) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "release failed")); - else - ACE_DEBUG ((LM_DEBUG, "(%P|%t) = released\n")); - - if (pm.tryacquire () == -1) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "tryacquire failed")); - else - ACE_DEBUG ((LM_DEBUG, "(%P|%t) = tryacquire\n")); - - if (pm.release () == -1) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "release failed")); - else - ACE_DEBUG ((LM_DEBUG, "(%P|%t) = released\n")); - } - - if (argc > 2) - pm.remove (); - return 0; -} -#else -int -main (void) -{ - ACE_ERROR_RETURN ((LM_ERROR, - "ACE doesn't support support threads on this platform (yet)\n"), - -1); -} -#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_process_semaphore.cpp b/examples/Threads/test_process_semaphore.cpp deleted file mode 100644 index d7933897f8e..00000000000 --- a/examples/Threads/test_process_semaphore.cpp +++ /dev/null @@ -1,56 +0,0 @@ -// $Id$ - -// This program tests ACE_Process_Semaphore. To run it, open 3 or 4 -// windows and run this program in each window... - -#include "ace/Synch.h" -#include "ace/Signal.h" - -static sig_atomic_t done; - -extern "C" void -handler (int) -{ - done = 1; -} - -int -main (int argc, char *argv[]) -{ - char *name = argc == 1 ? "hello" : argv[1]; - - ACE_Process_Semaphore pm (1, name); - - ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT); - - for (int i = 0; i < 100 && !done; i++) - { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) = acquiring\n")); - if (pm.acquire () == -1) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "acquire failed")); - else - ACE_DEBUG ((LM_DEBUG, "(%P|%t) = acquired\n")); - - ACE_OS::sleep (3); - - if (pm.release () == -1) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "release failed")); - else - ACE_DEBUG ((LM_DEBUG, "(%P|%t) = released\n")); - - if (pm.tryacquire () == -1) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "tryacquire failed")); - else - ACE_DEBUG ((LM_DEBUG, "(%P|%t) = tryacquire\n")); - - if (pm.release () == -1) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "release failed")); - else - ACE_DEBUG ((LM_DEBUG, "(%P|%t) = released\n")); - } - - if (argc > 2) - pm.remove (); - return 0; -} - diff --git a/examples/Threads/test_reader_writer.cpp b/examples/Threads/test_reader_writer.cpp deleted file mode 100644 index ef888133d83..00000000000 --- a/examples/Threads/test_reader_writer.cpp +++ /dev/null @@ -1,187 +0,0 @@ -// This test program verifies the functionality of the ACE_OS -// $Id$ - -// implementation of readers/writer locks on Win32 and Posix pthreads. - - -#include "ace/Synch.h" -#include "ace/Thread.h" -#include "ace/Thread_Manager.h" -#include "ace/Get_Opt.h" - -#if defined (ACE_HAS_THREADS) - -// Default number of iterations. -static size_t n_iterations = 1000; - -// Default number of loops. -static size_t n_loops = 100; - -// Default number of readers. -static size_t n_readers = 6; - -// Default number of writers. -static size_t n_writers = 2; - -// Thread id of last writer. -volatile static int shared_data; - -// Lock for shared_data. -static ACE_RW_Mutex rw_mutex; - -// Count of the number of readers and writers. -ACE_Atomic_Op<ACE_Thread_Mutex, int> current_readers, current_writers; - -// Thread manager -static ACE_Thread_Manager thr_mgr; - -// Explain usage and exit. -static void -print_usage_and_die (void) -{ - ACE_DEBUG ((LM_DEBUG, - "usage: %n [-r n_readers] [-w n_writers] [-n iteration_count]\n")); - ACE_OS::exit (1); -} - -// Parse the command-line arguments and set options. -static void -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opt (argc, argv, "r:w:n:l:"); - - int c; - - while ((c = get_opt ()) != -1) - switch (c) - { - case 'r': - n_readers = ACE_OS::atoi (get_opt.optarg); - break; - case 'w': - n_writers = ACE_OS::atoi (get_opt.optarg); - break; - case 'n': - n_iterations = ACE_OS::atoi (get_opt.optarg); - break; - case 'l': - n_loops = ACE_OS::atoi (get_opt.optarg); - break; - default: - print_usage_and_die (); - break; - } -} - -// Iterate <n_iterations> each time checking that nobody modifies the data -// while we have a read lock. - -static void * -reader (void *) -{ - ACE_Thread_Control tc (&thr_mgr); - ACE_DEBUG ((LM_DEBUG, "(%t) reader starting\n")); - - for (int iterations = 1; iterations <= n_iterations; iterations++) - { - ACE_Read_Guard<ACE_RW_Mutex> g(rw_mutex); - int n = ++current_readers; - //ACE_DEBUG ((LM_DEBUG, "(%t) I'm reader number %d\n", n)); - - if (current_writers > 0) - ACE_DEBUG ((LM_DEBUG, "(%t) writers found!!!\n")); - - int data = shared_data; - - for (int loop = 1; loop <= n_loops; loop++) - { - ACE_Thread::yield(); - if (shared_data != data) - ACE_DEBUG ((LM_DEBUG, - "(%t) somebody changed %d to %d\n", - data, shared_data)); - } - - --current_readers; - //ACE_DEBUG ((LM_DEBUG, "(%t) done with reading guarded data\n")); - - ACE_Thread::yield (); - } - return 0; -} - -// Iterate <n_iterations> each time modifying the global data -// and checking that nobody steps on it while we can write it. - -static void * -writer (void *) -{ - ACE_Thread_Control tc (&thr_mgr); - ACE_DEBUG ((LM_DEBUG, "(%t) writer starting\n")); - - for (int iterations = 1; iterations <= n_iterations; iterations++) - { - ACE_Write_Guard<ACE_RW_Mutex> g(rw_mutex); - - ++current_writers; - //ACE_DEBUG ((LM_DEBUG, "(%t) writing to guarded data\n")); - - if (current_writers > 1) - ACE_DEBUG ((LM_DEBUG, "(%t) other writers found!!!\n")); - - if (current_readers > 0) - ACE_DEBUG ((LM_DEBUG, "(%t) readers found!!!\n")); - - int self = (int) ACE_Thread::self (); - shared_data = self; - - for (int loop = 1; loop <= n_loops; loop++) - { - ACE_Thread::yield(); - if (shared_data != self) - ACE_DEBUG ((LM_DEBUG, "(%t) somebody wrote on my data %d\n", shared_data)); - } - - --current_writers; - - //ACE_DEBUG ((LM_DEBUG, "(%t) done with guarded data\n")); - ACE_Thread::yield (); - } - return 0; -} - -// Spawn off threads. - -int main (int argc, char *argv[]) -{ - ACE_LOG_MSG->open (argv[0]); - parse_args (argc, argv); - - current_readers = 0; // Possibly already done - current_writers = 0; // Possibly already done - - ACE_DEBUG ((LM_DEBUG, "(%t) main thread starting\n")); - - if (thr_mgr.spawn_n (n_readers, reader, 0, THR_NEW_LWP) == -1 || - thr_mgr.spawn_n (n_writers, writer, 0, THR_NEW_LWP) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn_n"), 1); - - thr_mgr.wait (); - - ACE_DEBUG ((LM_DEBUG, "(%t) exiting main thread\n")); - return 0; -} - -#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template class ACE_Atomic_Op<ACE_Thread_Mutex, int>; -#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ - -#else -int -main (int, char *[]) -{ - ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n")); - return 0; -} -#endif /* ACE_HAS_THREADS */ - diff --git a/examples/Threads/test_recursive_mutex.cpp b/examples/Threads/test_recursive_mutex.cpp deleted file mode 100644 index 1cc2892b2a8..00000000000 --- a/examples/Threads/test_recursive_mutex.cpp +++ /dev/null @@ -1,108 +0,0 @@ -// $Id$ - -// This test program verifies the functionality of the ACE_OS -// implementation of recursive mutexes on Win32 and Posix pthreads. - -#include "ace/Service_Config.h" -#include "ace/Get_Opt.h" -#include "ace/Synch.h" - -#if defined (ACE_HAS_THREADS) - -// Total number of iterations. -static size_t n_iterations = 1000; -static size_t n_threads = 4; - -// Explain usage and exit. -static void -print_usage_and_die (void) -{ - ACE_DEBUG ((LM_DEBUG, - "usage: %n [-t n_threads] [-n iteration_count]\n")); - ACE_OS::exit (1); -} - -// Parse the command-line arguments and set options. - -static void -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opt (argc, argv, "n:t:"); - - int c; - - while ((c = get_opt ()) != -1) - switch (c) - { - case 'n': - n_iterations = ACE_OS::atoi (get_opt.optarg); - break; - case 't': - n_threads = ACE_OS::atoi (get_opt.optarg); - break; - default: - print_usage_and_die (); - break; - } -} - -static void -recursive_worker (size_t nesting_level, - ACE_Recursive_Thread_Mutex *rm) -{ - if (nesting_level < n_iterations) - { - ACE_DEBUG ((LM_DEBUG, - "(%P|%t) = trying to acquire, nesting = %d, thread id = %u\n", - rm->get_nesting_level (), rm->get_thread_id ())); - { - // This illustrates the use of the ACE_Guard<LOCK> with an - // ACE_Recursive_Thread_Mutex. - ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, *rm); - ACE_DEBUG ((LM_DEBUG, - "(%P|%t) = acquired, nesting = %d, thread id = %u\n", - rm->get_nesting_level (), rm->get_thread_id ())); - - recursive_worker (nesting_level + 1, rm); - } - ACE_DEBUG ((LM_DEBUG, - "(%P|%t) = released, nesting = %d, thread id = %u\n", - rm->get_nesting_level (), rm->get_thread_id ())); - } -} - -static void * -worker (void *arg) -{ - ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ()); - - ACE_Recursive_Thread_Mutex *rm = (ACE_Recursive_Thread_Mutex *) arg; - - recursive_worker (0, rm); - return 0; -} - -int -main (int argc, char *argv[]) -{ - ACE_Service_Config daemon (argv[0]); - - parse_args (argc, argv); - ACE_Recursive_Thread_Mutex rm; - - ACE_Service_Config::thr_mgr ()->spawn_n (n_threads, - ACE_THR_FUNC (worker), - (void *) &rm); - - ACE_Service_Config::thr_mgr ()->wait (); - return 0; -} -#else -int -main (void) -{ - ACE_ERROR_RETURN ((LM_ERROR, - "ACE doesn't support support process mutexes on this platform (yet)\n"), - -1); -} -#endif /* ACE_WIN32 */ diff --git a/examples/Threads/test_task.cpp b/examples/Threads/test_task.cpp deleted file mode 100644 index 7cd7976d2bb..00000000000 --- a/examples/Threads/test_task.cpp +++ /dev/null @@ -1,104 +0,0 @@ -// This test program illustrates how the ACE barrier synchronization -// $Id$ - -// mechanisms work in conjunction with the ACE_Task and the -// ACE_Thread_Manager. It is instructive to compare this with the -// test_barrier.cpp test to see how they differ. - -#include "ace/Task.h" -#include "ace/Service_Config.h" -#include "ace/Log_Msg.h" - -#if defined (ACE_HAS_THREADS) - -#include "ace/Task.h" - -class Barrier_Task : public ACE_Task<ACE_MT_SYNCH> -{ -public: - Barrier_Task (ACE_Thread_Manager *thr_mgr, - int n_threads, - int n_iterations); - - virtual int svc (void); - // Iterate <n_iterations> time printing off a message and "waiting" - // for all other threads to complete this iteration. - -private: - ACE_Barrier barrier_; - // Reference to the tester barrier. This controls each - // iteration of the tester function running in every thread. - - int n_iterations_; - // Number of iterations to run. - - // = Not needed for this test. - virtual int open (void *) { return 0; } - virtual int close (u_long) { return 0; } - virtual int put (ACE_Message_Block *, ACE_Time_Value *) { return 0; } -}; - -Barrier_Task::Barrier_Task (ACE_Thread_Manager *thr_mgr, - int n_threads, - int n_iterations) - : ACE_Task<ACE_MT_SYNCH> (thr_mgr), - barrier_ (n_threads), - n_iterations_ (n_iterations) -{ - // Create worker threads. - if (this->activate (THR_NEW_LWP, n_threads) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "activate failed")); -} - -// Iterate <n_iterations> time printing off a message and "waiting" -// for all other threads to complete this iteration. - -int -Barrier_Task::svc (void) -{ - // Note that the ACE_Task::svc_run() method automatically adds us to - // the Thread_Manager when the thread begins. - - for (int iterations = 1; - iterations <= this->n_iterations_; - iterations++) - { - ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d\n", iterations)); - - // Block until all other threads have waited, then continue. - this->barrier_.wait (); - } - - // Note that the ACE_Task::svc_run() method automatically removes us - // from the Thread_Manager when the thread exits. - - return 0; -} - -// Default number of threads to spawn. -static const int DEFAULT_ITERATIONS = 5; - -int -main (int argc, char *argv[]) -{ - int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS; - int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS; - - Barrier_Task barrier_task (ACE_Service_Config::thr_mgr (), - n_threads, - n_iterations); - - // Wait for all the threads to reach their exit point. - ACE_Service_Config::thr_mgr ()->wait (); - - ACE_DEBUG ((LM_DEBUG, "(%t) done\n")); - return 0; -} -#else -int -main (int, char *[]) -{ - ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n")); - return 0; -} -#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_task_four.cpp b/examples/Threads/test_task_four.cpp deleted file mode 100644 index 64209cb3430..00000000000 --- a/examples/Threads/test_task_four.cpp +++ /dev/null @@ -1,248 +0,0 @@ -// $Id$ - -// The following test was written by Hamutal Yanay & Ari Erev's -// (Ari_Erev@comverse.com). -// -// This test program test enhancements to the thread_manager and task -// classes. The purpose of these enhancements was to allow the -// thread_manager to recognize the concept of an ACE_Task and to be -// able to group ACE_Tasks in groups. -// -// There are two main ACE_Tasks in this sample: -// -// Invoker_Task - is run from main (). It's purpose is to run a number of -// ACE_Tasks of type Worker_Task. The number can be specified -// on the command line. -// After starting the tasks, the Invoker_Task groups all the tasks -// in one group and then uses the -// num_tasks_in_group () to find out if the real number of tasks -// that are now running (should be the same as the number of tasks -// started). -// It also, suspends and resumes all the threads in the group to -// test the suspend_grp () and resume_grp () methods. -// Then it waits for all the tasks to end. -// Worker_Task - ACE_Tasks that are started by the Invoker_Task. -// Each Worker_Task can start a number of threads. -// The Worker_Task threads perform some work (iteration). The number -// of the iterations can be specified on the command line. -// -// The command line syntax is: -// -// test_task [num_tasks] [num_threads] [num_iterations] - -#include "ace/Task.h" -#include "ace/Service_Config.h" - - -#if defined (ACE_HAS_THREADS) - -#include "ace/Task.h" - -class Invoker_Task : public ACE_Task<ACE_MT_SYNCH> -{ -public: - Invoker_Task (ACE_Thread_Manager *thr_mgr, - int n_tasks, - int n_threads, - int n_iterations); - virtual int svc (void); - // creats <n_tasks> and wait for them to finish - -private: - int n_tasks_; - // Number of tasks to start. - int n_threads_; - // Number of threads per task. - int n_iterations_; - // Number of iterations per thread. - - // = Not needed for this test. - virtual int open (void *) { return 0; } - virtual int close (u_long) { return 0; } - virtual int put (ACE_Message_Block *, ACE_Time_Value *) { return 0; } -}; - -class Worker_Task : public ACE_Task<ACE_MT_SYNCH> -{ -public: - Worker_Task (ACE_Thread_Manager *thr_mgr, - int n_threads, - int n_iterations); - virtual int svc (void); - // Does a small work... - virtual int open (void * = NULL); -private: - static int workers_count_; - int index_; - int n_threads_; - int n_iterations_; - - // = Not needed for this test. - virtual int close (u_long) { return 0; } - virtual int put (ACE_Message_Block *, ACE_Time_Value *) { return 0; } -}; - -int Worker_Task::workers_count_ = 1; - -Worker_Task::Worker_Task (ACE_Thread_Manager *thr_mgr, - int n_threads, - int n_iterations) - : n_threads_ (n_threads), - n_iterations_ (n_iterations), - ACE_Task<ACE_MT_SYNCH> (thr_mgr) -{ - index_ = workers_count_++; -} - -int -Worker_Task::open (void *) -{ - // Create worker threads. - int rc = this->activate (THR_NEW_LWP, n_threads_, 0, 0, -1, this); - - if (rc == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "activate failed")); - - return rc; -} - -int -Worker_Task::svc (void) -{ - ACE_DEBUG ((LM_DEBUG, " (%t) in worker %d\n", index_)); - - for (int iterations = 1; - iterations <= this->n_iterations_; - iterations++) - { - ACE_DEBUG ((LM_DEBUG, " (%t) in iteration %d\n", iterations)); - ACE_OS::sleep (0); - } - - ACE_DEBUG ((LM_DEBUG, " (%t) worker %d ends\n", index_)); - - return 0; -} - -Invoker_Task::Invoker_Task (ACE_Thread_Manager *thr_mgr, - int n_tasks, - int n_threads, - int n_iterations) - : n_tasks_ (n_tasks), - n_threads_ (n_threads), - n_iterations_ (n_iterations), - ACE_Task<ACE_MT_SYNCH> (thr_mgr) -{ - // Create worker threads. - if (this->activate (THR_NEW_LWP, 1, 0, 0, -1, this) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "activate failed")); -} - -// Iterate <n_iterations> time printing off a message and "waiting" -// for all other threads to complete this iteration. - -int -Invoker_Task::svc (void) -{ - // Note that the ACE_Task::svc_run () method automatically adds us to - // the Thread_Manager when the thread begins. - - ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr (); - Worker_Task **pTask = new Worker_Task* [n_tasks_]; - - for (int task = 0; - task < this->n_tasks_; - task++) - { - ACE_DEBUG ((LM_DEBUG, " (%t) in task %d\n", task+1)); - pTask[task] = new Worker_Task (thr_mgr, n_threads_, n_iterations_); - pTask[task]->open (); - } - - // Set all tasks to be one group - ACE_DEBUG ((LM_DEBUG, " (%t) setting tasks group id\n")); - for (task = 0; - task < this->n_tasks_; - task++) - if (thr_mgr->set_grp (pTask[task], 1) == -1) - ACE_ERROR ((LM_DEBUG, " (%t) %p\n", "set_grp")); - - int nTasks = thr_mgr->num_tasks_in_group (1); - cout << "Number of tasks in group 1: " << nTasks << endl; - - // Wait for 1 second and then suspend every thread in the group. - ACE_OS::sleep (1); - ACE_DEBUG ((LM_DEBUG, " (%t) suspending group\n")); - if (thr_mgr->suspend_grp (1) == -1) - ACE_ERROR ((LM_DEBUG, " (%t) %p\n", "suspend_grp")); - - // Wait for 5 more second and then resume every thread in the - // group. - ACE_OS::sleep (ACE_Time_Value (5)); - - // @QTSK This ACE_DEBUG statement blows us away! can't understand why - ACE_DEBUG ((LM_DEBUG, " (%t) resuming group\n")); - if (thr_mgr->resume_grp (1) == -1) - ACE_ERROR ((LM_DEBUG, " (%t) %p\n", "resume_grp")); - - - // Wait for all the tasks to reach their exit point. - thr_mgr->wait (); - - // Note that the ACE_Task::svc_run () method automatically removes us - // from the Thread_Manager when the thread exits. - - return 0; -} - -// Default number of tasks and iterations. -static const int DEFAULT_TASKS = 4; -static const int DEFAULT_ITERATIONS = 5; - -int -main (int argc, char *argv[]) -{ - int n_tasks = argc > 1 ? ACE_OS::atoi (argv[1]) : DEFAULT_TASKS; - int n_threads = argc > 2 ? ACE_OS::atoi (argv[2]) : ACE_DEFAULT_THREADS; - int n_iterations = argc > 3 ? ACE_OS::atoi (argv[3]) : DEFAULT_ITERATIONS; - - // Since ACE_Thread_Manager can only wait for all threads, we'll have - // special manager for the Invoker_Task. - ACE_Thread_Manager invoker_manager; - - Invoker_Task invoker (&invoker_manager, - n_tasks, - n_threads, - n_iterations); - - // Wait for 1 second and then suspend the invoker task - ACE_OS::sleep (1); - ACE_DEBUG ((LM_DEBUG, " (%t) suspending invoker task\n")); - - if (invoker_manager.suspend_task (&invoker) == -1) - ACE_ERROR ((LM_DEBUG, " (%t) %p\n", "suspend_task")); - - // Wait for 5 more second and then resume the invoker task. - ACE_OS::sleep (ACE_Time_Value (5)); - - // @QTSK This ACE_DEBUG statement blows us away! can't understand why - ACE_DEBUG ((LM_DEBUG, " (%t) resuming invoker task\n")); - if (invoker_manager.resume_task (&invoker) == -1) - ACE_ERROR ((LM_DEBUG, " (%t) %p\n", "resume_task")); - - - // Wait for all the threads to reach their exit point. - invoker_manager.wait (); - - // @QTSK This ACE_DEBUG statement blows us away! can't understand why - ACE_DEBUG ((LM_DEBUG, " (%t) done\n")); - return 0; -} -#else -int -main (int, char *[]) -{ - ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n")); - return 0; -} -#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_task_one.cpp b/examples/Threads/test_task_one.cpp deleted file mode 100644 index d0a8a12e6c4..00000000000 --- a/examples/Threads/test_task_one.cpp +++ /dev/null @@ -1,104 +0,0 @@ -// This test program illustrates how the ACE barrier synchronization -// $Id$ - -// mechanisms work in conjunction with the ACE_Task and the -// ACE_Thread_Manager. It is instructive to compare this with the -// test_barrier.cpp test to see how they differ. - -#include "ace/Task.h" -#include "ace/Service_Config.h" - - -#if defined (ACE_HAS_THREADS) - -#include "ace/Task.h" - -class Barrier_Task : public ACE_Task<ACE_MT_SYNCH> -{ -public: - Barrier_Task (ACE_Thread_Manager *thr_mgr, - int n_threads, - int n_iterations); - - virtual int svc (void); - // Iterate <n_iterations> time printing off a message and "waiting" - // for all other threads to complete this iteration. - -private: - ACE_Barrier barrier_; - // Reference to the tester barrier. This controls each - // iteration of the tester function running in every thread. - - int n_iterations_; - // Number of iterations to run. - - // = Not needed for this test. - virtual int open (void *) { return 0; } - virtual int close (u_long) { return 0; } - virtual int put (ACE_Message_Block *, ACE_Time_Value *) { return 0; } -}; - -Barrier_Task::Barrier_Task (ACE_Thread_Manager *thr_mgr, - int n_threads, - int n_iterations) - : ACE_Task<ACE_MT_SYNCH> (thr_mgr), - barrier_ (n_threads), - n_iterations_ (n_iterations) -{ - // Create worker threads. - if (this->activate (THR_NEW_LWP, n_threads) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "activate failed")); -} - -// Iterate <n_iterations> time printing off a message and "waiting" -// for all other threads to complete this iteration. - -int -Barrier_Task::svc (void) -{ - // Note that the ACE_Task::svc_run() method automatically adds us to - // the Thread_Manager when the thread begins. - - for (int iterations = 1; - iterations <= this->n_iterations_; - iterations++) - { - ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d\n", iterations)); - - // Block until all other threads have waited, then continue. - this->barrier_.wait (); - } - - // Note that the ACE_Task::svc_run() method automatically removes us - // from the Thread_Manager when the thread exits. - - return 0; -} - -// Default number of threads to spawn. -static const int DEFAULT_ITERATIONS = 5; - -int -main (int argc, char *argv[]) -{ - int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS; - int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS; - - Barrier_Task barrier_task (ACE_Service_Config::thr_mgr (), - n_threads, - n_iterations); - - // Wait for all the threads to reach their exit point. - ACE_Service_Config::thr_mgr ()->wait (); - - ACE_DEBUG ((LM_DEBUG, "(%t) done\n")); - return 0; -} -#else -int -main (int, char *[]) -{ - ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n")); - return 0; -} -#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_task_three.cpp b/examples/Threads/test_task_three.cpp deleted file mode 100644 index c6ad69511b5..00000000000 --- a/examples/Threads/test_task_three.cpp +++ /dev/null @@ -1,230 +0,0 @@ -// $Id$ - -// Exercise more tests for the ACE Tasks. This also shows off some -// Interesting uses of the ACE Log_Msg's ability to print to ostreams. -// BTW, make sure that you set the out_stream in *every* thread that -// you want to have write to the output file, i.e.: -// -// -// if (out_stream) -// { -// ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); -// ACE_LOG_MSG->msg_ostream (out_stream); -// } - -#include <fstream.h> -#include "ace/Reactor.h" -#include "ace/Service_Config.h" -#include "ace/Task.h" - - -#if defined (ACE_HAS_THREADS) - -static ofstream *out_stream = 0; - -static const int NUM_INVOCATIONS = 100; -static const int TASK_COUNT = 130; - -class Test_Task : public ACE_Task<ACE_MT_SYNCH> -{ -public: - Test_Task (void); - ~Test_Task (void); - - virtual int open (void *args = 0); - virtual int close (u_long flags = 0); - virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0); - virtual int svc (void); - - virtual int handle_input (ACE_HANDLE fd); - - ACE_Reactor *r_; - int handled_; - static int current_count_; - static int done_cnt_; -}; - -int Test_Task::current_count_ = 0; -int Test_Task::done_cnt_ = 0; - -static ACE_Thread_Mutex lock_; - -Test_Task::Test_Task (void) -{ - ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_); - - this->handled_ = 0; - Test_Task::current_count_++; - ACE_DEBUG ((LM_DEBUG, - "Test_Task constructed, current_count_ = %d\n", - Test_Task::current_count_)); -} - -Test_Task::~Test_Task (void) -{ - ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_); - - ACE_DEBUG ((LM_DEBUG, "Test_Task destroyed, current_count_ = %d\n", - Test_Task::current_count_)); -} - -int -Test_Task::open (void *args) -{ - r_ = (ACE_Reactor *) args; - return ACE_Task<ACE_MT_SYNCH>::activate (THR_NEW_LWP); -} - -int -Test_Task::close (u_long) -{ - ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock_, -1); - - Test_Task::current_count_--; - ACE_DEBUG ((LM_DEBUG, "Test_Task::close () current_count_ = %d.\n", - Test_Task::current_count_)); - return 0; -} - -int -Test_Task::put (ACE_Message_Block *, ACE_Time_Value *) -{ - return 0; -} - -Test_Task::svc (void) -{ - // Every thread must register the same stream to write to file. - if (out_stream) - { - ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); - ACE_LOG_MSG->msg_ostream (out_stream); - } - - for (int index = 0; index < NUM_INVOCATIONS; index++) - { - ACE_OS::thr_yield (); - - if (r_->notify (this, ACE_Event_Handler::READ_MASK)) - { - ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock_, -1); - - ACE_DEBUG ((LM_DEBUG, "Test_Task: error notifying reactor!\n")); - } - } - - ACE_DEBUG ((LM_DEBUG, " (%t) returning from svc ()\n")); - return 0; -} - -int -Test_Task::handle_input (ACE_HANDLE) -{ - this->handled_++; - - if (this->handled_ == NUM_INVOCATIONS) - { - ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock_, -1); - Test_Task::done_cnt_++; - ACE_DEBUG ((LM_DEBUG, - " (%t) Test_Task: handle_input! done_cnt_ = %d.\n", - Test_Task::done_cnt_)); - } - - ACE_OS::thr_yield (); - return -1; -} - -static void * -dispatch (void *arg) -{ - // every thread must register the same stream to write to file - if (out_stream) - { - ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); - ACE_LOG_MSG->msg_ostream (out_stream); - } - - ACE_DEBUG ((LM_DEBUG, " (%t) Dispatcher Thread started!\n")); - ACE_Reactor *r = (ACE_Reactor *) arg; - int result; - - r->owner (ACE_OS::thr_self ()); - - while (1) - { - result = r->handle_events (); - if (result <= 0) - ACE_DEBUG ((LM_DEBUG, "Dispatch: handle_events (): %d", result)); - } - - return 0; -} - -extern "C" void -handler (int) -{ - *out_stream << flush; - out_stream->close (); - ACE_OS::exit (42); -} - -int -main (int argc, char **argv) -{ - if (argc > 1) - { - // Send output to file. - out_stream = new ofstream ("test_task_three.out", ios::trunc|ios::out); - ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); - ACE_LOG_MSG->msg_ostream (out_stream); - } - - // Register a signal handler. - ACE_Sig_Action sa (ACE_SignalHandler (handler), SIGINT); - - ACE_Reactor *reactor1 = ACE_Service_Config::reactor (); - ACE_Reactor *reactor2 = new ACE_Reactor (); - - Test_Task t1[TASK_COUNT]; - Test_Task t2[TASK_COUNT]; - - ACE_Thread::spawn (ACE_THR_FUNC (dispatch), reactor2); - - reactor1->owner (ACE_OS::thr_self ()); - - for (int index = 0; index < TASK_COUNT; index++) - { - t1[index].open (reactor1); - t2[index].open (reactor2); - } - - ACE_OS::sleep (3); - - for (;;) - { - ACE_Time_Value timeout (2); - - if (reactor1->handle_events (timeout) <= 0) - { - if (errno == ETIME) - { - ACE_DEBUG ((LM_DEBUG, "no activity within 2 seconds, shutting down\n")); - break; - } - else - ACE_ERROR ((LM_ERROR, "%p error handling events\n", "main")); - } - } - - return 0; -} - -#else -int -main (int, char *[]) -{ - ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n")); - return 0; -} -#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_task_two.cpp b/examples/Threads/test_task_two.cpp deleted file mode 100644 index 9f25962c795..00000000000 --- a/examples/Threads/test_task_two.cpp +++ /dev/null @@ -1,156 +0,0 @@ -// $Id$ - -// Exercise more tests for the ACE Tasks. This test can spawn off -// zillions of tasks and then wait for them using both polling and the -// ACE Thread Manager. - -#include "ace/Task.h" - -#include "ace/Service_Config.h" -#include "ace/Synch.h" - -#if defined (ACE_HAS_THREADS) - -typedef ACE_Atomic_Op<ACE_Thread_Mutex, u_long> ATOMIC_INT; - -static u_long zero = 0; -static ATOMIC_INT task_count (zero); -static ATOMIC_INT max_count (zero); -static ATOMIC_INT wait_count (zero); - -static u_long n_threads = 0; - -// Default number of tasks. -static const int default_threads = ACE_DEFAULT_THREADS; - -// Default number of times to run the test. -static const int default_iterations = 1000; - -class Task_Test : public ACE_Task<ACE_MT_SYNCH> -{ -public: - virtual int open (void *args = 0); - virtual int close (u_long flags = 0); - virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0); - virtual int svc (void); - -private: - static ACE_Thread_Mutex lock_; -}; - -ACE_Thread_Mutex Task_Test::lock_; - -int -Task_Test::open (void *) -{ - ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Task_Test::lock_, -1); - - task_count++; - ACE_DEBUG ((LM_DEBUG, "(%t) creating Task_Test, task count = %d\n", - (u_long) task_count)); - - return this->activate (THR_BOUND); -} - -int -Task_Test::close (u_long) -{ - ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Task_Test::lock_, -1); - - task_count--; - ACE_DEBUG ((LM_DEBUG, "(%t) destroying Task_Test, task count = %d\n", - (u_long) task_count)); - wait_count--; -// delete this; - return 0; -} - -int -Task_Test::put (ACE_Message_Block *, - ACE_Time_Value *) -{ - return 0; -} - -int -Task_Test::svc (void) -{ - wait_count++; - max_count++; - - ACE_DEBUG ((LM_DEBUG, "(%t) svc: waiting\n")); - - for (;;) - if (max_count >= n_threads) - break; - else - ACE_Thread::yield (); - - ACE_DEBUG ((LM_DEBUG, "(%t) svc: finished waiting\n")); - return 0; -} - -int -main (int argc, char *argv[]) -{ - n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : default_threads; - int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : default_iterations; - - Task_Test **task_array = new Task_Test *[n_threads]; - - for (int i = 1; i <= n_iterations; i++) - { - ACE_DEBUG ((LM_DEBUG, "(%t) iteration = %d, max_count %d\n", - i, (u_long) max_count)); - max_count = 0; - - ACE_DEBUG ((LM_DEBUG, "(%t) starting %d task%s\n", - n_threads, n_threads == 1 ? "" : "s")); - - // Launch the new tasks. - for (int j = 0; j < n_threads; j++) - { - task_array[j] = new Task_Test; - // Activate the task, i.e., make it an active object. - task_array[j]->open (); - } - - // Wait for initialization to kick in. - while (max_count == 0) - ACE_Thread::yield (); - - ACE_DEBUG ((LM_DEBUG, "(%t) waiting for threads to finish\n")); - - // Wait for the threads to finish this iteration. - while (max_count != n_threads && wait_count != 0) - ACE_Thread::yield (); - - ACE_DEBUG ((LM_DEBUG, "(%t) iteration %d finished, max_count %d, wait_count %d, waiting for tasks to exit\n", - i, (u_long) max_count, (u_long) wait_count)); - - // Wait for all the tasks to exit. - ACE_Service_Config::thr_mgr ()->wait (); - - // Delete the existing tasks. - for (int k = 0; k < n_threads; k++) - delete task_array[k]; - } - - delete [] task_array; - - ACE_DEBUG ((LM_DEBUG, "(%t) shutting down the test\n")); - return 0; -} - -#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>; -#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ - -#else -int -main (int, char *[]) -{ - ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n")); - return 0; -} -#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_thread_manager.cpp b/examples/Threads/test_thread_manager.cpp deleted file mode 100644 index 73029d70d88..00000000000 --- a/examples/Threads/test_thread_manager.cpp +++ /dev/null @@ -1,104 +0,0 @@ -// $Id$ - -// Test out the group management mechanisms provided by the -// ACE_Thread_Manager, including the group signal handling, group -// suspension and resumption, and cooperative thread cancellation -// mechanisms. - -#include "ace/Service_Config.h" -#include "ace/Thread_Manager.h" - -#if defined (ACE_HAS_THREADS) - -extern "C" void -handler (int signum) -{ - ACE_DEBUG ((LM_DEBUG, "(%t) received signal %d\n", signum)); -} - -static void * -worker (int iterations) -{ - ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ()); - - for (int i = 0; i < iterations; i++) - { - if ((i % 1000) == 0) - { - ACE_DEBUG ((LM_DEBUG, - "(%t) checking cancellation before iteration %d!\n", - i)); - - if (ACE_Service_Config::thr_mgr ()->testcancel (ACE_Thread::self ()) != 0) - { - ACE_DEBUG ((LM_DEBUG, - "(%t) has been cancelled before iteration %d!\n", - i)); - break; - } - } - } - - // Destructor removes thread from Thread_Manager. - return 0; -} - -static const int DEFAULT_THREADS = ACE_DEFAULT_THREADS; -static const int DEFAULT_ITERATIONS = 100000; - -int -main (int argc, char *argv[]) -{ - ACE_Service_Config daemon; - - daemon.open (argv[0]); - - // Register a signal handler. - ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT); - - int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : DEFAULT_THREADS; - int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS; - - ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr (); - - int grp_id = thr_mgr->spawn_n (n_threads, ACE_THR_FUNC (worker), - (void *) n_iterations, - THR_NEW_LWP | THR_DETACHED); - - // Wait for 1 second and then suspend every thread in the group. - ACE_OS::sleep (1); - ACE_DEBUG ((LM_DEBUG, "(%t) suspending group\n")); - if (thr_mgr->suspend_grp (grp_id) == -1) - ACE_ERROR ((LM_DEBUG, "(%t) %p\n", "suspend_grp")); - - // Wait for 1 more second and then resume every thread in the - // group. - ACE_OS::sleep (ACE_Time_Value (1)); - ACE_DEBUG ((LM_DEBUG, "(%t) resuming group\n")); - if (thr_mgr->resume_grp (grp_id) == -1) - ACE_ERROR ((LM_DEBUG, "(%t) %p\n", "resume_grp")); - - // Wait for 1 more second and then send a SIGINT to every thread in - // the group. - ACE_OS::sleep (ACE_Time_Value (1)); - ACE_DEBUG ((LM_DEBUG, "(%t) signaling group\n")); - if (thr_mgr->kill_grp (grp_id, SIGINT) == -1) - ACE_ERROR ((LM_DEBUG, "(%t) %p\n", "kill_grp")); - - // Wait for 1 more second and then cancel all the threads. - ACE_OS::sleep (ACE_Time_Value (1)); - ACE_DEBUG ((LM_DEBUG, "(%t) cancelling group\n")); - if (thr_mgr->cancel_grp (grp_id) == -1) - ACE_ERROR ((LM_DEBUG, "(%t) %p\n", "cancel_grp")); - - // Perform a barrier wait until all the threads have shut down. - thr_mgr->wait (); - return 0; -} -#else -int -main (int, char *[]) -{ - ACE_ERROR_RETURN ((LM_ERROR, "threads not supported on this platform\n"), -1); -} -#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_thread_pool.cpp b/examples/Threads/test_thread_pool.cpp deleted file mode 100644 index 68741156b83..00000000000 --- a/examples/Threads/test_thread_pool.cpp +++ /dev/null @@ -1,214 +0,0 @@ -// This test program illustrates how the ACE task synchronization -// $Id$ - -// mechanisms work in conjunction with the ACE_Task and the -// ACE_Thread_Manager. If the manual flag is not set input comes from -// stdin until the user enters a return only. This stops all workers -// via a message block of length 0. This is an alternative shutdown of -// workers compared to queue deactivate. -// -// This code is original based on a test program written by Karlheinz -// Dorn. It was modified to utilize more "ACE" features by Doug Schmidt. - -#include "ace/Task.h" -#include "ace/Service_Config.h" - -#include "ace/Task.h" - -#if defined (ACE_HAS_THREADS) - -// Number of iterations to run the test. -static size_t n_iterations = 100; - -class Thread_Pool : public ACE_Task<ACE_MT_SYNCH> -{ -public: - Thread_Pool (ACE_Thread_Manager *thr_mgr, int n_threads); - - virtual int svc (void); - // Iterate <n_iterations> time printing off a message and "waiting" - // for all other threads to complete this iteration. - - virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv=0); - // This allows the producer to pass messages to the <Thread_Pool>. - -private: - virtual int close (u_long); - - // = Not needed for this test. - virtual int open (void *) { return 0; } -}; - -int -Thread_Pool::close (u_long) -{ - ACE_DEBUG ((LM_DEBUG, "(%t) close of worker\n")); - return 0; -} - -Thread_Pool::Thread_Pool (ACE_Thread_Manager *thr_mgr, - int n_threads) - : ACE_Task<ACE_MT_SYNCH> (thr_mgr) -{ - // Create worker threads. - if (this->activate (THR_NEW_LWP, n_threads) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "activate failed")); -} - -// Simply enqueue the Message_Block into the end of the queue. - -int -Thread_Pool::put (ACE_Message_Block *mb, ACE_Time_Value *tv) -{ - return this->putq (mb, tv); -} - -// Iterate <n_iterations> time printing off a message and "waiting" -// for all other threads to complete this iteration. - -int -Thread_Pool::svc (void) -{ - // Note that the ACE_Task::svc_run () method automatically adds us to - // the Thread_Manager when the thread begins. - - int result = 0; - int count = 1; - - // Keep looping, reading a message out of the queue, until we get a - // message with a length == 0, which signals us to quit. - - for (;; count++) - { - ACE_Message_Block *mb; - - ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d before getq ()\n", count)); - - if (this->getq (mb) == -1) - { - ACE_ERROR ((LM_ERROR, - "(%t) in iteration %d, got result -1, exiting\n", count)); - break; - } - - int length = mb->length (); - - if (length > 0) - ACE_DEBUG ((LM_DEBUG, - "(%t) in iteration %d, length = %d, text = \"%*s\"\n", - count, length, length - 1, mb->rd_ptr ())); - - // We're responsible for deallocating this. - delete mb; - - if (length == 0) - { - ACE_DEBUG ((LM_DEBUG, - "(%t) in iteration %d, got NULL message, exiting\n", - count)); - break; - } - } - - // Note that the ACE_Task::svc_run () method automatically removes - // us from the Thread_Manager when the thread exits. - return 0; -} - -static void -produce (Thread_Pool &thread_pool) -{ - ACE_DEBUG ((LM_DEBUG, "(%t) producer start, dumping the Thread_Pool\n")); - thread_pool.dump (); - - for (int n;;) - { - // Allocate a new message. - ACE_Message_Block *mb = new ACE_Message_Block (BUFSIZ); - -#if defined (manual) - ACE_DEBUG ((LM_DEBUG, - "(%t) press chars and enter to put a new message into task queue...")); - n = ACE_OS::read (ACE_STDIN, mb->rd_ptr (), mb->size ()); -#else // Automatically generate messages. - static int count = 0; - - ACE_OS::sprintf (mb->rd_ptr (), "%d\n", count); - - n = ACE_OS::strlen (mb->rd_ptr ()); - - if (count == n_iterations) - n = 1; // Indicate that we need to shut down. - else - count++; - - if (count == 0 || (count % 20 == 0)) - ACE_OS::sleep (1); -#endif /* manual */ - if (n > 1) - { - // Send a normal message to the waiting threads and continue - // producing. - mb->wr_ptr (n); - - // Pass the message to the Thread_Pool. - if (thread_pool.put (mb) == -1) - ACE_ERROR ((LM_ERROR, " (%t) %p\n", "put")); - } - else - { - // Send a shutdown message to the waiting threads and exit. - ACE_DEBUG ((LM_DEBUG, "\n(%t) start loop, dump of task:\n")); - thread_pool.dump (); - - for (int i = thread_pool.thr_count (); i > 0; i--) - { - ACE_DEBUG ((LM_DEBUG, - "(%t) EOF, enqueueing NULL block for thread = %d\n", - i)); - - // Enqueue a NULL message to flag each consumer to - // shutdown. - if (thread_pool.put (new ACE_Message_Block) == -1) - ACE_ERROR ((LM_ERROR, " (%t) %p\n", "put")); - } - - ACE_DEBUG ((LM_DEBUG, "\n(%t) end loop, dump of task:\n")); - thread_pool.dump (); - break; - } - } -} - -int -main (int argc, char *argv[]) -{ - int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS; - n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : n_iterations; - - ACE_DEBUG ((LM_DEBUG, "(%t) argc = %d, threads = %d\n", - argc, n_threads)); - - // Create the worker tasks. - Thread_Pool thread_pool (ACE_Service_Config::thr_mgr (), - n_threads); - - // Create work for the worker tasks to process in their own threads. - produce (thread_pool); - - // Wait for all the threads to reach their exit point. - - ACE_DEBUG ((LM_DEBUG, "(%t) waiting with thread manager...\n")); - ACE_Service_Config::thr_mgr ()->wait (); - - ACE_DEBUG ((LM_DEBUG, "(%t) destroying worker tasks and exiting...\n")); - return 0; -} -#else -int -main (int, char *[]) -{ - ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n")); - return 0; -} -#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_thread_specific.cpp b/examples/Threads/test_thread_specific.cpp deleted file mode 100644 index f7a4f6dccf3..00000000000 --- a/examples/Threads/test_thread_specific.cpp +++ /dev/null @@ -1,219 +0,0 @@ -#include "ace/Service_Config.h" -// $Id$ - -#include "ace/Synch.h" - -#if defined (ACE_HAS_THREADS) - -// Define a class that will be stored in thread-specific data. Note -// that as far as this class is concerned it's just a regular C++ -// class. The ACE_TSS wrapper transparently ensures that -// objects of this class will be placed in thread-specific storage. -// All calls on ACE_TSS::operator->() are delegated to the -// appropriate method in the Errno class. - -class Errno -{ -public: - int error (void) { return this->errno_; } - void error (int i) { this->errno_ = i; } - - int line (void) { return this->lineno_; } - void line (int l) { this->lineno_ = l; } - - // Errno::flags_ is a static variable, so we've got to protect it - // with a mutex since it isn't kept in thread-specific storage. - int flags (void) - { - ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Errno::lock_, -1); - - return Errno::flags_; - } - - void flags (int f) - { - ACE_GUARD (ACE_Thread_Mutex, ace_mon, Errno::lock_); - - Errno::flags_ = f; - } - -private: - // = errno_ and lineno_ will be thread-specific data so they don't - // need a lock. - int errno_; - int lineno_; - - static int flags_; -#if defined (ACE_HAS_THREADS) - // flags_ needs a lock. - static ACE_Thread_Mutex lock_; -#endif /* ACE_HAS_THREADS */ -}; - -// Static variables. -ACE_MT (ACE_Thread_Mutex Errno::lock_); -int Errno::flags_; - -// This is our thread-specific error handler... -static ACE_TSS<Errno> TSS_Error; - -#if defined (ACE_HAS_THREADS) -// Serializes output via cout. -static ACE_Thread_Mutex lock; - -typedef ACE_TSS_Guard<ACE_Thread_Mutex> GUARD; -#else -// Serializes output via cout. -static ACE_Null_Mutex lock; - -typedef ACE_Guard<ACE_Null_Mutex> GUARD; -#endif /* ACE_HAS_THREADS */ - -static void -cleanup (void *ptr) -{ - ACE_DEBUG ((LM_DEBUG, "(%t) in cleanup, ptr = %x\n", ptr)); - - delete ptr; -} - -// This worker function is the entry point for each thread. - -static void * -worker (void *c) -{ - ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ()); - int count = int (c); - - ACE_thread_key_t key = 0; - int *ip = 0; - - // Make one key that will be available when the thread exits so that - // we'll have something to cleanup! - - if (ACE_OS::thr_keycreate (&key, cleanup) == -1) - ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_keycreate")); - - ip = new int; - - if (ACE_OS::thr_setspecific (key, (void *) ip) == -1) - ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific")); - - for (int i = 0; i < count; i++) - { - if (ACE_OS::thr_keycreate (&key, cleanup) == -1) - ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_keycreate")); - - ip = new int; - - ACE_DEBUG ((LM_DEBUG, "(%t) in worker 1, key = %d, ip = %x\n", key, ip)); - - if (ACE_OS::thr_setspecific (key, (void *) ip) == -1) - ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific")); - - if (ACE_OS::thr_getspecific (key, (void **) &ip) == -1) - ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific")); - - if (ACE_OS::thr_setspecific (key, (void *) 0) == -1) - ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific")); - - delete ip; - - if (ACE_OS::thr_keyfree (key) == -1) - ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_keyfree")); - - // Cause an error. - ACE_OS::read (ACE_INVALID_HANDLE, 0, 0); - - // The following two lines set the thread-specific state. - TSS_Error->error (errno); - TSS_Error->line (__LINE__); - - // This sets the static state (note how C++ makes it easy to do - // both). - TSS_Error->flags (count); - - { - // Use the guard to serialize access to cout... - ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock, 0); - - cout << "(" << ACE_Thread::self () - << ") errno = " << TSS_Error->error () - << ", lineno = " << TSS_Error->line () - << ", flags = " << TSS_Error->flags () - << endl; - } - key = 0; - - if (ACE_OS::thr_keycreate (&key, cleanup) == -1) - ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_keycreate")); - - ip = new int; - - ACE_DEBUG ((LM_DEBUG, "(%t) in worker 2, key = %d, ip = %x\n", key, ip)); - - if (ACE_OS::thr_setspecific (key, (void *) ip) == -1) - ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific")); - - if (ACE_OS::thr_getspecific (key, (void **) &ip) == -1) - ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific")); - - if (ACE_OS::thr_setspecific (key, (void *) 0) == -1) - ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific")); - - delete ip; - - if (ACE_OS::thr_keyfree (key) == -1) - ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_keyfree")); - } - - ACE_DEBUG ((LM_DEBUG, "(%t) exiting\n")); - return 0; -} - -extern "C" void -handler (int signum) -{ - ACE_DEBUG ((LM_DEBUG, "signal = %S\n", signum)); - ACE_Service_Config::thr_mgr ()->exit (0); -} - -int -main (int argc, char *argv[]) -{ - // The Service_Config must be the first object defined in main... - ACE_Service_Config daemon (argv[0]); - ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ()); - int threads = argc > 1 ? ACE_OS::atoi (argv[1]) : 4; - int count = argc > 2 ? ACE_OS::atoi (argv[2]) : 10000; - - // Register a signal handler. - ACE_Sig_Action sa ((ACE_SignalHandler) (handler), SIGINT); - -#if defined (ACE_HAS_THREADS) - if (ACE_Service_Config::thr_mgr ()->spawn_n (threads, - ACE_THR_FUNC (&worker), - (void *) count, - THR_BOUND | THR_DETACHED) == -1) - ACE_OS::perror ("ACE_Thread_Manager::spawn_n"); - - ACE_Service_Config::thr_mgr ()->wait (); -#else - worker ((void *) count); -#endif /* ACE_HAS_THREADS */ - return 0; -} - -#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template class ACE_TSS<Errno>; -#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ - -#else -int -main (void) -{ - ACE_ERROR_RETURN ((LM_ERROR, - "ACE doesn't support support threads on this platform (yet)\n"), - -1); -} -#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_token.cpp b/examples/Threads/test_token.cpp deleted file mode 100644 index 5a51496d011..00000000000 --- a/examples/Threads/test_token.cpp +++ /dev/null @@ -1,76 +0,0 @@ -// Test out the ACE Token class. -// $Id$ - -#include "ace/Token.h" -#include "ace/Task.h" - -#if defined (ACE_HAS_THREADS) - -class My_Task : public ACE_Task<ACE_MT_SYNCH> -{ -public: - My_Task (int n); - virtual int open (void *) { return 0; } - virtual int close (u_long) { return 0; } - virtual int put (ACE_Message_Block *, ACE_Time_Value *) { return 0; } - virtual int svc (void); - - static void sleep_hook (void *); - -private: - ACE_Token token_; -}; - -My_Task::My_Task (int n) -{ - // Make this Task into an Active Object. - this->activate (THR_BOUND | THR_DETACHED, n); - - // Wait for all the threads to exit. - this->thr_mgr ()->wait (); -} - -void -My_Task::sleep_hook (void *) -{ - cerr << '(' << ACE_Thread::self () << ')' - << " blocking, My_Task::sleep_hook () called" << endl; -} - -// Test out the behavior of the ACE_Token class. - -int -My_Task::svc (void) -{ - for (int i = 0; i < 10000; i++) - { - // Wait for up to 1 millisecond past the current time to get the token. - ACE_Time_Value timeout (ACE_OS::time (0), 1000); - - if (this->token_.acquire (&My_Task::sleep_hook, 0, &timeout) == 1) - { - this->token_.acquire (); - this->token_.renew (); - this->token_.release (); - this->token_.release (); - } - else - ACE_Thread::yield (); - } - return 0; -} - -int -main (int argc, char *argv[]) -{ - My_Task tasks (argc > 1 ? atoi (argv[1]) : 4); - - return 0; -} -#else -int -main (void) -{ - ACE_ERROR_RETURN ((LM_ERROR, "your platform doesn't support threads\n"), -1); -} -#endif /* */ diff --git a/examples/Threads/test_tss.cpp b/examples/Threads/test_tss.cpp deleted file mode 100644 index c81ca41c429..00000000000 --- a/examples/Threads/test_tss.cpp +++ /dev/null @@ -1,235 +0,0 @@ -// Torture test ACE thread-specific storage... -// $Id$ - - -#include "ace/Task.h" -#include "ace/Token.h" - -#if defined (ACE_HAS_THREADS) - -class TSS_Obj -{ -public: - - TSS_Obj (void); - ~TSS_Obj (void); - -private: - static int count_; - static ACE_Thread_Mutex lock_; -}; - -int TSS_Obj::count_ = 0; -ACE_Thread_Mutex TSS_Obj::lock_; - -TSS_Obj::TSS_Obj (void) -{ - ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_); - - count_++; - cout << "TO+ : " << count_ << endl; -} - -TSS_Obj::~TSS_Obj (void) -{ - ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_); - - count_--; - cout << "TO- : " << count_ << endl; -} - -class Test_Task -{ -public: - - Test_Task (void); - ~Test_Task (void); - - int open (void *arg); - - static void* svc (void *arg); - - static int wait_count_; - static int max_count_; - -private: - static int count_; -}; - -int Test_Task::count_ = 0; -int Test_Task::wait_count_ = 0; -int Test_Task::max_count_ = 0; -int num_threads_ = 0; - -ACE_Token token; - -Test_Task::Test_Task (void) -{ - ACE_GUARD (ACE_Token, ace_mon, token); - - count_++; - cout << "Test_Task+ : " - << count_ << " (" - << ACE_OS::thr_self () - << ")" << endl; -} - -Test_Task::~Test_Task (void) -{ - ACE_GUARD (ACE_Token, ace_mon, token); - - count_--; - cout << "Test_Task- : " - << count_ << " (" - << ACE_OS::thr_self () - << ")" << endl; - - wait_count_--; -} - -int Test_Task::open (void *arg) -{ - - ACE_Thread::spawn (Test_Task::svc, arg); - - return 0; -} - - -void * -Test_Task::svc (void *arg) -{ - ACE_TSS<TSS_Obj> tss (new TSS_Obj); - - { - ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0); - - wait_count_++; - max_count_++; - cout << "svc: waiting (" << ACE_OS::thr_self () << ")" << endl; - } - - while (1) - { - { - ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0); - - if (max_count_ >= num_threads_) - break; - else - { - ace_mon.release (); - ACE_Thread::yield (); - ace_mon.acquire (); - } - } - - { - ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0); - - cout << "svc: waiting (" << ACE_OS::thr_self () << ") finished" << endl; - } - } - - delete (Test_Task *) arg; - - return 0; -} - -int -main (int argc, char **argv) -{ - if (argc != 2) - { - cout << "Missing parameters!" << endl; - return 1; - } - - int num_Tasks = atoi (argv[1]); - - num_threads_ = num_Tasks; - - Test_Task **task_arr = (Test_Task**) new char[sizeof (Test_Task*) * num_Tasks]; - - while (1) - { - { - ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1); - - cout << "ReseTest_Tasking Test_Task::max_count_ from: " - << Test_Task::max_count_ << endl; - - Test_Task::max_count_ = 0; - } - - for (int i = 0; i < num_Tasks; i++) - { - task_arr[i] = new Test_Task; - task_arr[i]->open (task_arr[i]); - } - - cout << "Waiting for first thread started..." << endl; - - for (;;) - { - ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1); - - if (Test_Task::max_count_ != 0 ) - { - ace_mon.release (); - ACE_Thread::yield (); - ace_mon.acquire (); - break; - } - ace_mon.release (); - ACE_Thread::yield (); - ace_mon.acquire (); - } - - { - ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1); - - cout << "First thread started!" << endl - << "Waiting for all threads finished..." << endl; - } - - for (;;) - { - ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1); - - if (!(Test_Task::max_count_ == num_threads_ - && Test_Task::wait_count_ == 0)) - { - ace_mon.release (); - ACE_Thread::yield (); - ace_mon.acquire (); - continue; - } - - cout << "Test_Task::max_count_ = " - << Test_Task::max_count_ - << " Test_Task::wait_count_ = " - << Test_Task::wait_count_ - << endl; - break; - } - - { - ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1); - cout << "All threads finished..." << endl; - } - - ACE_OS::sleep (2); - } - - return 0; -} - -#else -int -main (int, char *[]) -{ - ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n")); - return 0; -} -#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_tss1.cpp b/examples/Threads/test_tss1.cpp deleted file mode 100644 index 7efdc9dc3ef..00000000000 --- a/examples/Threads/test_tss1.cpp +++ /dev/null @@ -1,164 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// TSS_Test.cpp -// -// = DESCRIPTION -// This program tests thread specific storage of data. The ACE_TSS -// wrapper transparently ensures that the objects of this class -// will be placed in thread-specific storage. All calls on -// ACE_TSS::operator->() are delegated to the appropriate method -// in the Errno class. -// -// = AUTHOR -// Detlef Becker -// -// ============================================================================ - -#include "ace/Service_Config.h" -#include "ace/Synch.h" -#include "ace/Task.h" - -#if defined (ACE_HAS_THREADS) - -static int iterations = 100; - -class Errno -{ -public: - int error (void) { return this->errno_; } - void error (int i) { this->errno_ = i; } - - int line (void) { return this->lineno_; } - void line (int l) { this->lineno_ = l; } - - // Errno::flags_ is a static variable, so we've got to protect it - // with a mutex since it isn't kept in thread-specific storage. - int flags (void) { - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_Mon, Errno::lock_, -1)); - - return Errno::flags_; - } - int flags (int f) - { - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Errno::lock_, -1)); - - Errno::flags_ = f; - return 0; - } - -private: - // = errno_ and lineno_ will be thread-specific data so they don't - // need a lock. - int errno_; - int lineno_; - - static int flags_; -#if defined (ACE_HAS_THREADS) - // flags_ needs a lock. - static ACE_Thread_Mutex lock_; -#endif /* ACE_HAS_THREADS */ -}; - -// Static variables. -ACE_MT (ACE_Thread_Mutex Errno::lock_); -int Errno::flags_; - -// This is our thread-specific error handler... -static ACE_TSS<Errno> TSS_Error; - -#if defined (ACE_HAS_THREADS) -// Serializes output via cout. -static ACE_Thread_Mutex lock; - -typedef ACE_TSS_Guard<ACE_Thread_Mutex> GUARD; -#else -// Serializes output via cout. -static ACE_Null_Mutex lock; - -typedef ACE_Guard<ACE_Null_Mutex> GUARD; -#endif /* ACE_HAS_THREADS */ - -// Keeps track of whether Tester::close () has started. -static int close_started = 0; - -template <ACE_SYNCH_1> -class Tester: public ACE_Task<ACE_SYNCH_2> -{ -public: - Tester (void) {} - ~Tester (void) {} - - virtual int open (void *theArgs = 0); - virtual int close (u_long theArg = 0); - virtual int put (ACE_Message_Block *theMsgBlock, - ACE_Time_Value *theTimeVal = 0); - virtual int svc (void); -}; - -template <ACE_SYNCH_1> int -Tester<ACE_SYNCH_2>::open (void *) -{ - return this->activate (); -} - -template <ACE_SYNCH_1> -int Tester<ACE_SYNCH_2>::close (u_long) -{ - ACE_DEBUG ((LM_DEBUG, "close running\n!")); - close_started = 1; - ACE_OS::sleep (2); - ACE_DEBUG ((LM_DEBUG, "close: trying to log error code 7!\n")); - TSS_Error->error (7); - ACE_DEBUG ((LM_DEBUG, "close: logging succeeded!\n")); - return 0; -} - -template <ACE_SYNCH_1> int -Tester<ACE_SYNCH_2>::put (ACE_Message_Block *, ACE_Time_Value *) -{ - return 0; -} - -template <ACE_SYNCH_1> int -Tester<ACE_SYNCH_2>::svc (void) -{ - return 0; -} - -int -main (int, char *[]) -{ - Tester<ACE_MT_SYNCH> tester; - - tester.open (); - - while (!close_started) - continue; - - ACE_DEBUG ((LM_DEBUG, "main: trying to log error code 7!\n")); - - TSS_Error->error (3); - - ACE_DEBUG ((LM_DEBUG, "main: logging succeeded!\n")); - return 0; -} - -#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template class ACE_TSS<Errno>; -#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ - -#else -int -main (void) -{ - ACE_ERROR_RETURN ((LM_ERROR, - "ACE doesn't support support threads on this platform (yet)\n"), - -1); -} -#endif /* ACE_HAS_THREADS */ diff --git a/examples/Threads/test_tss2.cpp b/examples/Threads/test_tss2.cpp deleted file mode 100644 index 24a8d958e91..00000000000 --- a/examples/Threads/test_tss2.cpp +++ /dev/null @@ -1,252 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// TSS_Test.cpp -// -// = DESCRIPTION -// This program tests thread specific storage of data. The ACE_TSS -// wrapper transparently ensures that the objects of this class -// will be placed in thread-specific storage. All calls on -// ACE_TSS::operator->() are delegated to the appropriate method -// in the Errno class. -// -// = AUTHOR -// Prashant Jain and Doug Schmidt -// -// ============================================================================ - -#include "ace/Task.h" -#include "ace/Token.h" - -#if defined (ACE_HAS_THREADS) - -class TSS_Obj -{ -public: - - TSS_Obj (void); - ~TSS_Obj (void); - -private: - static int count_; - static ACE_Thread_Mutex lock_; -}; - -int TSS_Obj::count_ = 0; -ACE_Thread_Mutex TSS_Obj::lock_; - -TSS_Obj::TSS_Obj (void) -{ - ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_); - - count_++; - cout << "TO+ : " << count_ << endl; -} - -TSS_Obj::~TSS_Obj (void) -{ - ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_); - - count_--; - cout << "TO- : " << count_ << endl; -} - -class Test_Task -{ -public: - - Test_Task (void); - ~Test_Task (void); - - int open (void *arg); - - static void *svc (void *arg); - static int wait_count_; - static int max_count_; - -private: - static int count_; -}; - -int Test_Task::count_ = 0; -int Test_Task::wait_count_ = 0; -int Test_Task::max_count_ = 0; -int num_threads_ = 0; - -ACE_Token token; - -Test_Task::Test_Task (void) -{ - ACE_GUARD (ACE_Token, ace_mon, token); - - count_++; - cout << "Test_Task+ : " - << count_ << " (" - << ACE_OS::thr_self () - << ")" << endl; -} - -Test_Task::~Test_Task (void) -{ - ACE_GUARD (ACE_Token, ace_mon, token); - - count_--; - cout << "Test_Task- : " - << count_ << " (" - << ACE_OS::thr_self () - << ")" << endl; - - wait_count_--; -} - -void * -Test_Task::svc (void *arg) -{ - ACE_TSS<TSS_Obj> tss (new TSS_Obj); - - { - ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0); - - wait_count_++; - max_count_++; - cout << "svc: waiting (" << ACE_OS::thr_self () << ")" << endl; - } - - while (1) - { - { - ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0); - - if (max_count_ >= num_threads_) - break; - else - { - ace_mon.release (); - ACE_Thread::yield (); - ace_mon.acquire (); - } - } - - { - ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0); - - cout << "svc: waiting (" << ACE_OS::thr_self () << ") finished" << endl; - } - } - - delete (Test_Task *) arg; - - return 0; -} - -int -Test_Task::open (void *arg) -{ - if (ACE_Thread::spawn (Test_Task::svc, arg) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Thread::spawn"), 0); - - return 0; -} - -int -main (int argc, char **argv) -{ - if (argc != 2) - { - cout << "Missing parameters!" << endl; - return 1; - } - - int num_Tasks = atoi (argv[1]); - - num_threads_ = num_Tasks; - - Test_Task **task_arr = (Test_Task**) new char[sizeof (Test_Task*) * num_Tasks]; - - while (1) - { - { - ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1); - - cout << "ReseTest_Tasking Test_Task::max_count_ from: " - << Test_Task::max_count_ << endl; - - Test_Task::max_count_ = 0; - } - - for (int i = 0; i < num_Tasks; i++) - { - task_arr[i] = new Test_Task; - task_arr[i]->open (task_arr[i]); - } - - cout << "Waiting for first thread started..." << endl; - - for (;;) - { - ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1); - - if (Test_Task::max_count_ != 0 ) - { - ace_mon.release (); - ACE_Thread::yield (); - ace_mon.acquire (); - break; - } - ace_mon.release (); - ACE_Thread::yield (); - ace_mon.acquire (); - } - - { - ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1); - - cout << "First thread started!" << endl - << "Waiting for all threads finished..." << endl; - } - - for (;;) - { - ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1); - - if (!(Test_Task::max_count_ == num_threads_ - && Test_Task::wait_count_ == 0)) - { - ace_mon.release (); - ACE_Thread::yield (); - ace_mon.acquire (); - continue; - } - - cout << "Test_Task::max_count_ = " - << Test_Task::max_count_ - << " Test_Task::wait_count_ = " - << Test_Task::wait_count_ - << endl; - break; - } - - { - ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1); - cout << "All threads finished..." << endl; - } - - ACE_OS::sleep (2); - } - - return 0; -} - -#else -int -main (int, char *[]) -{ - ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n")); - return 0; -} -#endif /* ACE_HAS_THREADS */ diff --git a/include/makeinclude/platform_cygwin32.GNU b/include/makeinclude/platform_cygwin32.GNU deleted file mode 100644 index 69837b81084..00000000000 --- a/include/makeinclude/platform_cygwin32.GNU +++ /dev/null @@ -1,24 +0,0 @@ -# $Id$ - -# -# This file should allow to build ACE for cygwin32 with cygwin tools. -# -# Edit to change TCPU and w32api defs below. -# -# Don't forget to define the ACE_ROOT environment variable! -# - -# -# Chose your target CPU (uncomment ONE of these). -# -TCPU = pentiumpro -#TCPU = pentium -#TCPU = i486 -#TCPU = i386 - -cygwin32 = 1 -threads = 0 -static_libs_only = 1 -optimize = 0 - -include $(ACE_ROOT)/include/makeinclude/platform_gnuwin32_common.GNU diff --git a/include/makeinclude/platform_gnuwin32_common.GNU b/include/makeinclude/platform_gnuwin32_common.GNU deleted file mode 100644 index 412420bf95a..00000000000 --- a/include/makeinclude/platform_gnuwin32_common.GNU +++ /dev/null @@ -1,96 +0,0 @@ -# $Id$ - -ifneq ($(mingw32),1) - ifneq ($(cygwin32),1) - fail := \ - $(shell \ - echo "You should not use this file but one of"; \ - echo "platform_mingw32.GNU or platform_cygwin32.GNU"; \ - exit 1) - endif -endif - -# debug = 1 -# optimize = 1 -# exceptions = 0 - -ifndef winsock2 - winsock2 = 1 -endif - -ifndef exceptions - exceptions = 0 -endif -ifeq (,$(debug)) - debug = 1 -endif -ifeq (,$(optimize)) - optimize = 1 -endif -ifeq (,$(threads)) - threads = 1 -endif -ifeq ($(threads),0) - CFLAGS += -DACE_MT_SAFE=0 -endif # threads - -ifeq ($(mingw32),1) -CFLAGS += \ - -I$(MINGW_BASE)/mingw32/include \ - -I$(MINGW_BASE)/w32api/include \ - -I$(MINGW_BASE)/include -LDFLAGS += \ - -L$(MINGW_BASE)/mingw32/lib \ - -L$(MINGW_BASE)/w32api/lib \ - -L$(MINGW_BASE)/lib -endif - -ifeq ($(debug),0) -CFLAGS += -DNDEBUG -endif - -CC = gcc -m$(TCPU) -CXX = g++ -m$(TCPU) - -# Never use -pipe with 95/98. On NT/2000, not sure if it helps. -CFLAGS += -W -Wall -Wpointer-arith -ifeq ($(threads),1) - CC += -mthreads - CXX += -mthreads -endif # threads - -ifeq ($(IMPLICIT_TEMPLATES_FLAG),) - IMPLICIT_TEMPLATES_FLAG=-fno-implicit-templates -endif - -CCFLAGS += $(CFLAGS) $(IMPLICIT_TEMPLATES_FLAG) -DCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) - -ifeq ($(mingw32),1) -ifeq ($(winsock2),1) -LIBS += -lws2_32 -lmswsock -endif -LIBS += -lwsock32 -endif - -VSHDIR = .obj/ - -OCFLAGS += -O3 -PIC = -AR = ar -ARFLAGS = rsuv -RANLIB = ranlib -SOEXT = dll -SOFLAGS = $(CPPFLAGS) -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< -# The sed below is a workaround to a bug in ld. -SHLIBBUILD = dlltool --export-all --output-def $@.def --dllname $@ $(VSHOBJS1) && mv $@.def $@.def.old && sed 's/;.*$$//g' < $@.def.old > $@.def && $(SOLINK.cc) -Wl,--enable-auto-image-base -Wl,--out-implib,$@.a -shared -o $@ $(LDFLAGS) $@.def $(VSHOBJS1) $(LIBS) && $(RM) $@.def.old $@.def - -ifeq ($(exceptions),1) -SHLIBBUILD += \ - ;echo "Warning: exceptions fail when mixing DLL and non DLL calls." -endif - -PRELIB = @true diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU index e380bee141b..8c5a82122b1 100644 --- a/include/makeinclude/platform_hpux_aCC.GNU +++ b/include/makeinclude/platform_hpux_aCC.GNU @@ -60,8 +60,8 @@ ifeq (1,$(stdcpplib)) ifeq (1, $(threads)) CCFLAGS += -D_RWSTD_MULTI_THREAD -D_REENTRANT endif -# Compile errors using -AA and +noeh together - HP problem report -# JAGad12608, fix slated for Dec 2001 Release -- Steve Huston, April 10, 2001. +# Compile errors using -AA and +noeh together - HP support call 3100620459 +# -- Steve Huston, April 10, 2001. exceptions = 1 endif diff --git a/include/makeinclude/platform_mingw32.GNU b/include/makeinclude/platform_mingw32.GNU deleted file mode 100644 index ba2d31272df..00000000000 --- a/include/makeinclude/platform_mingw32.GNU +++ /dev/null @@ -1,62 +0,0 @@ -# $Id$ - -# -# This file should allow to build ACE for mingw32 with mingw tools. -# Edit to change TCPU and M32_BASE below. -# -# Don't forget to define the ACE_ROOT environment variable! -# - -# -# mingw32 packages as distributed from sourceforge: -# http://sourceforge.net/project/showfiles.php?group_id=2435&release_id=15084 -# See also http://www.mingw.org. -# -# You will also need a GNU Make for win32 (so you can actualy -# USE this file :-). Tested with make/sh from cygwin. -# -# Tested with: -# -# mingw-runtime-0.5-20010221 -# w32api-0.5-20010301 -# gcc-2.95.2-20001116 -# binutils-2.10.91-20010114 -# ld-2.10.91-20010126 -# libbfd-2.10.91-20010121 -# -# Caveat: -# -# If ld complains about not finding crt2.o, dllcrt2.o or gcrt2.o -# when linking executables, you will need to modify the specs file for gcc: -# lib/gcc-lib/mingw32/2.95.2/specs -# look for the line after the one begining ``*startfile:'', and add -# full path as prefix for crt2, dllcrt2 and gcrt2 -# (i.e., change -# ... %{!shared:%{!mdll:crt2%O%s}} ... -# with -# ... %{!shared:%{!mdll:c:/mingw32/lib/gcc-lib/mingw32/2.95.2/crt2%O%s}} ... -# or something similar depending on the location of your instalation). -# - -# -# Chose your target CPU (uncomment ONE of these). -# -TCPU = pentiumpro -#TCPU = pentium -#TCPU = i486 -#TCPU = i386 - -# -# Define here mingw32 instalation location. -# These asumes no fancy hierachy, just all packages above unpacked on -# the same base directory. -# Optionally, you can define it as an environment variable, or set it -# on your platform_macros.GNU before including this file. -# -ifndef MINGW_BASE - MINGW_BASE = c:/live/local/mingw32 -endif - -mingw32 = 1 - -include $(ACE_ROOT)/include/makeinclude/platform_gnuwin32_common.GNU diff --git a/include/makeinclude/platform_qnx_rtp_gcc.GNU b/include/makeinclude/platform_qnx_rtp_gcc.GNU index 6b69a6a3749..213ec18739d 100644 --- a/include/makeinclude/platform_qnx_rtp_gcc.GNU +++ b/include/makeinclude/platform_qnx_rtp_gcc.GNU @@ -4,30 +4,50 @@ ACE_HAS_GNUG_PRE_2_8 := 0 +#new options as suggetsed by Andy Olson 3/10/01 +#---------------/*************/--------------------------------------------- inline = 1 debug = 1 -optimize = 1 +optimize = 0 exceptions = 1 +# note: I used CPPFLAGS instead of C or CC FLAGS, because the stupid QNX gcc +# will link different start and end sections based on the setting of +# -fexceptions, so it must be on both the compile AND link phase. +# ifeq ($(exceptions),1) - CCFLAGS += -fexceptions - LDFLAGS += -fexceptions + CPPFLAGS += -fexceptions else - CCLAGS += -fno-exceptions - LDLAGS += -fno-exceptions + CPPFLAGS += -fno-exceptions endif # ! exceptions CC = gcc CXX = g++ DCFLAGS += -gstabs +# +# This is a workaround needed only on QNX RTP. +# +TAO_DYNAMIC_LIBS=-lTAO_PortableServer +TAO_COS_NAMING_LIBS=-lTAO_IORTable -lTAO_RTSched -lTAO_PortableServer -lTAO_Svc_Utils +TAO_COS_NOTIFICATION_LIBS=-lTAO_Svc_Utils -lTAO_DynamicAny +TAO_RT_SCHED_LIBS=-lTAO_PortableServer +TAO_FAULT_TOLERANCE_LIBS=-lTAO_IORManip +TAO_COS_TRADING_LIBS=-lTAO_Svc_Utils + CFLAGS += -pipe -W -Wall -Wpointer-arith -CCFLAGS += $(CFLAGS) -fno-implicit-templates +CCFLAGS += $(CFLAGS) -fno-implicit-templates -fexceptions +# +# Under the current version of QNX RTP ACE crashes +# if compiled with debug option enabled. We leave the option here, +# but disable debug by default. +# DLD = $(CXX) LD = $(CXX) +LDFLAGS += LIBS += -lsocket -lstdc++ -lm -OCFLAGS += -O3 +OCFLAGS += -O2 PIC = -fPIC AR = ar ARFLAGS = ruv diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU index 756f5cea871..ed0854313b6 100644 --- a/include/makeinclude/rules.local.GNU +++ b/include/makeinclude/rules.local.GNU @@ -221,7 +221,7 @@ clean.local: -$(RM) -r SunWS_cache ir.out realclean.local: clean.local - -$(RM) $(BIN) $(BIN:%=%_debug) $(BIN:%=%_profile) $(BIN:%=%_optimize) $(LIB:%=%) $(LIB:%=%_debug) $(LIB:%=%_profile) $(LIB:%=%_optimize) $(SHLIB:%=%) $(SHLIB:%=%.a) $(SHLIB:%=%_debug) $(SHLIB:%=%_profile) $(SHLIB:%=%_optimize) $(SHLIBA:%=%) $(BIN2) $(BIN2:%=%_debug) $(BIN2:%=%_profile) $(BIN2:%=%_optimize) $(LIB2:%=%) $(LIB2:%=%_debug) $(LIB2:%=%_profile) $(LIB2:%=%_optimize) $(SHLIB2:%=%) $(SHLIB2:%=%_debug) $(SHLIB2:%=%_profile) $(SHLIB2:%=%_optimize) $(SHLIBA2:%=%) + -$(RM) $(BIN) $(BIN:%=%_debug) $(BIN:%=%_profile) $(BIN:%=%_optimize) $(LIB:%=%) $(LIB:%=%_debug) $(LIB:%=%_profile) $(LIB:%=%_optimize) $(SHLIB:%=%) $(SHLIB:%=%_debug) $(SHLIB:%=%_profile) $(SHLIB:%=%_optimize) $(SHLIBA:%=%) $(BIN2) $(BIN2:%=%_debug) $(BIN2:%=%_profile) $(BIN2:%=%_optimize) $(LIB2:%=%) $(LIB2:%=%_debug) $(LIB2:%=%_profile) $(LIB2:%=%_optimize) $(SHLIB2:%=%) $(SHLIB2:%=%_debug) $(SHLIB2:%=%_profile) $(SHLIB2:%=%_optimize) $(SHLIBA2:%=%) #---------------------------------------------------------------------------- # Dependency generation target diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index bdbd1c912e8..9d5e88d1548 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -279,13 +279,13 @@ endif ifeq ($(findstring g++,$(CXX)),g++) ifndef ACE_HAS_GNUG_PRE_2_8 - ifeq ($(filter g++,$(notdir $(CXX))),g++) + ifeq ($(notdir $(CXX)),g++) ACE_HAS_GNUG_PRE_2_8 := \ $(shell \ if $(CXX) --version | egrep '^(cygnus-)?2\.[0-7]' > /dev/null; then \ echo 1; else echo 0; fi) else # ! g++ - ifeq (eg++,$(filter g++,$(notdir $(CXX))),eg++) + ifeq (eg++,$(notdir $(CXX)),eg++) # Assume that eg++ is egcs. ACE_HAS_GNUG_PRE_2_8 := 0 else # ! plain g++ or eg++ @@ -568,7 +568,7 @@ ifdef shared_libs VDIR = .shobj/ ifeq ($(BIN),) #### No executables are being built, so don't create .obj/. - OBJDIRS = $(VSHDIR) + OBJDIRS = .shobj endif # BIN endif # ! VXWORKS endif # ! SHLIB diff --git a/netsvcs/clients/Naming/Client/Makefile b/netsvcs/clients/Naming/Client/Makefile index f294841feba..47966c25587 100644 --- a/netsvcs/clients/Naming/Client/Makefile +++ b/netsvcs/clients/Naming/Client/Makefile @@ -15,7 +15,9 @@ OBJ = $(SRC:%.cpp=$(VDIR)%.o) LSRC = $(addsuffix .cpp,$(FILES)) LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) -SHOBJ = $(addsuffix .$(SOEXT),$(FILES)) +SHOBJ = $(addsuffix .so,$(FILES)) + +VLDLIBS = $(LDLIBS:%=%$(VAR)) BIN2 = main LIB2 = libClient_Test.a diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile b/netsvcs/clients/Naming/Dump_Restore/Makefile index c387a5bf503..a9a840c3797 100644 --- a/netsvcs/clients/Naming/Dump_Restore/Makefile +++ b/netsvcs/clients/Naming/Dump_Restore/Makefile @@ -15,7 +15,9 @@ OBJ = $(SRC:%.cpp=$(VDIR)%.o) LSRC = $(addsuffix .cpp,$(FILES)) LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) -SHOBJ = $(addsuffix .$(SOEXT),$(FILES)) +SHOBJ = $(addsuffix .so,$(FILES)) + +VLDLIBS = $(LDLIBS:%=%$(VAR)) BIN2 = main LIB2 = libDump_Restore.a diff --git a/netsvcs/clients/Naming/Dump_Restore/nametest.cpp b/netsvcs/clients/Naming/Dump_Restore/nametest.cpp deleted file mode 100644 index fb9c71a5014..00000000000 --- a/netsvcs/clients/Naming/Dump_Restore/nametest.cpp +++ /dev/null @@ -1,112 +0,0 @@ -#include "ace/Naming_Context.h" -// $Id$ - -#include "ace/Name_Options.h" -#include "nametest.h" - -void -Nametest::listopt (void) -{ - cout << "serverport is " - << ACE_Name_Options::instance ()->nameserver_port() - << endl; - cout << "serverhost is " - << ACE_Name_Options::instance ()->nameserver_host() - << endl; - cout << "process_name is " - << ACE_Name_Options::instance ()->process_name() - << endl; - cout << "namespace_dir is " - << ACE_Name_Options::instance ()->namespace_dir() - << endl; -} - -int -Nametest::init (int argc, char *argv[]) -{ - ACE_Server_Record *sr; - ACE_Service_Config::svc_rep ()->find ("Name_Server_Proxy", &sr); - ACE_Service_Type *st = sr->type (); - ACE_Server_Object *so = st->object (); -dynamic_cast<ACE_Name_Server_Proxy *> (so); - - ACE_Name_Server_Proxy *ns_proxy = ACE_Service_Config::name_server_proxy (); - - ns_proxy->bind (...); - - this->listopt (); - - ACE_Naming_Context ns_context; - - if (ns_context.open (ACE_Naming_Context::NET_LOCAL) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ns_context.open"), -1); - - const char *mykey = argv[0]; - char *myvalue = argv[1]; - char *ns_value = 0; - char *ns_type = 0; - - if (ns_context.bind (mykey, myvalue, "ottotype") == -1) - cout << "bind failed" << endl; - else - cout << "bind succeeded" << endl; - - - if (ns_context.resolve (mykey, ns_value, ns_type) == -1) - cout << "resolve of " << mykey << " failed" << endl; - else - cout << "resolve of " << mykey << " succeeded, value = " - << ns_value << ", type = " << ns_type << endl; - - delete [] ns_value; - delete [] ns_type; - ns_value = 0; - ns_type = 0; - - if (ns_context.rebind (mykey, myvalue, "newottotype") == -1) - cout << "rebind failed" << endl; - else - cout << "rebind succeeded" << endl; - - if (ns_context.resolve (mykey, ns_value, ns_type) == -1) - cout << "resolve of " << mykey << " failed" << endl; - else - cout << "resolve of " << mykey << " succeeded, value = " - << ns_value << ", type = " << ns_type << endl; - - delete [] ns_value; - delete [] ns_type; - ns_value = 0; - ns_type = 0; - - if (ns_context.unbind (mykey) == -1) - cout << "unbind failed" << endl; - else - cout << "unbind succeeded" << endl; - - return 0; -} - -int -Nametest::fini (void) -{ - cout << "Nametest::fini called" << endl; - return 0; -} - -int -Nametest::info (char **, unsigned) const -{ - cout << "Nametest::info called" << endl; - return 0; -} - -extern "C" ACE_Service_Object *_alloc(void); - -// Factory function that is called automatically when the ACE -// framework dynamically links this shared object file. - -ACE_Service_Object *_alloc (void) -{ - return new Nametest; -} diff --git a/netsvcs/clients/Naming/Dump_Restore/nametest.h b/netsvcs/clients/Naming/Dump_Restore/nametest.h deleted file mode 100644 index fa0cc5dc05c..00000000000 --- a/netsvcs/clients/Naming/Dump_Restore/nametest.h +++ /dev/null @@ -1,15 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#include "ace/Service_Object.h" - -class Nametest : public ACE_Service_Object -{ -public: - virtual int init (int argc, char *argv[]); - virtual int fini (void); - virtual int info (char **, size_t) const; - - void listopt (void); -}; - diff --git a/netsvcs/lib/Client_Logging_Handler.i b/netsvcs/lib/Client_Logging_Handler.i deleted file mode 100644 index 57c6d26e751..00000000000 --- a/netsvcs/lib/Client_Logging_Handler.i +++ /dev/null @@ -1,4 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - - diff --git a/netsvcs/lib/Server_Logging_Handler.i b/netsvcs/lib/Server_Logging_Handler.i deleted file mode 100644 index 57c6d26e751..00000000000 --- a/netsvcs/lib/Server_Logging_Handler.i +++ /dev/null @@ -1,4 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - - diff --git a/netsvcs/lib/Server_Logging_Handler_T.cpp b/netsvcs/lib/Server_Logging_Handler_T.cpp index f30717b5608..9a68d50ef8f 100644 --- a/netsvcs/lib/Server_Logging_Handler_T.cpp +++ b/netsvcs/lib/Server_Logging_Handler_T.cpp @@ -119,11 +119,9 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha { // Send the log record to the log message receiver for // processing. - if (ACE_BIT_ENABLED (ACE_Log_Msg::instance ()->flags (), - ACE_Log_Msg::STDERR)) - receiver ().log_record (this->host_name (), - lp); ostream *orig_ostream = ACE_Log_Msg::instance ()->msg_ostream (); + receiver ().log_record (this->host_name (), + lp); receiver ().log_output (this->host_name (), lp, orig_ostream); diff --git a/netsvcs/servers/cli.conf b/netsvcs/servers/cli.conf deleted file mode 100644 index b2d8fbc8194..00000000000 --- a/netsvcs/servers/cli.conf +++ /dev/null @@ -1,11 +0,0 @@ -# UNIX version -# -# These are the services that can be linked into ACE. -# Note that you can replace the hardcoded "../lib/libnet_svcs" with -# a relative path if you set your LD search path correctly -- ACE will -# locate this for you automatically by reading your LD search path! -# In addition, you can replace the hardcoded "-p 20xxx" with "-p -# $PORTxxx" if you set your environment variables correctly. - -# Activate the Client Logging Daemon. -dynamic Client_Logging_Service Service_Object * ../lib/libnet_svcs:_make_ACE_Client_Logging_Connector() active "-p 20009 -h merengue" diff --git a/netsvcs/servers/ntsvc.conf b/netsvcs/servers/ntsvc.conf deleted file mode 100644 index 94ed5d78c2a..00000000000 --- a/netsvcs/servers/ntsvc.conf +++ /dev/null @@ -1,12 +0,0 @@ -# Windows NT version. -# -# These are the services that can be linked into ACE. -# Note that your path needs to include the path for netsvcs.dll -# In addition, you can replace the hardcoded "-p 20xxx" with "-p -# $PORTxxx" if you set your environment variables correctly. - -dynamic Token_Service Service_Object * netsvcs.dll:_make_ACE_Token_Acceptor() "-p 20202" -dynamic Name_Server Service_Object * netsvcs.dll:_make_ACE_Name_Acceptor() "-p 20012" -#dynamic Client_Logging_Service Service_Object * netsvcs.dll:_make_ACE_Client_Logging_Connector() active "-p 20008" -#dynamic Server_Logging_Service Service_Object * netsvcs.dll:_make_ACE_Server_Logging_Acceptor() active "-p 20009" -#dynamic Thr_Server_Logging_Service Service_Object * netsvcs.dll:_make_ACE_Thr_Server_Logging_Acceptor() active "-p 20020" diff --git a/protocols/ace/RMCast/README b/protocols/ace/RMCast/README deleted file mode 100644 index 2dd0c5d9cfc..00000000000 --- a/protocols/ace/RMCast/README +++ /dev/null @@ -1,57 +0,0 @@ -# $Id$ - - This directory will contain a simple, small-scale reliable -multicast framework for ACE. The framework is based on the ASX -components of the ACE library: the protocol is implemented as a stack -of interchangeable "modules", each one in charge of a very small task. -For example, one module implements fragmentation and reassembly, other -modules implement retransmission, send ACK and NAK messages, and -maintain receiver membership. - - The modules are replaced to achieve different levels of -reliability. For example, the retransmission module can be either the -"Best_Effort", "Semi_Reliable" or "Reliable" implementation. In the -first case no retransmissions are performed, but lost messages are -detected and reported to the receiver. The "Semi_Reliable" case -messages are held for a pre-specified amount of time, and -re-transmited if requested, but it is possible to loose some messages -if multiple re-transmissions fail. As in the "Best_Effort" case the -lost messages are detected and flagged to the application. Finally -in the "Reliable" mode the senders are flowed controlled until enough -messages are successfully transmitted. - - In general the stack looks like this: - - -SENDER: - ----------------------------------------------------------------- -Buffering : Save lost messages -Retransmission : Retransmit ----------------------------------------------------------------- -Fragmentation : Fragment messages in smaller chunks -Reassembly : and ensure that the IOVMAX limit is not - : reached ----------------------------------------------------------------- -Tranport : Encapsulate the specific transport media - : such as TCP/IP, ATM, or shared memory - : Demuxes incoming data to the right chain - : Change control messages and data messages - : to the right dynamic types. ----------------------------------------------------------------- - -RECEIVER: - ----------------------------------------------------------------- -Lost detection : Detect lost messages and send control - : messages back ----------------------------------------------------------------- -Reassembly : Reassemble messages, fragment control -Fragmentation : data ----------------------------------------------------------------- -Transport : Group membership, ACT reception, - : handle keep-alive messages... ----------------------------------------------------------------- - - -@@ TODO: Piggybacking... diff --git a/protocols/ace/RMCast/RMCast_Export.h b/protocols/ace/RMCast/RMCast_Export.h deleted file mode 100644 index 51257c4d682..00000000000 --- a/protocols/ace/RMCast/RMCast_Export.h +++ /dev/null @@ -1,44 +0,0 @@ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by -// generate_export_file.pl -// ------------------------------ -#if !defined (ACE_RMCAST_EXPORT_H) -#define ACE_RMCAST_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_RMCAST_HAS_DLL) -# define ACE_RMCAST_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ACE_RMCAST_HAS_DLL */ - -#if !defined (ACE_RMCAST_HAS_DLL) -#define ACE_RMCAST_HAS_DLL 1 -#endif /* ! ACE_RMCAST_HAS_DLL */ - -#if defined (ACE_RMCAST_HAS_DLL) -# if (ACE_RMCAST_HAS_DLL == 1) -# if defined (ACE_RMCAST_BUILD_DLL) -# define ACE_RMCast_Export ACE_Proper_Export_Flag -# define ACE_RMCAST_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else -# define ACE_RMCast_Export ACE_Proper_Import_Flag -# define ACE_RMCAST_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ACE_RMCAST_BUILD_DLL */ -# else -# define ACE_RMCast_Export -# define ACE_RMCAST_SINGLETON_DECLARATION(T) -# define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ! ACE_RMCAST_HAS_DLL == 1 */ -#else -# define ACE_RMCast_Export -# define ACE_RMCAST_SINGLETON_DECLARATION(T) -# define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ACE_RMCAST_HAS_DLL */ - -#endif /* ACE_RMCAST_EXPORT_H */ - -// End of auto generated file. diff --git a/tests/CDR_File_Test.cpp b/tests/CDR_File_Test.cpp index 49ae77be57a..010ae8683c6 100644 --- a/tests/CDR_File_Test.cpp +++ b/tests/CDR_File_Test.cpp @@ -341,7 +341,6 @@ main (int argc, ACE_TCHAR *argv[]) filename.set (fn); } - ACE_FILE_Connector connector; ACE_FILE_IO file; @@ -353,17 +352,11 @@ main (int argc, ACE_TCHAR *argv[]) 0, ((writing) ? (O_RDWR | O_CREAT) : O_RDONLY), ACE_DEFAULT_FILE_PERMS) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("connect failed for %p\n"), - filename.get_path_name ()), - 1); - -#if !defined (ACE_WIN32) \ - || (defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 == 1) -# define TEST_CAN_UNLINK_IN_ADVANCE -#endif + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("connect failed for %p\n"), + filename.get_path_name ()), + 1); -#if defined(TEST_CAN_UNLINK_IN_ADVANCE) if (fn == 0) { // Unlink this file right away so that it is automatically removed @@ -374,7 +367,6 @@ main (int argc, ACE_TCHAR *argv[]) filename.get_path_name ()), 1); } -#endif CDR_Test cdr_test ('a', 0x00ff, @@ -401,18 +393,6 @@ main (int argc, ACE_TCHAR *argv[]) cdr_test); } -#if !defined (TEST_CAN_UNLINK_IN_ADVANCE) - if (fn == 0) - { - file.close (); - if (file.unlink () == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("unlink failed for %p\n"), - filename.get_path_name ()), - 1); - } -#endif - ACE_END_TEST; return 0; } diff --git a/tests/CLASSIX_Addr_Test.icc b/tests/CLASSIX_Addr_Test.icc new file mode 100644 index 00000000000..e8bb296faca --- /dev/null +++ b/tests/CLASSIX_Addr_Test.icc @@ -0,0 +1,22 @@ +option + define ("ACE_HAS_WINSOCK2","1"), + define ("__ACE_INLINE__","0"), + define ("WIN32","1"), + define ("_WINDOWS","1"), + define("ACE_HAS_DLL","0"), + link(libSearchPath,'H:\ACE_wrappers\ace'), + incl(searchPath,'H:\ACE_wrappers'), + link(linkWithMultiThreadLib,yes) + { + target "CLASSIX_Addr_Test.exe" + { + source type (cpp) "CLASSIX_Addr_Test.cpp" + + source type (lib) "aced.lib" + source type (lib) "advapi32.lib" + source type (lib) "user32.lib" + source type (lib) "ws2_32.lib" + source type (lib) "wsock32.lib" + source type (lib) "mswsock.lib" + } + } diff --git a/tests/CLASSIX_CLD_Connector_Test.icc b/tests/CLASSIX_CLD_Connector_Test.icc new file mode 100644 index 00000000000..0e6616500a0 --- /dev/null +++ b/tests/CLASSIX_CLD_Connector_Test.icc @@ -0,0 +1,22 @@ +option + define ("ACE_HAS_WINSOCK2","1"), + define ("__ACE_INLINE__","0"), + define ("WIN32","1"), + define ("_WINDOWS","1"), + define("ACE_HAS_DLL","0"), + link(libSearchPath,'H:\ACE_wrappers\ace'), + incl(searchPath,'H:\ACE_wrappers'), + link(linkWithMultiThreadLib,yes) + { + target "CLASSIX_CLD_Connector_Test.exe" + { + source type (cpp) "CLASSIX_CLD_Connector_Test.cpp" + + source type (lib) "aced.lib" + source type (lib) "advapi32.lib" + source type (lib) "user32.lib" + source type (lib) "ws2_32.lib" + source type (lib) "wsock32.lib" + source type (lib) "mswsock.lib" + } + } diff --git a/tests/CLASSIX_Con_Acc_Test.icc b/tests/CLASSIX_Con_Acc_Test.icc new file mode 100644 index 00000000000..d17e9fd3189 --- /dev/null +++ b/tests/CLASSIX_Con_Acc_Test.icc @@ -0,0 +1,22 @@ +option + define ("ACE_HAS_WINSOCK2","1"), + define ("__ACE_INLINE__","0"), + define ("WIN32","1"), + define ("_WINDOWS","1"), + define("ACE_HAS_DLL","0"), + link(libSearchPath,'H:\ACE_wrappers\ace'), + incl(searchPath,'H:\ACE_wrappers'), + link(linkWithMultiThreadLib,yes) + { + target "CLASSIX_Con_Acc_Test.exe" + { + source type (cpp) "CLASSIX_Con_Acc_Test.cpp" + + source type (lib) "aced.lib" + source type (lib) "advapi32.lib" + source type (lib) "user32.lib" + source type (lib) "ws2_32.lib" + source type (lib) "wsock32.lib" + source type (lib) "mswsock.lib" + } + } diff --git a/tests/CLASSIX_Group_Test.icc b/tests/CLASSIX_Group_Test.icc new file mode 100644 index 00000000000..2dc3fd5b678 --- /dev/null +++ b/tests/CLASSIX_Group_Test.icc @@ -0,0 +1,22 @@ +option + define ("ACE_HAS_WINSOCK2","1"), + define ("__ACE_INLINE__","0"), + define ("WIN32","1"), + define ("_WINDOWS","1"), + define("ACE_HAS_DLL","0"), + link(libSearchPath,'H:\ACE_wrappers\ace'), + incl(searchPath,'H:\ACE_wrappers'), + link(linkWithMultiThreadLib,yes) + { + target "CLASSIX_Group_Test.exe" + { + source type (cpp) "CLASSIX_Group_Test.cpp" + + source type (lib) "aced.lib" + source type (lib) "advapi32.lib" + source type (lib) "user32.lib" + source type (lib) "ws2_32.lib" + source type (lib) "wsock32.lib" + source type (lib) "mswsock.lib" + } + } diff --git a/tests/CLASSIX_Notify_Test.icc b/tests/CLASSIX_Notify_Test.icc new file mode 100644 index 00000000000..f3c29c97ce4 --- /dev/null +++ b/tests/CLASSIX_Notify_Test.icc @@ -0,0 +1,22 @@ +option + define ("ACE_HAS_WINSOCK2","1"), + define ("__ACE_INLINE__","0"), + define ("WIN32","1"), + define ("_WINDOWS","1"), + define("ACE_HAS_DLL","0"), + link(libSearchPath,'H:\ACE_wrappers\ace'), + incl(searchPath,'H:\ACE_wrappers'), + link(linkWithMultiThreadLib,yes) + { + target "CLASSIX_Notify_Test.exe" + { + source type (cpp) "CLASSIX_Notify_Test.cpp" + + source type (lib) "aced.lib" + source type (lib) "advapi32.lib" + source type (lib) "user32.lib" + source type (lib) "ws2_32.lib" + source type (lib) "wsock32.lib" + source type (lib) "mswsock.lib" + } + } diff --git a/tests/CLASSIX_OS_Test.icc b/tests/CLASSIX_OS_Test.icc new file mode 100644 index 00000000000..2896c5b3ef3 --- /dev/null +++ b/tests/CLASSIX_OS_Test.icc @@ -0,0 +1,22 @@ +option + define ("ACE_HAS_WINSOCK2","1"), + define ("__ACE_INLINE__","0"), + define ("WIN32","1"), + define ("_WINDOWS","1"), + define("ACE_HAS_DLL","0"), + link(libSearchPath,'H:\ACE_wrappers\ace'), + incl(searchPath,'H:\ACE_wrappers'), + link(linkWithMultiThreadLib,yes) + { + target "CLASSIX_OS_Test.exe" + { + source type (cpp) "CLASSIX_OS_Test.cpp" + + source type (lib) "aced.lib" + source type (lib) "advapi32.lib" + source type (lib) "user32.lib" + source type (lib) "ws2_32.lib" + source type (lib) "wsock32.lib" + source type (lib) "mswsock.lib" + } + } diff --git a/tests/CLASSIX_Reactor_Test.icc b/tests/CLASSIX_Reactor_Test.icc new file mode 100644 index 00000000000..8982535cec4 --- /dev/null +++ b/tests/CLASSIX_Reactor_Test.icc @@ -0,0 +1,22 @@ +option + define ("ACE_HAS_WINSOCK2","1"), + define ("__ACE_INLINE__","0"), + define ("WIN32","1"), + define ("_WINDOWS","1"), + define("ACE_HAS_DLL","0"), + link(libSearchPath,'H:\ACE_wrappers\ace'), + incl(searchPath,'H:\ACE_wrappers'), + link(linkWithMultiThreadLib,yes) + { + target "CLASSIX_Reactor_Test.exe" + { + source type (cpp) "CLASSIX_Reactor_Test.cpp" + + source type (lib) "aced.lib" + source type (lib) "advapi32.lib" + source type (lib) "user32.lib" + source type (lib) "ws2_32.lib" + source type (lib) "wsock32.lib" + source type (lib) "mswsock.lib" + } + } diff --git a/tests/CLASSIX_Select_Reactor_Test.icc b/tests/CLASSIX_Select_Reactor_Test.icc new file mode 100644 index 00000000000..b7f06f11b5e --- /dev/null +++ b/tests/CLASSIX_Select_Reactor_Test.icc @@ -0,0 +1,22 @@ +option + define ("ACE_HAS_WINSOCK2","1"), + define ("__ACE_INLINE__","0"), + define ("WIN32","1"), + define ("_WINDOWS","1"), + define("ACE_HAS_DLL","0"), + link(libSearchPath,'H:\ACE_wrappers\ace'), + incl(searchPath,'H:\ACE_wrappers'), + link(linkWithMultiThreadLib,yes) + { + target "CLASSIX_Select_Reactor_Test.exe" + { + source type (cpp) "CLASSIX_Select_Reactor_Test.cpp" + + source type (lib) "aced.lib" + source type (lib) "advapi32.lib" + source type (lib) "user32.lib" + source type (lib) "ws2_32.lib" + source type (lib) "wsock32.lib" + source type (lib) "mswsock.lib" + } + } diff --git a/tests/CLASSIX_Stream_Test.icc b/tests/CLASSIX_Stream_Test.icc new file mode 100644 index 00000000000..6811d6fdb0b --- /dev/null +++ b/tests/CLASSIX_Stream_Test.icc @@ -0,0 +1,22 @@ +option + define ("ACE_HAS_WINSOCK2","1"), + define ("__ACE_INLINE__","0"), + define ("WIN32","1"), + define ("_WINDOWS","1"), + define("ACE_HAS_DLL","0"), + link(libSearchPath,'H:\ACE_wrappers\ace'), + incl(searchPath,'H:\ACE_wrappers'), + link(linkWithMultiThreadLib,yes) + { + target "CLASSIX_Stream_Test.exe" + { + source type (cpp) "CLASSIX_Stream_Test.cpp" + + source type (lib) "aced.lib" + source type (lib) "advapi32.lib" + source type (lib) "user32.lib" + source type (lib) "ws2_32.lib" + source type (lib) "wsock32.lib" + source type (lib) "mswsock.lib" + } + } diff --git a/tests/CPP_Test.cpp b/tests/CPP_Test.cpp deleted file mode 100644 index 4c0bd291a50..00000000000 --- a/tests/CPP_Test.cpp +++ /dev/null @@ -1,261 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// CPP_Test.cpp -// -// = DESCRIPTION -// This is a simple test of the ACE_SOCK_Acceptor and -// AC_SOCK_Connector classes. The test forks two processes or -// spawns two threads (depending upon the platform) and then executes -// client and server allowing them to connect and exchange -// data. No user input is required as far as command line -// arguments are concerned. -// -// = AUTHOR -// Prashant Jain and Doug Schmidt -// -// ============================================================================ - -#include "ace/OS.h" -#include "ace/Thread.h" -#include "ace/Service_Config.h" -#include "ace/SOCK_Connector.h" -#include "ace/SOCK_Acceptor.h" -#include "ace/SOCK_Stream.h" -#include "ace/INET_Addr.h" -#include "ace/Handle_Set.h" -#include "test_config.h" - -static void * -client (void *arg) -{ -#if (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS) - // Insert thread into thr_mgr - ACE_Thread_Control thread_control (ACE_Service_Config::thr_mgr ()); - ACE_NEW_THREAD; -#endif /* (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS) */ - - ACE_INET_Addr *remote_addr = (ACE_INET_Addr *) arg; - ACE_INET_Addr server_addr (remote_addr->get_port_number (), "localhost"); - ACE_SOCK_Stream cli_stream; - ACE_SOCK_Connector con; - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting non-blocking connect\n")); - // Initiate timed, non-blocking connection with server. - - // Attempt a non-blocking connect to the server, reusing the local - // addr if necessary. - if (con.connect (cli_stream, server_addr, - (ACE_Time_Value *) &ACE_Time_Value::zero) == -1) - { - if (errno != EWOULDBLOCK) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "connection failed")); - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting timed connect\n")); - - // Check if non-blocking connection is in progress, - // and wait up to ACE_DEFAULT_TIMEOUT seconds for it to complete. - ACE_Time_Value tv (ACE_DEFAULT_TIMEOUT); - - if (con.complete (cli_stream, &server_addr, &tv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "connection failed"), 0); - else - ACE_DEBUG ((LM_DEBUG, "(%P|%t) connected to %s\n", - server_addr.get_host_name ())); - } - - if (cli_stream.disable (ACE_NONBLOCK) == -1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "disable")); - - // Send data to server (correctly handles "incomplete writes"). - - for (char c = 'a'; c <= 'z'; c++) - if (cli_stream.send_n (&c, 1) == -1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "send_n")); - - // Explicitly close the writer-side of the connection. - if (cli_stream.close_writer () == -1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "close_writer")); - - char buf[1]; - - // Wait for handshake with server. - if (cli_stream.recv_n (buf, 1) != 1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "recv_n")); - - // Close the connection completely. - if (cli_stream.close () == -1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "close")); - - return 0; -} - -static void * -server (void *arg) -{ -#if (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS) - // Insert thread into thr_mgr - ACE_Thread_Control thread_control (ACE_Service_Config::thr_mgr ()); - ACE_NEW_THREAD; -#endif /* (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS) */ - - ACE_SOCK_Acceptor *peer_acceptor = (ACE_SOCK_Acceptor *) arg; - - if (peer_acceptor->enable (ACE_NONBLOCK) == -1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "enable")); - - // Keep these objects out here to prevent excessive constructor - // calls... - ACE_SOCK_Stream new_stream; - ACE_INET_Addr cli_addr; - ACE_Handle_Set handle_set; - ACE_Time_Value tv (ACE_DEFAULT_TIMEOUT); - // Performs the iterative server activities. - - for (;;) - { - char buf[BUFSIZ]; - char t = 'a'; - - handle_set.reset (); - handle_set.set_bit (peer_acceptor->get_handle ()); - - int result = ACE_OS::select (int (peer_acceptor->get_handle ()) + 1, - handle_set, - 0, 0, &tv); - if (result == -1) - ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "select"), 0); - else if (result == 0) - { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) select timed out, shutting down\n")); - return 0; - } - - // Create a new ACE_SOCK_Stream endpoint (note automatic restart - // if errno == EINTR). - - while ((result = peer_acceptor->accept (new_stream, &cli_addr)) != -1) - { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) client %s connected from %d\n", - cli_addr.get_host_name (), cli_addr.get_port_number ())); - - // Enable non-blocking I/O. - if (new_stream.enable (ACE_NONBLOCK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "enable"), 0); - - handle_set.reset (); - handle_set.set_bit (new_stream.get_handle ()); - - // Read data from client (terminate on error). - - for (ssize_t r_bytes; ;) - { - if (ACE_OS::select (int (new_stream.get_handle ()) + 1, - handle_set, - 0, 0, 0) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "select"), 0); - - while ((r_bytes = new_stream.recv_n (buf, 1)) > 0) - { - ACE_ASSERT (t == buf[0]); - t++; - } - - if (r_bytes == 0) - { - ACE_DEBUG ((LM_DEBUG, - "(%P|%t) reached end of input, connection closed by client\n")); - - // Handshake back with client. - if (new_stream.send_n ("", 1) != 1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "send_n")); - - // Close endpoint. - if (new_stream.close () == -1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "close")); - return 0; - } - else if (r_bytes == -1) - { - if (errno == EWOULDBLOCK) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) no input available, going back to reading\n")); - else - ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "recv_n"), 0); - } - } - } - - if (result == -1) - { - if (errno == EWOULDBLOCK) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) no connections available, going back to accepting\n")); - else - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "accept")); - } - } - return 0; -} - -static void -spawn (void) -{ - // Acceptor - ACE_SOCK_Acceptor peer_acceptor; - - // Create a server address. - ACE_INET_Addr server_addr; - - // Bind listener to any port and then find out what the port was. - if (peer_acceptor.open (ACE_Addr::sap_any) == -1 - || peer_acceptor.get_local_addr (server_addr) == -1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "open")); - else - { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting server at port %d\n", - server_addr.get_port_number ())); - -#if !defined (ACE_WIN32) && !defined (VXWORKS) - switch (ACE_OS::fork ()) - { - case -1: - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n%a", "fork failed")); - exit (-1); - case 0: - ACE_LOG_MSG->sync ("child"); - client (&server_addr); - default: - server ((void *) &peer_acceptor); - ACE_OS::wait (); - } -#elif defined (ACE_HAS_THREADS) - if (ACE_Service_Config::thr_mgr ()->spawn - (ACE_THR_FUNC (server), (void *) &peer_acceptor, THR_NEW_LWP | THR_DETACHED) == -1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n%a", "thread create failed")); - - if (ACE_Service_Config::thr_mgr ()->spawn - (ACE_THR_FUNC (client), (void *) &server_addr, THR_NEW_LWP | THR_DETACHED) == -1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n%a", "thread create failed")); - - // Wait for the threads to exit. - ACE_Service_Config::thr_mgr ()->wait (); -#else - ACE_ERROR ((LM_ERROR, "(%P|%t) only one thread may be run in a process on this platform\n%a", 1)); -#endif /* ACE_HAS_THREADS */ - } -} - -int -main (int, char *[]) -{ - ACE_START_TEST ("CPP_Test"); - - spawn (); - - ACE_END_TEST; - return 0; -} diff --git a/tests/Cached_Accept_Conn_Test.cpp b/tests/Cached_Accept_Conn_Test.cpp index fba0e81eb94..dbc6eeace92 100644 --- a/tests/Cached_Accept_Conn_Test.cpp +++ b/tests/Cached_Accept_Conn_Test.cpp @@ -149,12 +149,12 @@ typedef Accept_Strategy<Server_Svc_Handler, ACE_SOCK_ACCEPTOR> defined (ACE_HAS_GNU_REPO) // The explicit instantiations are necessary with g++ 2.91.66 // with -frepo, because it misses some of them. -# if (defined (ghs) || defined(__MINGW32__)) && defined(ACE_WIN32) +# if defined (ghs) && defined(ACE_WIN32) template class ACE_Node<ACE_HANDLE>; # endif // = Handle Gobbler # if (ACE_SIZEOF_INT != 4) && !defined (ACE_WIN32) -// These might be already instantiated in ace/stats.cpp +// These might be already instantiated in ace/stats.cpp // (if ACE_HANDLE == int && ACE_INT32 == int) template class ACE_Node<ACE_HANDLE>; # endif /* ACE_SIZEOF_INT != 4 && !ACE_WIN32 */ diff --git a/tests/Cached_Conn_Test.cpp b/tests/Cached_Conn_Test.cpp index 05220d9361f..0c599fc769d 100644 --- a/tests/Cached_Conn_Test.cpp +++ b/tests/Cached_Conn_Test.cpp @@ -124,12 +124,12 @@ typedef ACE_Cached_Connect_Strategy_Ex<Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_ // The explicit instantiations are necessary with g++ 2.91.66 // with -frepo, because it misses some of them. -# if (defined (ghs) || defined (__MINGW32__)) && defined (ACE_WIN32) +# if defined (ghs) && defined(ACE_WIN32) template class ACE_Node<ACE_HANDLE>; # endif // = Handle Gobbler #if (ACE_SIZEOF_INT != 4) && !defined (ACE_WIN32) -// These might be already instantiated in ace/stats.cpp +// These might be already instantiated in ace/stats.cpp // (if ACE_HANDLE == int && ACE_INT32 == int) template class ACE_Node<ACE_HANDLE>; #endif /* ACE_SIZEOF_INT != 4 && !ACE_WIN32 */ diff --git a/tests/Config_Test.cpp b/tests/Config_Test.cpp index 61e7e1d2be9..8d0b2ece0c5 100644 --- a/tests/Config_Test.cpp +++ b/tests/Config_Test.cpp @@ -13,15 +13,12 @@ // <ACE_Configuration> work correctly. // // = AUTHOR -// Michael Searles <msearles@base16.com>, -// Chris Hafey <chafey@stentor.com>, and -// Jerry D. Odenwelder Jr. <jerry.o@mindspring.com> +// Michael Searles <msearles@base16.com> and Chris Hafey <chafey@stentor.com> // // ============================================================================ -#include "test_config.h" +#include "tests/test_config.h" #include "Config_Test.h" -#include "ace/Configuration_Import_Export.h" ACE_RCSID(tests, Config_Test, "$Id$") @@ -62,7 +59,7 @@ test (ACE_Configuration *config) u_char data[80]; - for (int i = 0; i < 80; i++) + for(int i = 0; i < 80; i++) data[i] = i + 128; if (config->set_binary_value (testsection, @@ -100,7 +97,7 @@ test (ACE_Configuration *config) return -10; // compare em - for (int j = 0; j < 80; j++) + for(int j = 0; j < 80; j++) if (data_out[j] != data[j]) return -11; @@ -227,6 +224,66 @@ test (ACE_Configuration *config) } static int +test_io (ACE_Configuration *config) +{ + // Populate with some data + ACE_Configuration_Section_Key root = + config->root_section (); + ACE_Configuration_Section_Key test; + + if (config->open_section(root, + ACE_TEXT ("test"), + 1, + test)) + return -1; + + ACE_TString value ("string value"); + + if (config->set_string_value (test, + ACE_TEXT ("stvalue"), + value)) + return -2; + else if (config->set_string_value (test, + ACE_TEXT ("stvalue1"), + value)) + return -3; + else if (config->set_integer_value (test, + ACE_TEXT ("intvalue"), + 42)) + return -4; + + ACE_Configuration_Section_Key test2; + + if (config->open_section (test, + ACE_TEXT ("test2"), + 1, + test2)) + return -5; + else if (config->set_string_value (test2, + ACE_TEXT ("2stvalue"), + value)) + return -6; + else if (config->set_string_value (test2, + ACE_TEXT ("2stvalue1"), + value)) + return -7; + else if (config->set_integer_value (test2, + ACE_TEXT ("2intvalue"), + 42)) + return -8; + + // Export it to a file + if(config->export_config (ACE_TEXT ("config.ini"))) + return -9; + // reimport + + if (config->import_config (ACE_TEXT ("config.ini"))) + return -10; + + return 0; +} + +static int run_tests (void) { #if defined (ACE_WIN32) @@ -247,6 +304,7 @@ run_tests (void) } #endif /* ACE_WIN32 */ + // Test Heap version ACE_Configuration_Heap heap_config; @@ -276,827 +334,107 @@ run_tests (void) -1); } - ACE_DEBUG ((LM_DEBUG, "Test passed\n")); - return 0; -} - -static int -build_config_object (ACE_Configuration& cfg) -{ - ACE_Configuration_Section_Key root = cfg.root_section (); - ACE_Configuration_Section_Key NetworkSection; - ACE_Configuration_Section_Key LoggerSection; - ACE_Configuration_Section_Key BinarySection; - - if (cfg.open_section (root, - ACE_TEXT ("network"), - 1, - NetworkSection)) - return -1; - - if (cfg.set_integer_value (NetworkSection, - ACE_TEXT ("TimeToLive"), - 100)) + // Test file i/o using a transient heap + ACE_Configuration_Heap io_config; + if (io_config.open ()) return -2; - else if (cfg.set_string_value (NetworkSection, - ACE_TEXT ("Delay"), - ACE_TString ("FALSE"))) - return -3; - else if (cfg.set_string_value (NetworkSection, - ACE_TEXT ("DestIPAddress"), - ACE_TString ("localhost"))) - return -4; - else if (cfg.set_integer_value (NetworkSection, - ACE_TEXT ("DestPort"), - 12670)) - return -5; - else if (cfg.set_integer_value (NetworkSection, - ACE_TEXT ("ReconnectInterval"), - 3)) - return -6; - - if (cfg.open_section (root, - ACE_TEXT ("logger"), - 1, - LoggerSection)) - return -7; - - - if (cfg.set_string_value (LoggerSection, - ACE_TEXT ("Heading"), - ACE_TString ("ACE - Adaptive Communication Environment"))) - return -8; - else if (cfg.set_integer_value (LoggerSection, - ACE_TEXT ("SeekIndex"), - 14)) - return -9; - else if (cfg.set_integer_value (LoggerSection, - ACE_TEXT ("TraceLevel"), - 6)) - return -10; - else if (cfg.set_string_value (LoggerSection, - ACE_TEXT ("Justification"), - ACE_TString ("left_justified"))) - return -11; - else if (cfg.set_string_value (LoggerSection, - ACE_TEXT ("LogFilePath"), - ACE_TString ("log/"))) - return -12; - else if (cfg.set_string_value (LoggerSection, - ACE_TEXT ("TransactionFilePath"), - ACE_TString ("data/"))) - return -13; - - if (cfg.open_section (root, - ACE_TEXT ("binary"), - 1, - BinarySection)) - return -14; - u_char data[80]; - - for (int i = 0; i < 80; i++) - data[i] = i + 128; - - if (cfg.set_binary_value (BinarySection, - ACE_TEXT ("data"), - data, - 80)) - return -15; + int result = test_io (&io_config); + if (result) + ACE_ERROR_RETURN ((LM_ERROR, + "IO Test Failed (%d)\n", + result), + -3); + ACE_DEBUG ((LM_DEBUG, + "Test passed\n")); return 0; } -/* - * Test ACE_Configuration::operator== - */ -int -Config_Test::testEquality () -{ - // create and open 2 ACE_Configuration objects. - ACE_Configuration_Heap heap1; - ACE_Configuration_Heap heap2; - if ((heap1.open ()) != 0) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open heap1\n"), - -1); - - } - else if ((heap2.open ()) != 0) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open heap2\n"), - -1); - } - - // populate them equally - build_config_object (heap1); - build_config_object (heap2); - - // test equality - ACE_DEBUG ((LM_DEBUG, "The objects should equal...\n")); - if (heap1 == heap2) - { - ACE_DEBUG ((LM_DEBUG, "And they do ;-)\n")); - } - else - { - ACE_ERROR_RETURN ((LM_ERROR, - "And they do not :- (\nThe Equality Operator Failed when objects equal\n"), - -1); - } - - // add a section and value to heap1 - ACE_Configuration_Section_Key root1 = heap1.root_section (); - ACE_Configuration_Section_Key NewSection; - if (heap1.open_section (root1, - ACE_TEXT ("NewSection"), - 1, - NewSection)) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Error adding section to heap1\n"), - -1); - } - else if (heap1.set_integer_value (NewSection, - ACE_TEXT ("TestIntValue"), - 100)) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Error adding value to heap1\n"), - -2); - } - - // test equality - ACE_DEBUG ((LM_DEBUG, "The objects should NOT equal...\n")); - if (heap1 == heap2) - { - ACE_ERROR_RETURN ((LM_ERROR, - "They Do :- (\nThe Equality Operator Failed when lhs contains data not in rhs\n"), - -1); - } - else - { - ACE_DEBUG ((LM_DEBUG, "And they do not ;-)\n")); - } - - // - // add same section to heap2 - // - ACE_Configuration_Section_Key root2 = heap2.root_section (); - ACE_Configuration_Section_Key NewSection2; - if (heap2.open_section (root2, - ACE_TEXT ("NewSection"), - 1, - NewSection2)) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Error adding section to heap2\n"), - -1); - } - else if (heap2.set_integer_value (NewSection2, - ACE_TEXT ("TestIntValue"), - 100)) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Error adding value to heap2\n"), - -2); - } - else if (heap2.set_integer_value (NewSection2, - ACE_TEXT ("TestIntValue2"), - 100)) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Error adding second value to heap2\n"), - -2); - - } - // test equality - ACE_DEBUG ((LM_DEBUG, "The objects should NOT equal...\n")); - if (heap1 == heap2) - { - ACE_ERROR_RETURN ((LM_ERROR, - "And They Do :- (\nThe Equality Operator Failed when rhs contains value not in lhs\n"), - -1); - } - else - { - ACE_DEBUG ((LM_DEBUG, "And they do not ;-)\n")); - } - - // add new value in heap 1 - if (heap1.set_integer_value (NewSection, - ACE_TEXT ("TestIntValue2"), - 100)) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Error adding second value to heap1\n"), - -2); - } - - // test equality - ACE_DEBUG ((LM_DEBUG, "The objects should be equal...\n")); - if (heap1 == heap2) - { - ACE_DEBUG ((LM_DEBUG, "And they are ;-)\n")); - } - else - { - ACE_ERROR_RETURN ((LM_ERROR, - "And they are not :- (\nThe Equality Operator Failed\n"), - -1); - } - - // Add a new section to heap2 - ACE_Configuration_Section_Key AnotherNewSection2; - if (heap2.open_section (root2, - ACE_TEXT ("AnotherNewSection"), - 1, - AnotherNewSection2)) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Error adding second section to heap2\n"), - -1); - } - else if (heap2.set_integer_value (AnotherNewSection2, - ACE_TEXT ("TestIntValue"), - 100)) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Error adding value in second section to heap2\n"), - -2); - } - - // test equality - ACE_DEBUG ((LM_DEBUG, "The objects should NOT equal...\n")); - if (heap1 == heap2) - { - ACE_ERROR_RETURN ((LM_ERROR, - "And they do :- (\nThe Equality Operator Failed when rhs contains data not in lhs\n"), - -1); - } - else - { - ACE_DEBUG ((LM_DEBUG, "And they do not :-)\n")); - } - - // add section back to heap1 - ACE_Configuration_Section_Key AnotherNewSection1; - if (heap1.open_section (root1, - ACE_TEXT ("AnotherNewSection"), - 1, - AnotherNewSection1)) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Error adding second section to heap1\n"), - -1); - } - else if (heap1.set_integer_value (AnotherNewSection1, - ACE_TEXT ("TestIntValue"), - 100)) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Error adding second value to second section in heap1\n"), - -2); - } - - // test equality - ACE_DEBUG ((LM_DEBUG, "The objects should be equal...\n")); - if (heap1 == heap2) - { - ACE_DEBUG ((LM_DEBUG, "And they are ;-)\n")); - } - else - { - ACE_ERROR_RETURN ((LM_ERROR, - "And they are not :-)\nThe Equality Operator Failed\n"), - -1); - } - - this->equality_tested_ = 1; - return 0; -} - -/* - * Compare INI import data in fromFile to origional data exported (in origional) - * - * This compare is destructive to the origional object. - * I realize that normally you would not do such an obscene thing but - * this funciton has a special purpose and I know my origional is not needed - * after calling this routine. - * This is done because configuration objects that are imported using the INI - * import store all data as strings. My origional has type information and I need to - * know if the import worked. -*/ -static int -iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original) +void +Config_Test::read_config (void) { - int rc = 1; // start by guessing they are equal - - int sectionIndex = 0; - ACE_TString sectionName; - - const ACE_Configuration_Section_Key& fromFileRoot = fromFile.root_section (); - const ACE_Configuration_Section_Key& originalRoot = original.root_section (); - ACE_Configuration_Section_Key originalSection; - ACE_Configuration_Section_Key fromFileSection; - - // loop through each section in the fromFile object - while ((rc) && - (!fromFile.enumerate_sections (fromFileRoot, - sectionIndex, - sectionName)) ) + if (m_ConfigurationHeap.open () == 0) { - // find that section in the original object - if (original.open_section (originalRoot, - sectionName.c_str (), - 0, - originalSection) != 0) - { - // If the original object does not contain the section then we are not equal. - rc = 0; - } - else if (fromFile.open_section (fromFileRoot, - sectionName.c_str (), - 0, - fromFileSection) != 0) + if (m_ConfigurationHeap.import_config_as_strings (ACE_TEXT ("Config_Test.ini")) == 0) { - // if there is some error opening the section in the fromFile - rc = 0; - } - else - { - // Well the sections match - int valueIndex = 0; - ACE_TString valueName; - ACE_Configuration::VALUETYPE valueType; - ACE_Configuration::VALUETYPE originalType; - - // Enumerate each value in the fromFile section - while ((rc) && - (!fromFile.enumerate_values (fromFileSection, - valueIndex, - valueName, - valueType))) + ACE_Configuration_Section_Key root = m_ConfigurationHeap.root_section (); + // Process [network] section + ACE_Configuration_Section_Key NetworkSection; + if (m_ConfigurationHeap.open_section (root, + ACE_TEXT ("network"), + 1, + NetworkSection) == 0) { - // look for the same value in the original section - if (original.find_value (originalSection, - valueName.c_str (), - originalType) != 0) - { - // We're not equal if the same value cannot - // be found in the original object. - rc = 0; - } - else - { - ACE_TString fromFileString, originalString; - - - if (fromFile.get_string_value (fromFileSection, - valueName.c_str (), - fromFileString) != 0) - { - // we're not equal if we cannot get this string - rc = 0; - } - else if (originalType != ACE_Configuration::STRING) // If the original type is not a string - { - // convert original data to a string. - - if (originalType == ACE_Configuration::INTEGER) - { - u_int intValue; - ACE_TCHAR int_value[32]; - - if (original.get_integer_value (originalSection, - valueName.c_str (), - intValue) != 0) - { - // we're not equal if we cannot get rhs int - rc = 0; - } - ACE_OS::sprintf (int_value, ACE_LIB_TEXT ("%08x"), intValue); - originalString = int_value; - } - else if (originalType == ACE_Configuration::BINARY) - { - - void* binary_data; - u_int binary_length; - - if (original.get_binary_value (originalSection, - valueName.c_str (), - binary_data, - binary_length)) - { - // we're not equal if we cannot get this string - rc = 0; - } - else - { - ACE_TCHAR bin_value[3]; - - unsigned char* ptr = (unsigned char*)binary_data; - while (binary_length) - { - if (ptr != binary_data) - { - originalString += ACE_LIB_TEXT (","); - } - ACE_OS::sprintf (bin_value, ACE_LIB_TEXT ("%02x"), *ptr); - originalString += bin_value; - --binary_length; - ++ptr; - } - delete (char *)binary_data; - }// end successful binary read - }// end if originalType was binary - else - { - // if the type is invalid, then go ahead and fail it. - rc = 0; - } - - }// end if the original type was not a string. - else - { - if (original.get_string_value (originalSection, - valueName.c_str (), - originalString) != 0) - { - // we're not equal if we cannot get rhs string - rc = 0; - } - - } - - rc &= fromFileString == originalString; - - if (rc) - { - // before we move on remove this value from the original. - original.remove_value (originalSection, - valueName.c_str ()); - } - - }// end else if values match. - - valueIndex++; - - }// end value while loop - - // at this point the original should have no values. - // look for values in the original section - valueIndex = 0; - while ((rc) && - (!original.enumerate_values (originalSection, - valueIndex, - valueName, - originalType))) + this->get_section_integer (NetworkSection, + ACE_TEXT ("TimeToLive"), + &m_nTimeToLive, + 1, + 20); + this->get_section_boolean (NetworkSection, + ACE_TEXT ("Delay"), + &m_bDelay); + this->get_section_string (NetworkSection, + ACE_TEXT ("DestIPAddress"), + m_pszDestIPAddress, + TEST_MAX_STRING); + this->get_section_integer (NetworkSection, + ACE_TEXT ("DestPort"), + &m_nDestPort, + 0, + 65535); + this->get_section_integer (NetworkSection, + ACE_TEXT ("ReconnectInterval"), + &m_nReconnectInterval, + 0, + 65535); + } + + // Process [logger] section + ACE_Configuration_Section_Key LoggerSection; + + if (m_ConfigurationHeap.open_section (root, + ACE_TEXT ("logger"), + 1, + LoggerSection) == 0) { - valueIndex++; - }// end while for rhs values not in this. - - // having a value indicates a mismatch - rc = valueIndex == 0; - - }// end else if sections match. - - if (rc) - { - // before we move on remove the section from the original. - original.remove_section (originalRoot, - sectionName.c_str (), - 0); // do not remove subsections. - } - - sectionIndex++; - - }// end section while loop - - // Finally, if the original has any sections, then we're not equal - sectionIndex = 0; - while ((rc) && - (!original.enumerate_sections (originalRoot, - sectionIndex, - sectionName)) ) - { - sectionIndex++; - } - - rc = sectionIndex == 0; - - return rc; -} - -// Used to test INI Import Export class - -int -Config_Test::testIniFormat () -{ - int rc = 0; - if (!this->equality_tested_) - { - rc = this->testEquality (); - if (rc != 0) - { - ACE_DEBUG ((LM_DEBUG, "Equality Test Failed\n")); - return rc; - } - } - ACE_DEBUG ((LM_DEBUG, "Testing INI Format Import/Export\n")); - ACE_Configuration_Heap fromFile; - - // 1. Creates an ACE_Configuration_Heap object - ACE_Configuration_Heap original; - - rc = original.open (); - if (rc == 0) - { - rc = build_config_object (original); - // 2. Calls build_config_object to populate - if (rc != 0) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Error populating original config object (%d)\n", - rc), - -1); - } - - // 3. Export - ACE_Ini_ImpExp importExport (original); - - rc = importExport.export_config (ACE_TEXT ("testConfig.ini")); - if (rc != 0) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Error Exporting (%d)\n", - rc), - -1); - } - - } - else - { - ACE_ERROR_RETURN ((LM_ERROR, - "Could not open original object (%d)\n", - rc), - -1); - } - - - // At this point we've successfully created, populated and written - // the configuration object - // 5. Creates a new ACE_Configuration_Heap object - rc = fromFile.open (); - if (rc == 0) - { - // 6. Imports - ACE_Ini_ImpExp importExport (fromFile); - - rc = importExport.import_config (ACE_TEXT ("testConfig.ini")); - if (rc != 0) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Error Exporting (%d)\n", - rc), - -1); + this->get_section_string (LoggerSection, + ACE_TEXT ("Heading"), + m_pszHeading, + TEST_MAX_STRING); + this->get_section_integer (LoggerSection, + ACE_TEXT ("TraceLevel"), + &m_nTraceLevel, + 1, + 20); + this->get_section_string (LoggerSection, + ACE_TEXT ("Justification"), + m_pszJustification, + TEST_MAX_STRING); + this->get_section_string (LoggerSection, + ACE_TEXT ("LogFilePath"), + m_pszLogFilePath, + TEST_MAX_STRING); + this->get_section_string (LoggerSection, + ACE_TEXT ("TransactionFilePath"), + m_pszTransactionFilePath, + TEST_MAX_STRING); + } } - - // 7. Compares to original. - // This is a special compare since files imported using the - // INI file import do not contain type information - // - // NOTE: After this call the original object will be invalid!!! - // - if (!iniCompare (fromFile, original)) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Object read from file does not equal original (%d)\n", - rc), - -1); - - } - }// end if heap could not be opened. - else - { - ACE_ERROR_RETURN ((LM_ERROR, - "Could not open fromFile object (%d)\n", - rc), - -1); } - - // 8. Calls old "read_config" methods on the new object - - int nTimeToLive; - int bDelay; - int nDestPort; - int nReconnectInterval; - int nTraceLevel; - - ACE_TCHAR pszDestIPAddress[TEST_MAX_STRING]; - ACE_TCHAR pszLogFilePath[TEST_MAX_STRING]; - ACE_TCHAR pszTransactionFilePath[TEST_MAX_STRING]; - ACE_TCHAR pszHeading[TEST_MAX_STRING]; - ACE_TCHAR pszJustification[TEST_MAX_STRING]; - - ACE_Configuration_Section_Key root = fromFile.root_section (); - - // Process [network] section - ACE_Configuration_Section_Key NetworkSection; - if (fromFile.open_section (root, - ACE_TEXT ("network"), - 1, - NetworkSection) == 0) - { - this->get_section_integer (fromFile, - NetworkSection, - ACE_TEXT ("TimeToLive"), - &nTimeToLive, - 1, - 20); - - this->get_section_boolean (fromFile, - NetworkSection, - ACE_TEXT ("Delay"), - &bDelay); - - this->get_section_string (fromFile, - NetworkSection, - ACE_TEXT ("DestIPAddress"), - pszDestIPAddress, - TEST_MAX_STRING); - - this->get_section_integer (fromFile, - NetworkSection, - ACE_TEXT ("DestPort"), - &nDestPort, - 0, - 65535); - - this->get_section_integer (fromFile, - NetworkSection, - ACE_TEXT ("ReconnectInterval"), - &nReconnectInterval, - 0, - 65535); - }// end of "network" section - - // Process [logger] section - ACE_Configuration_Section_Key LoggerSection; - if (fromFile.open_section (root, - ACE_TEXT ("logger"), - 1, - LoggerSection) == 0) - { - this->get_section_string (fromFile, - LoggerSection, - ACE_TEXT ("Heading"), - pszHeading, - TEST_MAX_STRING); - this->get_section_integer (fromFile, - LoggerSection, - ACE_TEXT ("TraceLevel"), - &nTraceLevel, - 1, - 20); - this->get_section_string (fromFile, - LoggerSection, - ACE_TEXT ("Justification"), - pszJustification, - TEST_MAX_STRING); - this->get_section_string (fromFile, - LoggerSection, - ACE_TEXT ("LogFilePath"), - pszLogFilePath, - TEST_MAX_STRING); - this->get_section_string (fromFile, - LoggerSection, - ACE_TEXT ("TransactionFilePath"), - pszTransactionFilePath, - TEST_MAX_STRING); - }// end of "logger" section - - if (!rc) - ACE_DEBUG ((LM_DEBUG, "INI Format Import/Export Works ;-)\n")); - return rc; } -// Used to test registry Import Export class - -int -Config_Test::testRegFormat () -{ - int rc = 0; - if (!this->equality_tested_) - { - rc = this->testEquality (); - if (rc != 0) - { - ACE_DEBUG ((LM_DEBUG, "Equality Test Failed\n")); - return rc; - } - - } - ACE_DEBUG ((LM_DEBUG, "Testing Registry Format Import/Export\n")); - ACE_Configuration_Heap fromFile; - - // 1. Creates an ACE_Configuration_Heap object - ACE_Configuration_Heap original; - - rc = original.open (); - if (rc == 0) - { - // 2. Calls build_config_object to populate - rc = build_config_object (original); - if (rc != 0) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Error populating original config object (%d)\n", - rc), - -1); - } - - // 3. Export - ACE_Registry_ImpExp importExport (original); - - rc = importExport.export_config (ACE_TEXT ("testConfig.ini")); - if (rc != 0) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Error Exporting (%d)\n", - rc), - -1); - } - - } - else - { - ACE_ERROR_RETURN ((LM_ERROR, - "Could not open original object (%d)\n", - rc), - -1); - } - - - // At this point we've successfully created, populated and written - // the configuration object - // 5. Creates a new ACE_Configuration_Heap object - rc = fromFile.open (); - if (rc == 0) - { - // 6. Imports - ACE_Registry_ImpExp importExport (fromFile); - - rc = importExport.import_config (ACE_TEXT ("testConfig.ini")); - if (rc != 0) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Error Exporting (%d)\n", - rc), - -1); - } - - // 7. Compares to original. - if (fromFile != original) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Object read from file does not equal original (%d)\n", - rc), - -1); - - } - }// end if heap could not be opened. - else - { - ACE_ERROR_RETURN ((LM_ERROR, - "Could not open fromFile object (%d)\n", - rc), - -1); - } - - if (!rc) - ACE_DEBUG ((LM_DEBUG, "Registry Format Import/Export Works ;-)\n")); - return rc; -} - - -// Reads a string value from a configuration object. - void -Config_Test::get_section_string (ACE_Configuration& config, - ACE_Configuration_Section_Key& SectionKey, - const ACE_TCHAR* pszName, - ACE_TCHAR* pszVariable, - int nMaxLength) +Config_Test::get_section_string (ACE_Configuration_Section_Key& SectionKey, + const ACE_TCHAR *pszName, + ACE_TCHAR *pszVariable, + int nMaxLength) { ACE_TString StringValue; - if (config.get_string_value (SectionKey, - pszName, - StringValue) == 0) + if (m_ConfigurationHeap.get_string_value (SectionKey, + pszName, + StringValue) == 0) { ACE_OS::strncpy (pszVariable, StringValue.c_str (), @@ -1108,23 +446,21 @@ Config_Test::get_section_string (ACE_Configuration& config, } } -// Reads an integer value from a congifuration object (when it's stored as a string) void -Config_Test::get_section_integer (ACE_Configuration& config, - ACE_Configuration_Section_Key& SectionKey, - const ACE_TCHAR* pszName, - int* nVariable, - int nMinValue, - int nMaxValue) +Config_Test::get_section_integer (ACE_Configuration_Section_Key& SectionKey, + const ACE_TCHAR *pszName, + int *nVariable, + int nMinValue, + int nMaxValue) { ACE_TString StringValue; ACE_TCHAR pszString[30]; - ACE_OS::strcpy (pszString, ACE_TEXT ("0")); + ACE_OS::strcpy(pszString, ACE_TEXT ("0")); int IntegerValue = 0; - if (config.get_string_value (SectionKey, - pszName, - StringValue) == 0) + if (m_ConfigurationHeap.get_string_value (SectionKey, + pszName, + StringValue) == 0) { ACE_OS::strncpy (pszString, StringValue.c_str (), @@ -1137,26 +473,25 @@ Config_Test::get_section_integer (ACE_Configuration& config, // convert to integer IntegerValue = ACE_OS::atoi (pszString); + IntegerValue = (IntegerValue < nMinValue) ? nMinValue : IntegerValue; IntegerValue = (IntegerValue > nMaxValue) ? nMaxValue : IntegerValue; + *nVariable = IntegerValue; } -// Reads a boolean value from a configuration object (when it's stored as a string). - void -Config_Test::get_section_boolean (ACE_Configuration& config, - ACE_Configuration_Section_Key& SectionKey, - const ACE_TCHAR* pszName, - int* pVariable) +Config_Test::get_section_boolean (ACE_Configuration_Section_Key& SectionKey, + const ACE_TCHAR* pszName, + int* pVariable) { ACE_TString StringValue; ACE_TCHAR pszString[10]; ACE_OS::strcpy (pszString, ACE_TEXT ("0")); - if (config.get_string_value (SectionKey, - pszName, - StringValue) == 0) + if (m_ConfigurationHeap.get_string_value (SectionKey, + pszName, + StringValue) == 0) { ACE_OS::strncpy (pszString, StringValue.c_str (), @@ -1188,15 +523,7 @@ main (int, ACE_TCHAR *[]) ACE_START_TEST (ACE_TEXT ("Config_Test")); Config_Test manager; - - if (manager.testEquality () != 0) - ACE_DEBUG ((LM_DEBUG, "Failed the equality Test\n")); - - if (manager.testRegFormat () != 0) - ACE_DEBUG ((LM_DEBUG, "Failed the REG Format Test\n")); - - if (manager.testIniFormat () != 0) - ACE_DEBUG ((LM_DEBUG, "Failed the INI Format Test\n")); + manager.read_config (); run_tests (); diff --git a/tests/Config_Test.h b/tests/Config_Test.h index 4736d93575e..c46d141b21f 100644 --- a/tests/Config_Test.h +++ b/tests/Config_Test.h @@ -13,8 +13,7 @@ // <ACE_Configuration_Heap> class works correctly. // // = AUTHOR -// Michael Searles <msearles@base16.com> and -// Jerry D. Odenwelder Jr. <jerry.o@mindspring.com> +// Michael Searles <msearles@base16.com> // // ============================================================================ @@ -27,47 +26,38 @@ const int TEST_MAX_STRING = 256; class Config_Test { -public: - Config_Test (void): equality_tested_ (0) { } - ~Config_Test (void) { } - - // Used to test the equality and inequality operations. - int testEquality (); - - // Used to test INI Import Export class - int testIniFormat (); + ACE_Configuration_Heap m_ConfigurationHeap; - // Used to test Regiastry Import Export class - // 1. Creates an ACE_Configuration_Heap object - // 2. Calls buildConfigObject to populate - // 3. Exports - // 5. Creates a new ACE_Configuration_Heap object - // 6. Imports - // 7. Compares to origional. - // 8. Clean-up - int testRegFormat (); + int m_nTimeToLive; + int m_bDelay; + ACE_TCHAR m_pszDestIPAddress[TEST_MAX_STRING]; + int m_nDestPort; + int m_nReconnectInterval; -private: - void get_section_string (ACE_Configuration& config, - ACE_Configuration_Section_Key& SectionKey, - const ACE_TCHAR* pszName, - ACE_TCHAR* pszVariable, - int nMaxLength); - - void get_section_integer (ACE_Configuration& config, - ACE_Configuration_Section_Key& SectionKey, - const ACE_TCHAR* pszName, - int* nVariable, - int nMinValue, - int nMaxValue); + ACE_TCHAR m_pszLogFilePath[TEST_MAX_STRING]; + ACE_TCHAR m_pszTransactionFilePath[TEST_MAX_STRING]; + ACE_TCHAR m_pszHeading[TEST_MAX_STRING]; + int m_nTraceLevel; + ACE_TCHAR m_pszJustification[TEST_MAX_STRING]; - void get_section_boolean (ACE_Configuration& config, - ACE_Configuration_Section_Key& SectionKey, - const ACE_TCHAR* pszName, - int* pVariable); +public: + Config_Test (void) { } + ~Config_Test (void) { } + void read_config (void); private: - int equality_tested_; // make sure the equality operator works before proceeding. + void get_section_string (ACE_Configuration_Section_Key& SectionKey, + const ACE_TCHAR *pszName, + ACE_TCHAR *pszVariable, + int nMaxLength); + void get_section_integer (ACE_Configuration_Section_Key& SectionKey, + const ACE_TCHAR *pszName, + int *nVariable, + int nMinValue, + int nMaxValue); + void get_section_boolean (ACE_Configuration_Section_Key& SectionKey, + const ACE_TCHAR *pszName, + int *pVariable); }; #endif /* __CONFIG_TEST_H */ diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp index 687970b213b..3bd2ea1280e 100644 --- a/tests/Conn_Test.cpp +++ b/tests/Conn_Test.cpp @@ -345,28 +345,6 @@ Svc_Handler::idle (u_long flags) return ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>::idle (flags); } -struct Client_Info - // = TITLE - // Information passed to the client so it can communicate with the - // server. -{ - ACE_INET_Addr *server_addr_; - // Address of the server to connect with. - - CONNECTOR *connector_; - // Connection factory. - - STRAT_CONNECTOR *strat_connector_; - // Strategy for connecting. - -#if defined (ACE_HAS_THREADS) - ACE_Barrier *barrier_; - // Performs barrier synchronization. -#endif /* ACE_HAS_THREADS */ -}; - -#if !defined (ACE_LACKS_FORK) || defined (ACE_HAS_THREADS) - static void timed_blocking_connect (CONNECTOR &con, const ACE_INET_Addr &server_addr) @@ -465,6 +443,26 @@ cached_connect (STRAT_CONNECTOR &con, } } +struct Client_Info + // = TITLE + // Information passed to the client so it can communicate with the + // server. +{ + ACE_INET_Addr *server_addr_; + // Address of the server to connect with. + + CONNECTOR *connector_; + // Connection factory. + + STRAT_CONNECTOR *strat_connector_; + // Strategy for connecting. + +#if defined (ACE_HAS_THREADS) + ACE_Barrier *barrier_; + // Performs barrier synchronization. +#endif /* ACE_HAS_THREADS */ +}; + static void * client_connections (void *arg) { @@ -540,8 +538,7 @@ client (void *arg) THR_NEW_LWP) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n%a"), - ACE_TEXT ("client thread spawn failed"), - 1)); + ACE_TEXT ("client thread spawn failed"))); // Wait for the threads to exit. client_manager.wait (); @@ -619,8 +616,6 @@ server (void *arg) ACE_NOTREACHED (return 0); } -#endif /* !ACE_LACKS_FORK || ACE_HAS_THREADS */ - #if !defined (ACE_LACKS_FORK) static void handler (int /* signum */) @@ -653,8 +648,7 @@ spawn_processes (ACCEPTOR *acceptor, case -1: ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n%a"), - ACE_TEXT ("fork failed"), - 1)); + ACE_TEXT ("fork failed"))); ACE_OS::exit (-1); /* NOTREACHED */ case 0: // In the child. @@ -765,8 +759,7 @@ spawn_threads (ACCEPTOR *acceptor, ) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n%a"), - ACE_TEXT ("server thread create failed"), - 1)); + ACE_TEXT ("server thread create failed"))); if (ACE_Thread_Manager::instance ()->spawn ((ACE_THR_FUNC) client, @@ -778,8 +771,7 @@ spawn_threads (ACCEPTOR *acceptor, ) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n%a"), - ACE_TEXT ("client thread create failed"), - 1)); + ACE_TEXT ("client thread create failed"))); // Wait for the threads to exit. // But, wait for a limited time because sometimes the test hangs on Irix. @@ -862,10 +854,9 @@ main (int argc, ACE_TCHAR *argv[]) #elif defined (ACE_HAS_THREADS) status = spawn_threads (&acceptor, &server_addr); #else /* ACE_LACKS_FORK && ! ACE_HAS_THREADS */ - ACE_ERROR ((LM_INFO, - ACE_TEXT ("(%P|%t) ") - ACE_TEXT ("only one thread may be run") - ACE_TEXT (" in a process on this platform"))); + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("(%P|%t) only one thread may be run in a process on this platform\n%a"), + 1)); #endif /* ACE_LACKS_FORK && ! ACE_HAS_THREADS */ } diff --git a/tests/Handle_Set_Test.cpp b/tests/Handle_Set_Test.cpp index a8a2e172d12..99a5c285227 100644 --- a/tests/Handle_Set_Test.cpp +++ b/tests/Handle_Set_Test.cpp @@ -106,7 +106,7 @@ test_boundaries (void) const int SET_IS_EMPTY_SO_SHOULD_NOT_SEE_THIS = 1; ACE_ASSERT (0 == SET_IS_EMPTY_SO_SHOULD_NOT_SEE_THIS); #else /* ! defined (ACE_PSOS_DIAB) */ - ACE_ASSERT (0 == + ACE_ASSERT (0 == ACE_TEXT ("this shouldn't get called since ") ACE_TEXT ("the set is empty!\n")); #endif /* defined (ACE_PSOS_DIAB) */ @@ -207,16 +207,16 @@ main (int argc, ACE_TCHAR *argv[]) { ACE_START_TEST (ACE_TEXT ("Handle_Set_Test")); - int count = argc > 1 - ? ACE_OS::atoi (argv[1]) + int count = argc > 1 + ? ACE_OS::atoi (argv[1]) : ACE_Handle_Set::MAXSIZE; size_t max_handles = - argc > 2 - ? ACE_OS::atoi (argv[2]) + argc > 2 + ? ACE_OS::atoi (argv[2]) : ACE_Handle_Set::MAXSIZE; size_t max_iterations = - argc > 3 - ? ACE_OS::atoi (argv[3]) + argc > 3 + ? ACE_OS::atoi (argv[3]) : ACE_MAX_ITERATIONS; test_duplicates (count); @@ -231,8 +231,7 @@ main (int argc, ACE_TCHAR *argv[]) // The ACE_Node<ACE_INT32> instantation is in ace/Stats.cpp. template class ACE_Unbounded_Set<ACE_HANDLE>; template class ACE_Unbounded_Set_Iterator<ACE_HANDLE>; -# if defined(_CRAYMPP) \ - || ((defined(ghs) || defined(__MINGW32__)) && defined (ACE_WIN32)) +# if defined(_CRAYMPP) || defined(ghs) && defined (ACE_WIN32) // MPP Cray ACE_HANDLE is 64-bit, defined as int, but ACE_INT32 is short // so instantiation in ace/Stats.cpp isn't used in this case template class ACE_Node<ACE_HANDLE>; diff --git a/tests/MEM_Stream_Test.cpp b/tests/MEM_Stream_Test.cpp index f21d35e02ff..c893ee6504f 100644 --- a/tests/MEM_Stream_Test.cpp +++ b/tests/MEM_Stream_Test.cpp @@ -30,33 +30,14 @@ ACE_RCSID(tests, MEM_Stream_Test, "$Id$") -#if defined (ACE_HAS_THREADS) && (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) +#if defined (ACE_HAS_THREADS) #include "MEM_Stream_Test.h" // Defines Echo_Handler -#define NO_OF_REACTIVE_CONNECTION 3 -#if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM) || defined (ACE_PSOS) -# define NO_OF_MT_CONNECTION 3 -#else - // We will use SysV Semaphore in this case which is not very scalable - // and can only handle one connection. -# define NO_OF_MT_CONNECTION 1 -#endif /* ACE_WIN32 || ACE_HAS_POSIX_SEM || ACE_PSOS */ - +#define NO_OF_CONNECTION 3 #define NO_OF_ITERATION 100 -// If we don't have winsock2 we can't use WFMO_Reactor. -#if defined (ACE_WIN32) \ - && !defined (ACE_HAS_WINCE) \ - && defined (ACE_HAS_WINSOCK2) \ - && ACE_HAS_WINSOCK2 != 0 -# define TEST_CAN_USE_WFMO_REACTOR -#endif - -#if defined(TEST_CAN_USE_WFMO_REACTOR) -static const int opt_wfmo_reactor = 1; -#endif - +static int opt_wfmo_reactor = 1; static int opt_select_reactor = 1; static ACE_MEM_IO::Signal_Strategy client_strategy = ACE_MEM_IO::Reactive; @@ -69,10 +50,9 @@ static u_short connection_count = 0; typedef ACE_Acceptor<Echo_Handler, ACE_MEM_ACCEPTOR> ACCEPTOR; typedef ACE_Strategy_Acceptor<Echo_Handler, ACE_MEM_ACCEPTOR> S_ACCEPTOR; -static void reset_handler (int conn) +static void reset_handler (void) { - // Reset the number of connection the test should perform. - (*Waiting::instance ()) = conn; + (*Waiting::instance ()) = NO_OF_CONNECTION; connection_count = 0; } @@ -199,15 +179,14 @@ create_reactor (void) { ACE_Reactor_Impl *impl = 0; -#if defined (TEST_CAN_USE_WFMO_REACTOR) if (opt_wfmo_reactor) { +#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) ACE_NEW (impl, ACE_WFMO_Reactor); +#endif /* ACE_WIN32 */ } -#endif /* TEST_CAN_USE_WFMO_REACTOR */ - - if (impl == 0 && opt_select_reactor) + else if (opt_select_reactor) ACE_NEW (impl, ACE_Select_Reactor); @@ -244,7 +223,7 @@ int test_reactive (ACE_MEM_Addr &server_addr) u_short sport = local_addr.get_port_number (); - ACE_Thread_Manager::instance ()->spawn_n (NO_OF_REACTIVE_CONNECTION, + ACE_Thread_Manager::instance ()->spawn_n (NO_OF_CONNECTION, connect_client, &sport); ACE_Time_Value tv(60, 0); @@ -303,7 +282,7 @@ int test_multithreaded (ACE_MEM_Addr &server_addr) u_short sport = local_addr.get_port_number (); - ACE_Thread_Manager::instance ()->spawn_n (NO_OF_MT_CONNECTION, + ACE_Thread_Manager::instance ()->spawn_n (NO_OF_CONNECTION, connect_client, &sport); ACE_Time_Value tv(60, 0); @@ -339,21 +318,17 @@ main (int, ACE_TCHAR *[]) unsigned short port = 0; ACE_MEM_Addr server_addr (port); - reset_handler (NO_OF_REACTIVE_CONNECTION); + reset_handler (); test_reactive (server_addr); ACE_Reactor::instance ()->reset_event_loop (); - - reset_handler (NO_OF_MT_CONNECTION); + reset_handler (); test_multithreaded (server_addr); -#if !defined (ACE_WIN32) && !defined (ACE_HAS_POSIX_SEM) && !defined (ACE_PSOS) - ACE_ERROR ((LM_INFO, - ACE_TEXT ("\n *** Platform only support non-scalable SysV semaphores ***\n\n"))); -#endif /* !ACE_WIN32 && !ACE_HAS_POSIX_SEM && !ACE_PSOS */ + // Now testing ACE_END_TEST; return 0; @@ -392,10 +367,9 @@ main (int, ACE_TCHAR *[]) ACE_START_TEST (ACE_TEXT ("MEM_Stream_Test")); ACE_ERROR ((LM_INFO, - ACE_TEXT ("threads or position independent pointers ") - ACE_TEXT ("not supported on this platform\n"))); + ACE_TEXT ("threads not supported on this platform\n"))); ACE_END_TEST; return 0; } -#endif /* ACE_HAS_THREADS || ACE_HAS_POSITION_INDENDENT_POINTERS == 1 */ +#endif /* ACE_HAS_THREADS */ diff --git a/tests/MEM_Stream_Test.h b/tests/MEM_Stream_Test.h index ccf85b8a5ad..eb13586847d 100644 --- a/tests/MEM_Stream_Test.h +++ b/tests/MEM_Stream_Test.h @@ -32,8 +32,6 @@ #include "ace/Svc_Handler.h" #include "ace/Synch.h" -#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) - class Echo_Handler : public ACE_Svc_Handler<ACE_MEM_STREAM, ACE_MT_SYNCH> { // = TITLE @@ -53,6 +51,4 @@ private: u_short connection_; }; -#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS */ - #endif /* ACE_TESTS_MEM_STREAM_TEST_H */ diff --git a/tests/MM_Shared_Memory_Test.cpp b/tests/MM_Shared_Memory_Test.cpp index 163db5ff1de..eab193fc4fd 100644 --- a/tests/MM_Shared_Memory_Test.cpp +++ b/tests/MM_Shared_Memory_Test.cpp @@ -30,8 +30,6 @@ ACE_RCSID(tests, MM_Shared_Memory_Test, "$Id$") -#if !defined (ACE_LACKS_MMAP) - static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; const int SHMSZ = 27; static ACE_TCHAR *shm_key; @@ -185,14 +183,12 @@ spawn (void) #endif /* ACE_HAS_THREADS */ return 0; } -#endif /* !ACE_LACKS_MMAP */ int main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("MM_Shared_Memory_Test")); -#if !defined (ACE_LACKS_MMAP) ACE_TCHAR temp_file[MAXPATHLEN + 1]; // Get the temporary directory, @@ -215,11 +211,7 @@ main (int, ACE_TCHAR *[]) 1); spawn (); -#else /* !ACE_LACKS_MMAP */ - ACE_ERROR ((LM_INFO, - ACE_TEXT ("mmap ") - ACE_TEXT ("is not supported on this platform\n"))); -#endif /* !ACE_LACKS_MMAP */ + ACE_END_TEST; return 0; diff --git a/tests/MT_SOCK_Test.cpp b/tests/MT_SOCK_Test.cpp index 7b0bc9ee90d..00915f1dc4f 100644 --- a/tests/MT_SOCK_Test.cpp +++ b/tests/MT_SOCK_Test.cpp @@ -35,8 +35,6 @@ ACE_RCSID(tests, MT_SOCK_Test, "$Id$") static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; -#if !defined (ACE_LACKS_FORK) || defined (ACE_HAS_THREADS) - static void * client (void *arg) { @@ -46,10 +44,10 @@ client (void *arg) ACE_INET_Addr client_addr; ACE_SOCK_Stream cli_stream; ACE_SOCK_Connector con; + ACE_Time_Value tv (ACE_DEFAULT_TIMEOUT); #if defined (ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS) ACE_Time_Value *timeout = 0; #else - ACE_Time_Value tv (ACE_DEFAULT_TIMEOUT); ACE_Time_Value *timeout = &tv; #endif /* ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS */ @@ -175,7 +173,7 @@ server (void *arg) ACE_TEXT ("(%P|%t) client %s connected from %d\n"), cli_addr.get_host_name (), cli_addr.get_port_number ())); - + // Enable non-blocking I/O. if (new_stream.enable (ACE_NONBLOCK) == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -184,9 +182,9 @@ server (void *arg) 0); handle_set.reset (); handle_set.set_bit (new_stream.get_handle ()); - + // Read data from client (terminate on error). - + for (ssize_t r_bytes; ;) { ACE_DEBUG ((LM_DEBUG, @@ -203,7 +201,7 @@ server (void *arg) ACE_ASSERT (*t == buf[0]); t++; } - + if (r_bytes == 0) { // Handshake back with client. @@ -249,8 +247,6 @@ server (void *arg) ACE_NOTREACHED (return 0); } -#endif /* !ACE_LACKS_FORK || ACE_HAS_THREADS */ - static void spawn (void) { @@ -280,7 +276,7 @@ spawn (void) case -1: ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "fork failed")); - i = ACE_MAX_CLIENTS; + i = ACE_MAX_CLIENTS; // Break out of 'for' loop. break; case 0: @@ -309,8 +305,7 @@ spawn (void) THR_BOUND | THR_DETACHED) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n%a"), - ACE_TEXT ("spawn failed"), - 1)); + ACE_TEXT ("spawn failed"))); if (ACE_Thread_Manager::instance ()->spawn_n (ACE_MAX_CLIENTS, @@ -319,17 +314,15 @@ spawn (void) THR_BOUND | THR_DETACHED) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n%a"), - ACE_TEXT ("spawn failed"), - 1)); + ACE_TEXT ("spawn failed"))); // Wait for the threads to exit. ACE_Thread_Manager::instance ()->wait (); #else - ACE_ERROR ((LM_INFO, - ACE_TEXT ("(%P|%t) ") - ACE_TEXT ("only one thread may be run") - ACE_TEXT (" in a process on this platform\n"))); -#endif /* !ACE_LACKS_FORK */ + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("(%P|%t) only one thread may be run in a process on this platform\n%a"), + 1)); +#endif /* !ACE_LACKS_FORK */ peer_acceptor.close (); } } diff --git a/tests/Makefile.vac b/tests/Makefile.vac index 6aa51ce7792..e06ce14f39e 100644 --- a/tests/Makefile.vac +++ b/tests/Makefile.vac @@ -4,32 +4,8 @@ # Makefile for building tests using Visual Age C++ Incremental compiler #---------------------------------------------------------------------------- -# There is a tests.icp Visual Age C++ 5 Project file which will build all -# of the tests; however, running vacbld_r on that project from here may -# take so long that the nightly build times out the make and tries to -# kill off the vacbld_r command. This produces a big mess of broken .ics -# files, and not-built tests. Instead, run through all of the tests -# we want, and build each individually, using the configuration. - -iccs := $(wildcard *.icc) -tests := $(filter-out vacpp_setup.icc,$(iccs)) -exes := $(basename $tests) -codestores := $(addsuffix .ics, $(exes)) - all: - @for t in $(tests); \ - do \ - echo vacbld_r $$t -severity=warning; \ - vacbld_r $$t -severity=warning; \ - done - -# vacbld_r -p tests.icp:all -severity=warning -showprogress=60 - -clean: - /bin/rm -rf $(codestores) - -realclean: clean - /bin/rm -rf $(exes) libDLL_Test.$(SOEXT) - /bin/rm -rf log/*.log + vacbld_r -p tests.icp:all -severity=warning -showprogress=60 -# vacbld_r -p tests.icp:all -clean +realclean: + vacbld_r -p tests.icp:all -clean diff --git a/tests/Malloc_Test.cpp b/tests/Malloc_Test.cpp index 143c8e28cdc..946ebb74019 100644 --- a/tests/Malloc_Test.cpp +++ b/tests/Malloc_Test.cpp @@ -37,12 +37,10 @@ typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> MALLOC; #define MMAP_FILENAME ACE_TEXT ("test_file") #define MUTEX_NAME ACE_TEXT ("test_lock") -#if !defined (linux) && \ - !(defined (ACE_WIN32) && (defined (ghs) || defined (__MINGW32__))) +#if !defined (linux) && !(defined (ACE_WIN32) && defined (ghs)) #define ACE_TEST_REMAP_ON_FAULT // Linux seems to have problem when calling mmap from the signal handler. // The Green Hills Native x86 compiler does not support structural exceptions. -// Mingw's gcc does not support structural exceptions. // On these plarforms, we make sure the remapping will never occur. #endif /* linux && Win32 GHS*/ @@ -84,9 +82,7 @@ myallocator (const void *base_addr = 0) if (static_allocator.get () == 0) { - ACE_MMAP_Memory_Pool_Options options (base_addr); - #if !defined (ACE_TEST_REMAP_ON_FAULT) options.minimum_bytes_ = 512 * 1024; #endif /* ACE_TEST_REMAP_ON_FAULT */ @@ -277,44 +273,9 @@ child (void) return 0; } -#if defined (ACE_WIN32) \ - && (!defined (ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0)) -// On Win9x/Me, a shared address needs to be on the shared arena, -// betweeen the second and third megabyte in the virtual address space -// of the process. Also, a mapped view of a file is shared on the same -// virtual address on every 32 bit process. -// On WinNT/2k, memory above 2Gb is reserved for the system. -// So, we need to check at runtime (we want an ACE_HAS_WINNT4 == 0 ace -// to run on either). -static void -get_base_addrs() -{ - OSVERSIONINFO vinfo; - vinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - if (::GetVersionEx(&vinfo) == 0) - return; - - if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT) - { - PARENT_BASE_ADDR = (char*) (64 * 1024*1024); - } - else - { - PARENT_BASE_ADDR = (char*) ((2048UL + 512UL)*(1024UL*1024UL)); - } - - CHILD_BASE_ADDR = 1024*1024 + (char*) PARENT_BASE_ADDR; -} -#endif - int main (int argc, ACE_TCHAR *[]) { -#if defined (ACE_WIN32) \ - && (!defined (ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0)) - get_base_addrs(); -#endif - if (argc == 1) { ACE_START_TEST (ACE_TEXT ("Malloc_Test")); diff --git a/tests/Mem_Map_Test.cpp b/tests/Mem_Map_Test.cpp index c3a595e2a11..fd493aba916 100644 --- a/tests/Mem_Map_Test.cpp +++ b/tests/Mem_Map_Test.cpp @@ -24,8 +24,6 @@ ACE_RCSID(tests, Mem_Map_Test, "$Id$") -#if !defined (ACE_LACKS_MMAP) - static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; static const int LINE_LENGTH = 10; static const int NUM_LINES = 15; @@ -116,20 +114,16 @@ create_test_file (ACE_TCHAR *filename, int line_length, int num_lines) return 0; } -#endif /* !ACE_LACKS_MMAP */ - int main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("Mem_Map_Test")); -#if !defined (ACE_LACKS_MMAP) - // = Initialize the temporary variable names - ACE_TCHAR test_file[MAXPATHLEN + 1]; - ACE_TCHAR temp_file1[MAXPATHLEN + 1]; - ACE_TCHAR temp_file2[MAXPATHLEN + 1]; + ACE_TCHAR test_file[MAXPATHLEN + 1]; + ACE_TCHAR temp_file1[MAXPATHLEN + 1]; + ACE_TCHAR temp_file2[MAXPATHLEN + 1]; // Get the temporary directory // - 18 is for the filenames, ace_mem_map_temp_1 is the longest @@ -229,13 +223,6 @@ main (int, ACE_TCHAR *[]) // Delete ACE_TEMP_TEST_FILE_2 temp_mmap2.remove (); -#else /* !ACE_LACKS_MMAP */ - - ACE_ERROR ((LM_INFO, - ACE_TEXT ("mmap is not supported on this platform\n"))); - -#endif /* !ACE_LACKS_MMAP */ - ACE_END_TEST; return 0; } diff --git a/tests/Message_Queue_Test.cpp b/tests/Message_Queue_Test.cpp index a718480230b..a6f9d9b3772 100644 --- a/tests/Message_Queue_Test.cpp +++ b/tests/Message_Queue_Test.cpp @@ -464,7 +464,7 @@ main (int argc, ACE_TCHAR *argv[]) } else { ACE_Message_Block *b; - ACE_Time_Value tv (ACE_OS::gettimeofday ()); // Now + ACE_Time_Value tv (ACE_OS::gettimeofday()); // Now if (q1.dequeue_head (b, &tv) != -1) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Dequeued from empty queue!\n"))); status = 1; diff --git a/tests/OS_Test.cpp b/tests/OS_Test.cpp index a76a89c1c37..b3dd1785a00 100644 --- a/tests/OS_Test.cpp +++ b/tests/OS_Test.cpp @@ -59,11 +59,6 @@ rename_test (void) } ACE_OS::fclose (f); -#if defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 == 0 - // Can't rename if new_file exists already. - ACE_OS::unlink (new_file); -#endif - if (ACE_OS::rename (old_file, new_file) != 0) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("rename test 1"))); @@ -130,7 +125,7 @@ rename_test (void) #endif /* ACE_LACKS_RENAME */ } -// +// int string_emulation_test (void) { @@ -141,12 +136,12 @@ string_emulation_test (void) const char *memchr1 = "abcdefghijklmnopqrstuvwxyz"; - ACE_ASSERT (ACE_OS_String::memchr (ACE_static_cast (const void *, NULL), - 'a', + ACE_ASSERT (ACE_OS_String::memchr (ACE_static_cast (const void *, NULL), + 'a', 0) == NULL); ACE_ASSERT (ACE_OS_String::memchr (memchr1, 'a', sizeof (memchr1)) != NULL); ACE_ASSERT (ACE_OS_String::memchr (memchr1, '1', sizeof (memchr1)) == NULL); - + // ======================================================================== // Test strchr ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing strchr\n"))); @@ -200,20 +195,20 @@ string_emulation_test (void) char *strtok_r2; - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok_r (strtok_r1, - " ", + ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok_r (strtok_r1, + " ", &strtok_r2), "A") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok_r (0, - " ", + ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok_r (0, + " ", &strtok_r2), "string") == 0); ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok_r (0, - " ", + " ", &strtok_r2), "of") == 0); ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok_r (0, - " ", + " ", &strtok_r2), "tokens") == 0); ACE_ASSERT (ACE_OS_String::strtok_r (0, " ", &strtok_r2) == 0); @@ -234,7 +229,7 @@ string_emulation_test (void) "2a") == 0); } -#if defined (ACE_HAS_WCHAR) +#if defined (ACE_HAS_WCHAR) { // ======================================================================== // Test itoa (wchar_t version) @@ -257,10 +252,10 @@ string_emulation_test (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing strcmp (wchar_t version)\n"))); const wchar_t *strcmp1 = ACE_TEXT_WIDE ("stringf"); - const wchar_t *strcmp2 = ACE_TEXT_WIDE ("stringfe"); - const wchar_t *strcmp3 = ACE_TEXT_WIDE ("stringg"); - const wchar_t *strcmp4 = ACE_TEXT_WIDE ("STRINGF"); - const wchar_t *strcmp5 = ACE_TEXT_WIDE ("stringe"); + const wchar_t *strcmp2 = ACE_TEXT_WIDE ("stringfe"); + const wchar_t *strcmp3 = ACE_TEXT_WIDE ("stringg"); + const wchar_t *strcmp4 = ACE_TEXT_WIDE ("STRINGF"); + const wchar_t *strcmp5 = ACE_TEXT_WIDE ("stringe"); ACE_ASSERT (ACE_OS_String::strcmp (strcmp1, strcmp1) == 0); ACE_ASSERT (ACE_OS_String::strcmp (strcmp1, strcmp2) < 0); @@ -275,7 +270,7 @@ string_emulation_test (void) const wchar_t *strcpy1 = ACE_TEXT_WIDE ("abcdefghijklmnopqrstuvwxyz"); wchar_t strcpy2[27]; - ACE_ASSERT + ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strcpy (strcpy2, strcpy1), strcpy1) == 0); ACE_ASSERT (ACE_OS_String::strcmp (strcpy2, strcpy1) == 0); @@ -288,7 +283,7 @@ string_emulation_test (void) wchar_t strcat2[27] = ACE_TEXT_WIDE ("abcdefghijkl"); const wchar_t *strcat3 = ACE_TEXT_WIDE ("mnopqrstuvwxyz"); - ACE_ASSERT + ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strcat (strcat2, strcat3), strcat1) == 0); ACE_ASSERT (ACE_OS_String::strcmp (strcat2, strcat1) == 0); @@ -301,7 +296,7 @@ string_emulation_test (void) wchar_t strncat2[27] = ACE_TEXT_WIDE ("abcdefghijkl"); const wchar_t *strncat3 = ACE_TEXT_WIDE ("mnopqrstuvwxyzabc"); - ACE_ASSERT + ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strncat (strncat2, strncat3, 14), strncat1) == 0); ACE_ASSERT (ACE_OS_String::strcmp (strncat2, strncat1) == 0); @@ -312,9 +307,9 @@ string_emulation_test (void) const wchar_t *strspn1 = ACE_TEXT_WIDE ("abcdefghijkabcdefghijk"); - ACE_ASSERT (ACE_OS_String::strspn (strspn1, + ACE_ASSERT (ACE_OS_String::strspn (strspn1, ACE_TEXT_WIDE ("abcdf")) == 4); - ACE_ASSERT (ACE_OS_String::strspn (strspn1, + ACE_ASSERT (ACE_OS_String::strspn (strspn1, ACE_TEXT_WIDE ("mno")) == 0); // ======================================================================== @@ -323,9 +318,9 @@ string_emulation_test (void) const wchar_t *strchr1 = ACE_TEXT_WIDE ("abcdefghijkabcdefghijk"); - ACE_ASSERT (*ACE_OS_String::strchr (strchr1, ACE_TEXT_WIDE ('h')) + ACE_ASSERT (*ACE_OS_String::strchr (strchr1, ACE_TEXT_WIDE ('h')) == ACE_TEXT_WIDE ('h')); - ACE_ASSERT (ACE_OS_String::strchr (strchr1, ACE_TEXT_WIDE ('h')) + ACE_ASSERT (ACE_OS_String::strchr (strchr1, ACE_TEXT_WIDE ('h')) == strchr1 + 7); ACE_ASSERT (ACE_OS_String::strchr (strchr1, ACE_TEXT_WIDE ('1')) == NULL); @@ -337,10 +332,10 @@ string_emulation_test (void) ACE_ASSERT (ACE_OS_String::strncmp ( ACE_OS_String::strstr (strstr1, ACE_TEXT_WIDE ("def")), - ACE_TEXT_WIDE ("def"), + ACE_TEXT_WIDE ("def"), 3) == 0); - ACE_ASSERT (ACE_OS_String::strstr (strstr1, + ACE_ASSERT (ACE_OS_String::strstr (strstr1, ACE_TEXT_WIDE ("mno")) == 0); // ======================================================================== @@ -359,9 +354,9 @@ string_emulation_test (void) const wchar_t *strpbrk1 = ACE_TEXT_WIDE ("abcdefghijkabcdefghijk"); - ACE_ASSERT (ACE_OS_String::strpbrk (strpbrk1, ACE_TEXT_WIDE ("ijkb")) + ACE_ASSERT (ACE_OS_String::strpbrk (strpbrk1, ACE_TEXT_WIDE ("ijkb")) == strpbrk1 + 1); - ACE_ASSERT (ACE_OS_String::strpbrk (strpbrk1, + ACE_ASSERT (ACE_OS_String::strpbrk (strpbrk1, ACE_TEXT_WIDE ("mno")) == 0); // ======================================================================== @@ -370,11 +365,11 @@ string_emulation_test (void) const wchar_t *strrchr1 = ACE_TEXT_WIDE ("abcdefghijkabcdefghijk"); - ACE_ASSERT (*ACE_OS_String::strrchr (strrchr1, ACE_TEXT_WIDE ('h')) + ACE_ASSERT (*ACE_OS_String::strrchr (strrchr1, ACE_TEXT_WIDE ('h')) == ACE_TEXT_WIDE ('h')); - ACE_ASSERT (ACE_OS_String::strrchr (strrchr1, ACE_TEXT_WIDE ('h')) + ACE_ASSERT (ACE_OS_String::strrchr (strrchr1, ACE_TEXT_WIDE ('h')) == strrchr1 + 18); - ACE_ASSERT (ACE_OS_String::strrchr (strrchr1, ACE_TEXT_WIDE ('1')) + ACE_ASSERT (ACE_OS_String::strrchr (strrchr1, ACE_TEXT_WIDE ('1')) == NULL); // ======================================================================== @@ -383,9 +378,9 @@ string_emulation_test (void) const wchar_t *strcasecmp1 = ACE_TEXT_WIDE ("stringf"); const wchar_t *strcasecmp2 = ACE_TEXT_WIDE ("stringfe"); - const wchar_t *strcasecmp3 = ACE_TEXT_WIDE ("stringg"); - const wchar_t *strcasecmp4 = ACE_TEXT_WIDE ("STRINGF"); - const wchar_t *strcasecmp5 = ACE_TEXT_WIDE ("stringe"); + const wchar_t *strcasecmp3 = ACE_TEXT_WIDE ("stringg"); + const wchar_t *strcasecmp4 = ACE_TEXT_WIDE ("STRINGF"); + const wchar_t *strcasecmp5 = ACE_TEXT_WIDE ("stringe"); ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp1) == 0); ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp2) < 0); @@ -399,19 +394,19 @@ string_emulation_test (void) const wchar_t *strncasecmp1 = ACE_TEXT_WIDE ("stringf"); const wchar_t *strncasecmp2 = ACE_TEXT_WIDE ("stringfe"); - const wchar_t *strncasecmp3 = ACE_TEXT_WIDE ("stringg"); - const wchar_t *strncasecmp4 = ACE_TEXT_WIDE ("STRINGF"); - const wchar_t *strncasecmp5 = ACE_TEXT_WIDE ("stringe"); + const wchar_t *strncasecmp3 = ACE_TEXT_WIDE ("stringg"); + const wchar_t *strncasecmp4 = ACE_TEXT_WIDE ("STRINGF"); + const wchar_t *strncasecmp5 = ACE_TEXT_WIDE ("stringe"); - ACE_ASSERT + ACE_ASSERT (ACE_OS_String::strncasecmp (strncasecmp1, strncasecmp2, 7) == 0); - ACE_ASSERT + ACE_ASSERT (ACE_OS_String::strncasecmp (strncasecmp1, strncasecmp2, 8) < 0); - ACE_ASSERT + ACE_ASSERT (ACE_OS_String::strncasecmp (strncasecmp1, strncasecmp3, 7) < 0); - ACE_ASSERT + ACE_ASSERT (ACE_OS_String::strncasecmp (strncasecmp1, strncasecmp4, 7) == 0); - ACE_ASSERT + ACE_ASSERT (ACE_OS_String::strncasecmp (strncasecmp1, strncasecmp5, 7) > 0); // ======================================================================== @@ -420,9 +415,9 @@ string_emulation_test (void) const wchar_t *strncmp1 = ACE_TEXT_WIDE ("stringf"); const wchar_t *strncmp2 = ACE_TEXT_WIDE ("stringfe"); - const wchar_t *strncmp3 = ACE_TEXT_WIDE ("stringg"); - const wchar_t *strncmp4 = ACE_TEXT_WIDE ("STRINGF"); - const wchar_t *strncmp5 = ACE_TEXT_WIDE ("stringe"); + const wchar_t *strncmp3 = ACE_TEXT_WIDE ("stringg"); + const wchar_t *strncmp4 = ACE_TEXT_WIDE ("STRINGF"); + const wchar_t *strncmp5 = ACE_TEXT_WIDE ("stringe"); ACE_ASSERT (ACE_OS_String::strncmp (strncmp1, strncmp2, 7) == 0); ACE_ASSERT (ACE_OS_String::strncmp (strncmp1, strncmp2, 8) < 0); @@ -437,9 +432,9 @@ string_emulation_test (void) wchar_t strncpy1[] = ACE_TEXT_WIDE ("abcdefghijklmnopqrstuvwxyzabc"); wchar_t strncpy2[27]; - ACE_ASSERT - (ACE_OS_String::strncmp (ACE_OS_String::strncpy (strncpy2, - strncpy1, + ACE_ASSERT + (ACE_OS_String::strncmp (ACE_OS_String::strncpy (strncpy2, + strncpy1, 26), strncpy1, 26) == 0); @@ -454,7 +449,7 @@ string_emulation_test (void) return 0; } -int +int main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("OS_Test")); diff --git a/tests/Priority_Reactor_Test.cpp b/tests/Priority_Reactor_Test.cpp index 0114a8be880..64eaaf0c23b 100644 --- a/tests/Priority_Reactor_Test.cpp +++ b/tests/Priority_Reactor_Test.cpp @@ -179,8 +179,6 @@ Write_Handler::svc (void) return 0; } -#if !defined (ACE_LACKS_FORK) || defined (ACE_HAS_THREADS) - // Execute the client tests. static void * client (void *arg) @@ -235,8 +233,6 @@ client (void *arg) return 0; } -#endif - int main (int argc, ACE_TCHAR *argv[]) { @@ -328,8 +324,7 @@ main (int argc, ACE_TCHAR *argv[]) THR_NEW_LWP | THR_DETACHED) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n%a"), - ACE_TEXT ("thread create failed"), - 1)); + ACE_TEXT ("thread create failed"))); } #elif !defined (ACE_LACKS_FORK) for (i = 0; i < opt_nchildren; ++i) @@ -338,9 +333,7 @@ main (int argc, ACE_TCHAR *argv[]) { case -1: ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n%a"), - ACE_TEXT ("fork failed"), - 1)); + ACE_TEXT ("(%P|%t) %p\n%a"), ACE_TEXT ("fork failed"))); exit (-1); /* NOTREACHED */ case 0: @@ -354,10 +347,8 @@ main (int argc, ACE_TCHAR *argv[]) } } #else - ACE_ERROR ((LM_INFO, - ACE_TEXT ("(%P|%t) ") - ACE_TEXT ("only one thread may be run ") - ACE_TEXT ("in a process on this platform\n"))); + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("(%P|%t) only one thread may be run in a process on this platform\n%a"), 1)); #endif /* ACE_HAS_THREADS */ ACE_Time_Value tv (opt_max_duration); diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp index 29378957c55..947d2de1fb9 100644 --- a/tests/Process_Strategy_Test.cpp +++ b/tests/Process_Strategy_Test.cpp @@ -108,6 +108,14 @@ connection_completed (void) ACE_Reactor::instance()->wakeup_all_threads (); } +// Have all connections been serviced? + +static int +done (void) +{ + return connections == ACE_MAX_ITERATIONS + 1; +} + // Constructor Process_Strategy::Process_Strategy (size_t n_processes, ACE_Event_Handler *acceptor, @@ -492,8 +500,6 @@ Counting_Service::open (void *) return 0; } -#if !defined (ACE_LACKS_FORK) || defined (ACE_HAS_THREADS) - // Execute the client tests. static void * @@ -611,14 +617,6 @@ client (void *arg) // Performs the server activities. -// Have all connections been serviced? - -static int -done (void) -{ - return connections == ACE_MAX_ITERATIONS + 1; -} - static void * server (void *) { @@ -632,8 +630,6 @@ server (void *) return 0; } -#endif /* !ACE_LACKS_FORK || ACE_HAS_THREADS */ - int main (int argc, ACE_TCHAR *argv[]) { @@ -709,9 +705,10 @@ main (int argc, ACE_TCHAR *argv[]) // Wait for the threads to exit. ACE_Thread_Manager::instance ()->wait (); #else - ACE_ERROR ((LM_INFO, + ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) only one thread may be run ") - ACE_TEXT ("in a process on this platform\n"))); + ACE_TEXT ("in a process on this platform\n%a"), + 1)); #endif /* ACE_HAS_THREADS */ } diff --git a/tests/RMCast/RMCast_Fragment_Test.cpp b/tests/RMCast/RMCast_Fragment_Test.cpp index 66179c47ef0..44f1db8e8f3 100644 --- a/tests/RMCast/RMCast_Fragment_Test.cpp +++ b/tests/RMCast/RMCast_Fragment_Test.cpp @@ -11,7 +11,6 @@ // ============================================================================ #include "test_config.h" -#include "ace/Message_Block.h" #include "ace/Task.h" #include "ace/RMCast/RMCast_Fragment.h" @@ -112,20 +111,20 @@ ACE_RMCast_Fragment_Tester::svc (void) const int n = 256; const int size = 512; - ACE_Message_Block smallb[n]; - smallb[0].size (size); - smallb[0].wr_ptr (size); + ACE_Message_Block small[n]; + small[0].size (size); + small[0].wr_ptr (size); for (int i = 1; i != n; ++i) { - smallb[i].size (size); - smallb[i].wr_ptr (size); - smallb[i - 1].cont (&smallb[i]); + small[i].size (size); + small[i].wr_ptr (size); + small[i - 1].cont (&small[i]); } - this->initialize (smallb); + this->initialize (small); ACE_RMCast::Data data; - data.payload = smallb; + data.payload = small; if (this->fragment_.data (data) == -1) return -1; @@ -137,10 +136,10 @@ ACE_RMCast_Fragment_Tester::svc (void) this->received_bytes_, total), -1); - if (this->compare (smallb) == -1) + if (this->compare (small) == -1) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Mismatched smallb chain data\n")), + ACE_TEXT ("Mismatched small chain data\n")), -1); } @@ -158,23 +157,23 @@ ACE_RMCast_Fragment_Tester::svc (void) ACE_static_cast(ACE_RANDR_TYPE,ACE_OS::time (0)); int size = 64 + ACE_OS::rand_r(seed) % 128; - ACE_Message_Block smallb[n]; - smallb[0].size (size); - smallb[0].wr_ptr (size); + ACE_Message_Block small[n]; + small[0].size (size); + small[0].wr_ptr (size); total += size; for (int i = 1; i != n; ++i) { size = 64 + ACE_OS::rand_r(seed) % 128; total += size; - smallb[i].size (size); - smallb[i].wr_ptr (size); - smallb[i - 1].cont (&smallb[i]); + small[i].size (size); + small[i].wr_ptr (size); + small[i - 1].cont (&small[i]); } - this->initialize (smallb); + this->initialize (small); ACE_RMCast::Data data; - data.payload = smallb; + data.payload = small; if (this->fragment_.data (data) == -1) return -1; @@ -185,10 +184,10 @@ ACE_RMCast_Fragment_Tester::svc (void) this->received_bytes_, total), -1); - if (this->compare (smallb) == -1) + if (this->compare (small) == -1) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Mismatched smallb chain data\n")), + ACE_TEXT ("Mismatched small chain data\n")), -1); } diff --git a/tests/Reactor_Exceptions_Test.cpp b/tests/Reactor_Exceptions_Test.cpp index 01346697ed8..a11ca537b43 100644 --- a/tests/Reactor_Exceptions_Test.cpp +++ b/tests/Reactor_Exceptions_Test.cpp @@ -27,7 +27,7 @@ ACE_RCSID(tests, Reactor_Exceptions_Test, "$Id$") #if defined (ACE_HAS_EXCEPTIONS) -#if defined (ACE_WIN32) && defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_WIN32) static void throw_exception (void) { @@ -48,7 +48,7 @@ throw_exception (void) ACE_TEXT ("(%P|%t) throw exception\n"))); throw Except (); } -#endif /* ACE_WIN32 && ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_WIN32 */ class My_Handler : public ACE_Event_Handler, public ACE_SOCK_Dgram { diff --git a/tests/Reactor_Notify_Test.cpp b/tests/Reactor_Notify_Test.cpp index 2b56d91bb6e..ea56e5683d9 100644 --- a/tests/Reactor_Notify_Test.cpp +++ b/tests/Reactor_Notify_Test.cpp @@ -434,8 +434,7 @@ main (int, ACE_TCHAR *[]) timeout.set (LONG_TIMEOUT, 0); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) running tests with reactor notification ") - ACE_TEXT ("pipe enabled\n") + ACE_TEXT ("(%t) running tests with reactor notification pipe enabled\n") ACE_TEXT (" and time-out = %d seconds\n"), timeout.sec ())); run_test (0, timeout); diff --git a/tests/SOCK_Connector_Test.cpp b/tests/SOCK_Connector_Test.cpp index 42e347cf26f..baf3037e163 100644 --- a/tests/SOCK_Connector_Test.cpp +++ b/tests/SOCK_Connector_Test.cpp @@ -259,7 +259,7 @@ succeed_nonblocking (void) { // Reset the status _before_ doing the printout, in case the // printout overwrites errno. - if (errno == ECONNREFUSED) // ENOTCONN should not happen any more || errno == ENOTCONN) + if (errno == ECONNREFUSED || errno == ENOTCONN) status = 0; ACE_DEBUG ((LM_DEBUG, diff --git a/tests/SOCK_Send_Recv_Test.cpp b/tests/SOCK_Send_Recv_Test.cpp index 6505bb69f6f..2a44acf30dd 100644 --- a/tests/SOCK_Send_Recv_Test.cpp +++ b/tests/SOCK_Send_Recv_Test.cpp @@ -37,8 +37,6 @@ ACE_RCSID(tests, SOCK_Send_Recv_Test, "$Id$") // Change to non-zero if test fails static int Test_Result = 0; -#if !defined (ACE_LACKS_FORK) || defined (ACE_HAS_THREADS) - // In test 3, a large amount of data is sent. The purpose is to overflow the // TCP send window, causing the sender to block (it's a send_n). This value // is the amount to send. The assumption is that no implementation has a @@ -141,7 +139,7 @@ client (void *arg) if (len != 255) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p; len is %d, but should be 255!\n"), + ACE_TEXT ("(%P|%t) %p; len is %d, but should be 255!\n"), len)); } ACE_ASSERT (len == 255); @@ -312,8 +310,6 @@ server (void *arg) return 0; } -#endif /* !ACE_LACKS_FORK || ACE_HAS_THREADS */ - static void spawn (void) { @@ -341,8 +337,7 @@ spawn (void) case -1: ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n%a"), - ACE_TEXT ("fork failed"), - 1)); + ACE_TEXT ("fork failed"))); /* NOTREACHED */ case 0: client (&server_addr); @@ -360,8 +355,7 @@ spawn (void) THR_NEW_LWP | THR_DETACHED) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n%a"), - ACE_TEXT ("thread create failed"), - 1)); + ACE_TEXT ("thread create failed"))); if (ACE_Thread_Manager::instance ()->spawn (ACE_THR_FUNC (client), @@ -369,16 +363,14 @@ spawn (void) THR_NEW_LWP | THR_DETACHED) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n%a"), - ACE_TEXT ("thread create failed"), - 1)); + ACE_TEXT ("thread create failed"))); // Wait for the threads to exit. ACE_Thread_Manager::instance ()->wait (); #else - ACE_ERROR ((LM_INFO, - ACE_TEXT ("(%P|%t) ") - ACE_TEXT ("only one thread may be run ") - ACE_TEXT ("in a process on this platform\n"))); + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("(%P|%t) only one thread may be run in a process on this platform\n%a"), + 1)); #endif /* ACE_HAS_THREADS */ peer_acceptor.close (); diff --git a/tests/SOCK_Test.cpp b/tests/SOCK_Test.cpp index c32cd1d87e1..2da259365b6 100644 --- a/tests/SOCK_Test.cpp +++ b/tests/SOCK_Test.cpp @@ -211,10 +211,7 @@ spawn (void) switch (ACE_OS::fork ("child")) { case -1: - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n%a"), - ACE_TEXT ("fork failed"), - 1)); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n%a"), ACE_TEXT ("fork failed"))); /* NOTREACHED */ case 0: client (&server_addr); @@ -226,30 +223,17 @@ spawn (void) } #elif defined (ACE_HAS_THREADS) if (ACE_Thread_Manager::instance ()->spawn - (ACE_THR_FUNC (server), - (void *) &peer_acceptor, - THR_NEW_LWP | THR_DETACHED) == -1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n%a"), - ACE_TEXT ("thread create failed"), - 1)); + (ACE_THR_FUNC (server), (void *) &peer_acceptor, THR_NEW_LWP | THR_DETACHED) == -1) + ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n%a"), ACE_TEXT ("thread create failed"))); if (ACE_Thread_Manager::instance ()->spawn - (ACE_THR_FUNC (client), - (void *) &server_addr, - THR_NEW_LWP | THR_DETACHED) == -1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n%a"), - ACE_TEXT ("thread create failed"), - 1)); + (ACE_THR_FUNC (client), (void *) &server_addr, THR_NEW_LWP | THR_DETACHED) == -1) + ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n%a"), ACE_TEXT ("thread create failed"))); // Wait for the threads to exit. ACE_Thread_Manager::instance ()->wait (); #else - ACE_ERROR ((LM_INFO, - ACE_TEXT ("(%P|%t) ") - ACE_TEXT ("only one thread may be run ") - ACE_TEXT ("in a process on this platform\n"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) only one thread may be run in a process on this platform\n%a"), 1)); #endif /* ACE_HAS_THREADS */ peer_acceptor.close (); @@ -266,3 +250,4 @@ main (int, ACE_TCHAR *[]) ACE_END_TEST; return 0; } + diff --git a/tests/SPIPE_Test.cpp b/tests/SPIPE_Test.cpp index 401d548dbfb..70d868a1f99 100644 --- a/tests/SPIPE_Test.cpp +++ b/tests/SPIPE_Test.cpp @@ -31,13 +31,7 @@ ACE_RCSID(tests, SPIPE_Test, "$Id$") -#if defined (ACE_HAS_STREAM_PIPES) \ - || (defined (ACE_WIN32) && defined(ACE_HAS_WINNT4) \ - && (ACE_HAS_WINNT4 !=0)) -# define TEST_HAS_STREAM_PIPES -#endif - -#if defined (TEST_HAS_STREAM_PIPES) +#if defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32) static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; @@ -54,7 +48,7 @@ client (void *) ACE_OS::sleep (10); if (con.connect (cli_stream, ACE_SPIPE_Addr (rendezvous)) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n%a"), rendezvous, 1)); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), rendezvous)); for (const char *c = ACE_ALPHABET; *c != '\0'; c++) if (cli_stream.send (c, 1) == -1) @@ -82,13 +76,13 @@ server (void *) // Initialize named pipe listener. if (acceptor.open (ACE_SPIPE_Addr (rendezvous)) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n%a"), ACE_TEXT ("open"), 1)); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open"))); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("waiting for connection\n"))); // Accept a client connection if (acceptor.accept (new_stream, 0) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n%a"), ACE_TEXT ("accept"), 1)); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("accept"))); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Accepted connection\n"))); @@ -102,14 +96,14 @@ server (void *) acceptor.close (); return 0; } -#endif /* TEST_HAS_STREAM_PIPES */ +#endif /* ACE_HAS_STREAM_PIPES || ACE_WIN32 */ int main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("SPIPE_Test")); -#if defined (TEST_HAS_STREAM_PIPES) +#if defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32) #if !defined (ACE_LACKS_FORK) switch (ACE_OS::fork ()) { @@ -137,7 +131,7 @@ main (int, ACE_TCHAR *[]) #else ACE_DEBUG ((LM_INFO, ACE_TEXT ("SPIPE is not supported on this platform\n"))); -#endif /* TEST_HAS_STREAM_PIPES */ +#endif /* ACE_HAS_STREAM_PIPES || ACE_WIN32 */ ACE_END_TEST; return 0; } diff --git a/tests/Shared_Memory_SV_Test.cpp b/tests/Shared_Memory_SV_Test.cpp deleted file mode 100644 index a3654a7745b..00000000000 --- a/tests/Shared_Memory_SV_Test.cpp +++ /dev/null @@ -1,83 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// Shared_Memory_SV_Test.cpp -// -// = DESCRIPTION -// This is a simple test of ACE_Shared_Memory_SV -// -// = AUTHOR -// Prashant Jain and Doug Schmidt -// -// ============================================================================ - - -#include "ace/Shared_Memory_SV.h" -#include "test_config.h" - -const int SHMSZ = 27; -const int SHM_KEY = 5678; - -static void -client (void) -{ - char t = 'a'; - ACE_Shared_Memory_SV shm_client (SHM_KEY, SHMSZ, - ACE_Shared_Memory_SV::ACE_CREATE); - char *shm = (char *) shm_client.malloc (); - - for (char *s = shm; *s != '\0'; s++) - { - ACE_ASSERT (t == s[0]); - t++; - } - *shm = '*'; - ACE_OS::exit (0); -} - -static void -server (void) -{ - ACE_Shared_Memory_SV shm_server (SHM_KEY, SHMSZ, - ACE_Shared_Memory_SV::ACE_CREATE); - char *shm = (char *) shm_server.malloc (); - char *s = shm; - - for (char c = 'a'; c <= 'z'; c++) - *s++ = c; - - *s = '\0'; - - while (*shm != '*') - ACE_OS::sleep (1); - - if (shm_server.remove () < 0) - ACE_ERROR ((LM_ERROR, "%p\n", "remove")); -} - -int -main (int, char *argv []) -{ - ACE_START_TEST ("Shared_Memory_SV_Test.cpp"); - - switch (ACE_OS::fork ()) - { - case -1: - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "fork"), 1); - case 0: - client (); - break; - default: - server (); - break; - } - - ACE_END_TEST; - return 0; -} - diff --git a/tests/Svc_Handler_Test.cpp b/tests/Svc_Handler_Test.cpp index 4505059c324..343be6d7a83 100644 --- a/tests/Svc_Handler_Test.cpp +++ b/tests/Svc_Handler_Test.cpp @@ -54,7 +54,7 @@ run_test (SVC_HANDLER &svc_handler, cb2->copy ("doug\n", ACE_OS::strlen ("doug\n")); cb1->cont (cb2); - + // Note that this is a buffered call! if (svc_handler.put (mb) == -1) ACE_ERROR ((LM_ERROR, @@ -93,25 +93,17 @@ main (int argc, ACE_TCHAR *argv[]) // Open up the temp file. if (connector.connect (file_io, file) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("connect failed for %p\n"), file.get_path_name ()), 1); - -#if !defined (ACE_WIN32) \ - || (defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 == 1) -# define TEST_CAN_UNLINK_IN_ADVANCE -#endif - -#if defined(TEST_CAN_UNLINK_IN_ADVANCE) // Unlink this file right away so that it is automatically removed // when the process exits. - if (file_io.unlink () == -1) - ACE_ERROR_RETURN ((LM_ERROR, + else if (file_io.unlink () == -1) + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("unlink failed for %p\n"), file.get_path_name ()), 1); -#endif // Create the service handler and assign it <file_io> as its data // sink. @@ -121,21 +113,10 @@ main (int argc, ACE_TCHAR *argv[]) max_buffer_size, 0); svc_handler.peer () = file_io; - + // Run the test. run_test (svc_handler, iterations); - -#if !defined(TEST_CAN_UNLINK_IN_ADVANCE) - file_io.close(); - if (file_io.unlink () == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("unlink failed for %p\n"), - file.get_path_name ()), - 1); -#endif - } - ACE_END_TEST; return 0; } diff --git a/tests/run_tests.bat b/tests/run_tests.bat index 27ff111342c..e01efdbef6b 100644 --- a/tests/run_tests.bat +++ b/tests/run_tests.bat @@ -1,10 +1,6 @@ @echo off rem run_tests.bat,v 4.71 1999/11/08 05:39:06 nanbor Exp -rem -rem Note this batch file will not work on Win9X. -rem - rem To run this script, the first argument must be either bor rem or msc. This will determine if the borland tests are run, or rem msvc tests are run. diff --git a/tests/run_tests.ksh b/tests/run_tests.ksh deleted file mode 100755 index a4d7f0d8b17..00000000000 --- a/tests/run_tests.ksh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/ksh -f - -. ./run_tests.sh - -# EOF - diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 4e22a9098ae..3bac5fe9335 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -14,15 +14,6 @@ # 4) Create a symlink to the "log" directory create in step 1) above. # 5) ./run_tests.sh <target_hostname> -if [ -x /bin/rm ]; then - RM=/bin/rm -elif [ -x /usr/bin/rm ]; then - RM=/usr/bin/rm -else - echo "Can't find rm, aborting." 1>&2 - exit 1 -fi - usage="usage: $0 [-p] <target> -p: purify tests" @@ -63,7 +54,6 @@ IFS="|" tmp=/tmp compilation_log="log/compilations.log" shlib_suffix=".so" - LD_LIBRARY_PATH=$ACE_ROOT/ace:${LD_LIBRARY_PATH:-/usr/lib} export LD_LIBRARY_PATH @@ -82,10 +72,6 @@ if [ $sysname = 'AIX' ]; then export LIBPATH fi -if echo $sysname | grep -q CYGWIN; then - shlib_suffix=".dll" -fi - if [ $purify -eq 1 ]; then if echo $PWD | egrep 'gcc|g++'; then purify_with_old_gcc=1 @@ -115,7 +101,7 @@ fi run() { - $RM -f core log/$1.log + /bin/rm -f core log/$1.log if [ ! -f "$1" ]; then echo 1>&2 "Making $1 . . ." @@ -230,7 +216,7 @@ done echo "Finished ACE version $ace_version tests." -$RM -f ace_pipe_name pattern \ +/bin/rm -f ace_pipe_name pattern \ $tmp/ace_temp_file* \ $tmp/ace_test_file \ $tmp/Naming_Test* diff --git a/tests/t.icc b/tests/t.icc new file mode 100644 index 00000000000..12a7e5fb703 --- /dev/null +++ b/tests/t.icc @@ -0,0 +1,277 @@ +option + link(libSearchPath,'H:\ACE+TAO\ACE_wrappers\ace'), + incl(searchPath,'H:\ACE+TAO\ACE_wrappers'), + link(linkWithMultiThreadLib,yes) + + target "Reactor_Timer_Test.exe" + { + source type(cpp) "Aio_Platform_Test.cpp" + } + target "Atomic_Op_Test.exe" + { + source type(cpp) "Atomic_Op_Test.cpp" + } + target "Barrier_Test.exe" + { + source type(cpp) "Barrier_Test.cpp" + } + target "Basic_Types_Test.exe" + { + source type(cpp) "Basic_Types_Test.cpp" + } + target "Buffer_Stream_Test.exe" + { + source type(cpp) "Buffer_Stream_Test.cpp" + } + target "CDR_Test.exe" + { + source type(cpp) "CDR_Test.cpp" + } + target "Collection_Test.exe" + { + source type(cpp) "Collection_Test.cpp" + } + target "Conn_Test.exe" + { + source type(cpp) "Conn_Test.cpp" + } + target "DLL_Test.cpp" + { + source type(cpp) "DLL_Test.cpp" + } + target "DLList_Test.exe" + { + source type(cpp) "DLList_Test.cpp" + } + target "Dynamic_Priority_Test.exe" + { + source type(cpp) "Dynamic_Priority_Test.cpp" + } + target "Enum_Interfaces_Test.exe" + { + source type(cpp) "Enum_Interfaces_Test.cpp" + } + target "Env_Value_Test.exe" + { + source type(cpp) "Env_Value_Test.cpp" + } + target "Future_Test.exe" + { + source type(cpp) "Future_Test.cpp" + } + target "Handle_Set_Test.exe" + { + source type(cpp) "Handle_Set_Test.cpp" + } + target "Hash_Map_Manager_Test.exe" + { + source type(cpp) "Hash_Map_Manager_Test.cpp" + } + target "High_Res_Timer_Test.exe" + { + source type(cpp) "High_Res_Timer_Test.cpp" + } + target "IOStream_Test.exe" + { + source type(cpp) "IOStream_Test.cpp" + } + target "MM_Shared_Memory_Test.exe" + { + source type(cpp) "MM_Shared_Memory_Test.cpp" + } + target "MT_Reactor_Timer_Test.cpp" + { + source type(cpp) "MT_Reactor_Timer_Test.cpp" + } + target "MT_SOCK_Test.exe" + { + source type(cpp) "MT_SOCK_Test.cpp" + } + target "Map_Manager_Test.exe" + { + source type(cpp) "Map_Manager_Test.cpp" + } + target "Map_Test.exe" + { + source type(cpp) "Map_Test.cpp" + } + target "Mem_Map_Test.exe" + { + source type(cpp) "Mem_Map_Test.cpp" + } + target "Message_Block_Test.cpp" + { + source type(cpp) "Message_Block_Test.cpp" + } + target "Message_Queue_Notifications_Test.exe" + { + source type(cpp) "Message_Queue_Notifications_Test.cpp" + } + target "Message_Queue_Test.exe" + { + source type(cpp) "Message_Queue_Test.cpp" + } + target "Naming_Test.exe" + { + source type(cpp) "Naming_Test.cpp" + } + target "Notify_Performance_Test.exe" + { + source type(cpp) "Notify_Performance_Test.cpp" + } + target "Object_Manager_Test.exe" + { + source type(cpp) "Object_Manager_Test.cpp" + } + target "OrdMultiSet_Test.exe" + { + source type(cpp) "OrdMultiSet_Test.cpp" + } + target "Pipe_Test.exe" + { + source type(cpp) "Pipe_Test.cpp" + } + target "Priority_Buffer_Test.exe" + { + source type(cpp) "Priority_Buffer_Test.cpp" + } + target "Priority_Reactor_Test.exe" + { + source type(cpp) "Priority_Reactor_Test.cpp" + } + target "Priority_Task_Test.exe" + { + source type(cpp) "Priority_Task_Test.cpp" + } + target "Process_Mutex_Test.exe" + { + source type(cpp) "Process_Mutex_Test.cpp" + } + target "Process_Strategy_Test.exe" + { + source type(cpp) "Process_Strategy_Test.cpp" + } + target "RB_Tree_Test.exe" + { + source type(cpp) "RB_Tree_Test.cpp" + } + target "Reactor_Exceptions_Test.exe" + { + source type(cpp) "Reactor_Exceptions_Test.cpp" + } + target "Reactor_Notify_Test.exe" + { + source type(cpp) "Reactor_Notify_Test.cpp" + } + target "Reactor_Performance_Test.exe" + { + source type(cpp) "Reactor_Performance_Test.cpp" + } + target "Reactor_Timer_Test.exe" + { + source type(cpp) "Reactor_Timer_Test.cpp" + } + target "Reactors_Test.exe" + { + source type(cpp) "Reactors_Test.cpp" + } + target "Reader_Writer_Test.exe" + { + source type(cpp) "Reader_Writer_Test.cpp" + } + target "Recursive_Mutex_Test.exe" + { + source type(cpp) "Recursive_Mutex_Test.cpp" + } + target "SOCK_Connector_Test.exe" + { + source type(cpp) "SOCK_Connector_Test.cpp" + } + target "SOCK_Test.exe" + { + source type(cpp) "SOCK_Test.cpp" + } + target "SPIPE_Test.exe" + { + source type(cpp) "SPIPE_Test.cpp" + } + target "SString_Test.exe" + { + source type(cpp) "SString_Test.cpp" + } + target "SV_Shared_Memory_Test.exe" + { + source type(cpp) "SV_Shared_Memory_Test.cpp" + } + target "Semaphore_Test.exe" + { + source type(cpp) "Semaphore_Test.cpp" + } + target "Service_Config_Test.exe" + { + source type(cpp) "Service_Config_Test.cpp" + } + target "Sigset_Ops_Test.exe" + { + source type(cpp) "Sigset_Ops_Test.cpp" + } + target "Simple_Message_Block_Test.exe" + { + source type(cpp) "Simple_Message_Block_Test.cpp" + } + target "TSS_Test.exe" + { + source type(cpp) "TSS_Test.cpp" + } + target "Task_Test.exe" + { + source type(cpp) "Task_Test.cpp" + } + target "Thread_Manager_Test.exe" + { + source type(cpp) "Thread_Manager_Test.cpp" + } + target "Thread_Mutex_Test.exe" + { + source type(cpp) "Thread_Mutex_Test.cpp" + } + target "Thread_Pool_Reactor_Test.exe" + { + source type(cpp) "Thread_Pool_Reactor_Test.cpp" + } + target "Thread_Pool_Test.exe" + { + source type(cpp) "Thread_Pool_Test.cpp" + } + target "Time_Service_Test.exe" + { + source type(cpp) "Time_Service_Test.cpp" + } + target "Time_Value_Test.exe" + { + source type(cpp) "Time_Value_Test.cpp" + } + target "Timeprobe_Test.exe" + { + source type(cpp) "Timeprobe_Test.cpp" + } + target "Timer_Queue_Test.exe" + { + source type(cpp) "Timer_Queue_Test.cpp" + } + target "Tokens_Test.exe" + { + source type(cpp) "Tokens_Test.cpp" + } + target "UPIPE_SAP_Test.exe" + { + source type(cpp) "UPIPE_SAP_Test.cpp" + } + target "Upgradable_RW_Test.exe" + { + source type(cpp) "Upgradable_RW_Test.cpp" + } + target "XtReactor_Test.exe" + { + source type(cpp) "XtReactor_Test.cpp" + } |