diff options
35 files changed, 82 insertions, 35 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index df961662326..b9d0f0f25e8 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,42 @@ +Sun Nov 9 17:57:57 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/Synch_Refcountable.h: + * tao/tao.mpc: + * tao/BiDir_GIOP/BiDir_GIOP.mpc: + * tao/Domain/Domain.mpc: + * tao/DynamicAny/DynamicAny.mpc: + * tao/DynamicInterface/DynamicInterface.mpc: + * tao/IFR_Client/IFR_Client.mpc: + * tao/IORInterceptor/IORInterceptor.mpc: + * tao/IORManipulation/IORManipulation.mpc: + * tao/IORTable/IORTable.mpc: + * tao/Messaging/Messaging.mpc: + * tao/ObjRefTemplate/ObjRefTemplate.mpc: + * tao/PortableServer/AMH_Response_Handler.h: + * tao/PortableServer/POA.h: + * tao/PortableServer/PortableServer.mpc: + * tao/RTCORBA/RTCORBA.mpc: + * tao/RTPortableServer/RTPortableServer.mpc: + * tao/RTScheduling/RTScheduler.mpc: + * tao/SmartProxies/SmartProxies.mpc: + * tao/Strategies/DIOP_Profile.h: + * tao/Strategies/DIOP_Transport.h: + * tao/Strategies/SCIOP_Transport.h: + * tao/Strategies/SHMIOP_Profile.h: + * tao/Strategies/Strategies.mpc: + * tao/Strategies/UIOP_Profile.h: + * tao/Strategies/UIOP_Transport.h: + * tao/TypeCodeFactory/TypeCodeFactory.mpc: + * tao/Valuetype/ValueBase.h: + * tao/Valuetype/ValueFactory.cpp: + * tao/Valuetype/ValueFactory.h: + * tao/Valuetype/Valuetype.mpc: + * tests/Bug_1361_Regression/Server_Thread_Pool.h: + * tests/OBV/Supports/Supports_Test_impl.cpp: + * tests/OBV/Supports/Supports_Test_impl.h: + + Fixed fuzz errors. + Sun Nov 9 22:12:29 UTC 2003 Don Hinton <dhinton@dresystems.com> * tao/Makefile.dirs: diff --git a/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc index 797c903afa1..38901f2d5fb 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc +++ b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc @@ -1,3 +1,4 @@ +//$Id$ project : taolib, core { sharedname = TAO_BiDirGIOP dynamicflags = TAO_BIDIRGIOP_BUILD_DLL diff --git a/TAO/tao/Domain/Domain.mpc b/TAO/tao/Domain/Domain.mpc index 0293877c1c4..cc67a12d954 100644 --- a/TAO/tao/Domain/Domain.mpc +++ b/TAO/tao/Domain/Domain.mpc @@ -1,3 +1,4 @@ +//$Id$ project : taolib, core, ifr_client, portableserver { sharedname = TAO_Domain dynamicflags = TAO_DOMAIN_BUILD_DLL diff --git a/TAO/tao/DynamicAny/DynamicAny.mpc b/TAO/tao/DynamicAny/DynamicAny.mpc index ad4087e8540..bde356201ab 100644 --- a/TAO/tao/DynamicAny/DynamicAny.mpc +++ b/TAO/tao/DynamicAny/DynamicAny.mpc @@ -1,3 +1,4 @@ +//$Id$ project : taolib, core { sharedname = TAO_DynamicAny dynamicflags = TAO_DYNAMICANY_BUILD_DLL diff --git a/TAO/tao/DynamicInterface/DynamicInterface.mpc b/TAO/tao/DynamicInterface/DynamicInterface.mpc index 4941808fd2d..56de4520f14 100644 --- a/TAO/tao/DynamicInterface/DynamicInterface.mpc +++ b/TAO/tao/DynamicInterface/DynamicInterface.mpc @@ -1,3 +1,4 @@ +//$Id$ project : taolib, core, messaging, portableserver { sharedname = TAO_DynamicInterface dynamicflags = TAO_DYNAMICINTERFACE_BUILD_DLL diff --git a/TAO/tao/IFR_Client/IFR_Client.mpc b/TAO/tao/IFR_Client/IFR_Client.mpc index 48b51d1e144..6cfdf6509b1 100644 --- a/TAO/tao/IFR_Client/IFR_Client.mpc +++ b/TAO/tao/IFR_Client/IFR_Client.mpc @@ -1,3 +1,4 @@ +//$Id$ project : taolib, core { sharedname = TAO_IFR_Client dynamicflags = TAO_IFR_CLIENT_BUILD_DLL diff --git a/TAO/tao/IORInterceptor/IORInterceptor.mpc b/TAO/tao/IORInterceptor/IORInterceptor.mpc index 3b65b5311a3..11edbe48b83 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor.mpc +++ b/TAO/tao/IORInterceptor/IORInterceptor.mpc @@ -1,3 +1,4 @@ +//$Id$ project : taolib, objreftemplate, valuetype, core { sharedname = TAO_IORInterceptor dynamicflags = TAO_IORINTERCEPTOR_BUILD_DLL diff --git a/TAO/tao/IORManipulation/IORManipulation.mpc b/TAO/tao/IORManipulation/IORManipulation.mpc index 851577c2b39..8c3725b83f4 100644 --- a/TAO/tao/IORManipulation/IORManipulation.mpc +++ b/TAO/tao/IORManipulation/IORManipulation.mpc @@ -1,3 +1,4 @@ +// $Id$ project : taolib, core { sharedname = TAO_IORManip dynamicflags = TAO_IORMANIP_BUILD_DLL diff --git a/TAO/tao/IORTable/IORTable.mpc b/TAO/tao/IORTable/IORTable.mpc index 697ff6b0e27..667cdad082b 100644 --- a/TAO/tao/IORTable/IORTable.mpc +++ b/TAO/tao/IORTable/IORTable.mpc @@ -1,3 +1,4 @@ +//$Id$ project : taolib, core { sharedname = TAO_IORTable dynamicflags = TAO_IORTABLE_BUILD_DLL diff --git a/TAO/tao/Messaging/Messaging.mpc b/TAO/tao/Messaging/Messaging.mpc index 955cf8fe6fe..86350de4529 100644 --- a/TAO/tao/Messaging/Messaging.mpc +++ b/TAO/tao/Messaging/Messaging.mpc @@ -1,3 +1,4 @@ +// $Id$ project : taolib, core, portableserver { sharedname = TAO_Messaging dynamicflags = TAO_MESSAGING_BUILD_DLL diff --git a/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc index 80f126718a3..2925e3acad7 100644 --- a/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc +++ b/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc @@ -1,3 +1,4 @@ +//$Id$ project : valuetype, taolib, core { sharedname = TAO_ObjRefTemplate dynamicflags = TAO_ORT_BUILD_DLL diff --git a/TAO/tao/PortableServer/AMH_Response_Handler.h b/TAO/tao/PortableServer/AMH_Response_Handler.h index d79cba1e8e1..c86b86f1113 100644 --- a/TAO/tao/PortableServer/AMH_Response_Handler.h +++ b/TAO/tao/PortableServer/AMH_Response_Handler.h @@ -19,7 +19,9 @@ #include "tao/Service_Context.h" #include "tao/CDR.h" #include "tao/LocalObject.h" -#include "ace/Synch_T.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" +#include "ace/Null_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -165,7 +167,7 @@ private: // The lighter-weight form (using a state variable /// Mutex to ensure the AMH-RH method call is thread-safe. - TAO_SYNCH_MUTEX mutex_; + ACE_SYNCH_MUTEX mutex_; }; #endif /* TAO_AMH_RESPONSE_HANDLER_H */ diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h index b9dea7bb0c5..019a82b8ff3 100644 --- a/TAO/tao/PortableServer/POA.h +++ b/TAO/tao/PortableServer/POA.h @@ -51,7 +51,10 @@ #include "ace/Array_Base.h" // Locking -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" +#include "ace/Recursive_Thread_Mutex.h" +#include "ace/Null_Mutex.h" // OctetSeq #include "tao/OctetSeqC.h" diff --git a/TAO/tao/PortableServer/PortableServer.mpc b/TAO/tao/PortableServer/PortableServer.mpc index a59ef60deb5..42744383119 100644 --- a/TAO/tao/PortableServer/PortableServer.mpc +++ b/TAO/tao/PortableServer/PortableServer.mpc @@ -1,3 +1,4 @@ +// $Id$ project : taolib, core, objreftemplate, valuetype, iorinterceptor { sharedname = TAO_PortableServer dynamicflags = TAO_PORTABLESERVER_BUILD_DLL diff --git a/TAO/tao/RTCORBA/RTCORBA.mpc b/TAO/tao/RTCORBA/RTCORBA.mpc index 788c335394e..e17a9a8f1af 100644 --- a/TAO/tao/RTCORBA/RTCORBA.mpc +++ b/TAO/tao/RTCORBA/RTCORBA.mpc @@ -1,3 +1,4 @@ +// $Id$ project : taolib, core { sharedname = TAO_RTCORBA dynamicflags = TAO_RTCORBA_BUILD_DLL diff --git a/TAO/tao/RTPortableServer/RTPortableServer.mpc b/TAO/tao/RTPortableServer/RTPortableServer.mpc index 678d76e7b13..8f04a095651 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer.mpc +++ b/TAO/tao/RTPortableServer/RTPortableServer.mpc @@ -1,3 +1,4 @@ +// $Id$ project : taolib, core, rtcorba, portableserver, corba_messaging { sharedname = TAO_RTPortableServer dynamicflags = TAO_RTPORTABLESERVER_BUILD_DLL diff --git a/TAO/tao/RTScheduling/RTScheduler.mpc b/TAO/tao/RTScheduling/RTScheduler.mpc index 5f5bf4aae99..09cb308e2c9 100644 --- a/TAO/tao/RTScheduling/RTScheduler.mpc +++ b/TAO/tao/RTScheduling/RTScheduler.mpc @@ -1,3 +1,4 @@ +// $Id$ project : taolib, rtcorba, portableserver, core, corba_messaging { sharedname = TAO_RTScheduler dynamicflags = TAO_RTSCHEDULER_BUILD_DLL diff --git a/TAO/tao/SmartProxies/SmartProxies.mpc b/TAO/tao/SmartProxies/SmartProxies.mpc index 93934914101..00d79217500 100644 --- a/TAO/tao/SmartProxies/SmartProxies.mpc +++ b/TAO/tao/SmartProxies/SmartProxies.mpc @@ -1,3 +1,4 @@ +// $Id$ project : taolib, core { sharedname = TAO_SmartProxies dynamicflags = TAO_SMARTPROXIES_BUILD_DLL diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h index f419709e664..e9adca53cbe 100644 --- a/TAO/tao/Strategies/DIOP_Profile.h +++ b/TAO/tao/Strategies/DIOP_Profile.h @@ -30,8 +30,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "DIOP_Endpoint.h" -#include "ace/Synch.h" - // TAO DIOP_Profile concrete Profile definitions /** diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h index f722732f951..e19b75a623f 100644 --- a/TAO/tao/Strategies/DIOP_Transport.h +++ b/TAO/tao/Strategies/DIOP_Transport.h @@ -26,7 +26,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/SOCK_Stream.h" -#include "ace/Synch.h" #include "ace/Svc_Handler.h" #include "strategies_export.h" diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h index 1cd68bd1d61..5c551089457 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.h +++ b/TAO/tao/Strategies/SCIOP_Transport.h @@ -26,7 +26,6 @@ #include "strategies_export.h" #include "tao/IIOPC.h" #include "ace/SOCK_SEQPACK_Association.h" -#include "ace/Synch.h" // Forward decls. class TAO_SCIOP_Connection_Handler; diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h index ef48b9fcaf6..e7bc47ffe83 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.h +++ b/TAO/tao/Strategies/SHMIOP_Profile.h @@ -31,8 +31,6 @@ #include "tao/Profile.h" #include "SHMIOP_Endpoint.h" -#include "ace/Synch.h" - // TAO SHMIOP_Profile concrete Profile definitions /** diff --git a/TAO/tao/Strategies/Strategies.mpc b/TAO/tao/Strategies/Strategies.mpc index 95696b79e54..9a6f8d5026c 100644 --- a/TAO/tao/Strategies/Strategies.mpc +++ b/TAO/tao/Strategies/Strategies.mpc @@ -1,3 +1,4 @@ +// $Id$ project : taolib, core { sharedname = TAO_Strategies dynamicflags = TAO_STRATEGIES_BUILD_DLL diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h index cd30cff417f..008e4650edb 100644 --- a/TAO/tao/Strategies/UIOP_Profile.h +++ b/TAO/tao/Strategies/UIOP_Profile.h @@ -33,7 +33,6 @@ #include "UIOP_Endpoint.h" #include "ace/UNIX_Addr.h" -#include "ace/Synch.h" /** diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h index 6414ee52769..3fcdafbc21e 100644 --- a/TAO/tao/Strategies/UIOP_Transport.h +++ b/TAO/tao/Strategies/UIOP_Transport.h @@ -27,7 +27,6 @@ #include "strategies_export.h" #include "ace/LSOCK_Acceptor.h" -#include "ace/Synch.h" #include "ace/Svc_Handler.h" #include "tao/Transport.h" diff --git a/TAO/tao/Synch_Refcountable.h b/TAO/tao/Synch_Refcountable.h index 825eb9224b8..d66b5bb20fb 100644 --- a/TAO/tao/Synch_Refcountable.h +++ b/TAO/tao/Synch_Refcountable.h @@ -23,7 +23,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Synch.h" #include "TAO_Export.h" diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc index c36718a5137..87433ca491c 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc @@ -1,3 +1,4 @@ +// $Id$ project : taolib, core, ifr_client { sharedname = TAO_TypeCodeFactory dynamicflags = TAO_TYPECODEFACTORY_BUILD_DLL diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h index a8658eb9c8f..490d8bf80ed 100644 --- a/TAO/tao/Valuetype/ValueBase.h +++ b/TAO/tao/Valuetype/ValueBase.h @@ -28,8 +28,10 @@ #include "tao/Arg_Traits_T.h" #include "ace/Basic_Types.h" -#include "ace/Synch_T.h" #include "ace/CORBA_macros.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" +#include "ace/Null_Mutex.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -166,7 +168,7 @@ namespace CORBA private: // data CORBA::ULong _tao_reference_count_; - TAO_SYNCH_MUTEX _tao_reference_count_lock_; + ACE_SYNCH_MUTEX _tao_reference_count_lock_; }; // DefaultValueRefCountBase // which lock has the lowest memory overhead ? diff --git a/TAO/tao/Valuetype/ValueFactory.cpp b/TAO/tao/Valuetype/ValueFactory.cpp index 2f2fa4ad818..df331883ffe 100644 --- a/TAO/tao/Valuetype/ValueFactory.cpp +++ b/TAO/tao/Valuetype/ValueFactory.cpp @@ -1,4 +1,5 @@ #include "ValueFactory.h" +#include "ace/Guard_T.h" #if !defined (__ACE_INLINE__) # include "ValueFactory.inl" diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h index e2800019962..d0cf8cd1ec4 100644 --- a/TAO/tao/Valuetype/ValueFactory.h +++ b/TAO/tao/Valuetype/ValueFactory.h @@ -25,8 +25,9 @@ #include "tao/Basic_Types.h" #include "tao/orbconf.h" - -#include "ace/Synch_T.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" +#include "ace/Null_Mutex.h" namespace CORBA { diff --git a/TAO/tao/Valuetype/Valuetype.mpc b/TAO/tao/Valuetype/Valuetype.mpc index 8d7c70b74e2..3a9d9be9837 100644 --- a/TAO/tao/Valuetype/Valuetype.mpc +++ b/TAO/tao/Valuetype/Valuetype.mpc @@ -1,3 +1,4 @@ +// $Id$ project : taolib, core { sharedname = TAO_Valuetype dynamicflags = TAO_VALUETYPE_BUILD_DLL diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index c575e6dc697..fb25c42afcb 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -1,3 +1,4 @@ +//$Id$ project(TAO) : acelib, taoversion, core, tao_output, extra_core { includes += $(TAO_ROOT) $(TAO_ROOT)/tao sharedname = TAO diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h index cc51a771f4e..88b9588038b 100644 --- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h +++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h @@ -1,18 +1,5 @@ // $Id$ -// This test program illustrates how the <ACE_Task> synchronization -// mechanisms work in conjunction with the <ACE_Thread_Manager>. If -// the <manual> flag is set input comes from stdin until the user -// enters a return -- otherwise, the input is generated automatically. -// All worker threads shutdown when they receive a message block of -// length 0. -// -// This code is original based on a test program written by Karlheinz -// Dorn <Karlheinz.Dorn@med.siemens.de>. It was modified to utilize -// more ACE features by Doug Schmidt <schmidt@cs.wustl.edu>. - -#include "ace/OS.h" -#include "ace/Synch_T.h" #include "ace/Task_T.h" #include "ace/Service_Config.h" diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp index 9193b1007db..f9c4ef2ff3d 100644 --- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp +++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp @@ -1,8 +1,9 @@ // $Id$ +// FUZZ: disable check_for_streams_include #include "Supports_Test_impl.h" -#include "ace/Stream.h" +#include "ace/streams.h" /* vt_graph_impl */ @@ -49,11 +50,14 @@ void vt_graph_impl::print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - cout << "Printing graph data..." << endl; - cout << "Number of nodes: " << nodes_ ().length () << endl; + ACE_DEBUG ((LM_DEBUG, + "Printing graph data... \n")); + + ACE_DEBUG ((LM_DEBUG, + "Number of nodes: [%d] \n", nodes_ ().length ())); + for (size_t i = 0; i < nodes_ ().length (); i++) nodes_ ()[i]->print (); - cout << endl; } diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.h b/TAO/tests/OBV/Supports/Supports_Test_impl.h index 4c7b1ede1ce..60df8444925 100644 --- a/TAO/tests/OBV/Supports/Supports_Test_impl.h +++ b/TAO/tests/OBV/Supports/Supports_Test_impl.h @@ -4,9 +4,7 @@ #define TAO_SUPPORTS_TEST_IMPL_H #include "Supports_TestS.h" -#include "ace/Synch.h" #include "ace/Get_Opt.h" -#include "ace/streams.h" /** * \class node_impl |